View | Details | Raw Unified | Return to bug 6739
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (+4 lines)
Lines 75-80 Link Here
75
                            <div id="bad_data" class="alert">ERROR: Internal error: incomplete hold request.</div>
75
                            <div id="bad_data" class="alert">ERROR: Internal error: incomplete hold request.</div>
76
                        [% END %]
76
                        [% END %]
77
77
78
                        [% IF ( expired_patron ) %]
79
                            <div id="expired_patron" class="alert"><strong>Sorry</strong>, you cannot place holds because your library card has expired.</p><p>Please contact your librarian if you wish to renew your card.</div>
80
                        [% END %]
81
78
                    [% ELSE %]
82
                    [% ELSE %]
79
83
80
                        [% IF ( none_available ) %]
84
                        [% IF ( none_available ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-8 / +28 lines)
Lines 57-63 Link Here
57
57
58
                    [% IF ( BORROWER_INF.warnexpired ) %]
58
                    [% IF ( BORROWER_INF.warnexpired ) %]
59
                        <div class="alert" id="warnexpired">
59
                        <div class="alert" id="warnexpired">
60
                            <strong>Please note:</strong><span> Your card has expired. Please contact the library for more information.</span>
60
                            <strong>Please note: </strong><span>Your account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span>
61
                        </div>
62
                    [% END %]
63
64
                    [% IF ( RENEW_ERROR ) %]
65
                        <div class="dialog alert">
66
                            <strong>Please note:</strong>
67
                            <span>
68
                                Your account renewal failed because of the following:
69
                                [% FOREACH error IN RENEW_ERROR.split('\|') %]
70
                                    [% IF error == 'card_expired' %]
71
                                        Your account has expired. Please contact the library for more information.
72
                                    [% ELSIF error == 'too_many' %]
73
                                        You have renewed this item the maximum number of times allowed.
74
                                    [% ELSIF error == 'on_reserve' %]
75
                                        This item is on hold for another patron.
76
                                    [% END %]
77
                                [% END %]
78
                            </span>
61
                        </div>
79
                        </div>
62
                    [% END %]
80
                    [% END %]
63
81
Lines 112-118 Link Here
112
                                                    <th>Barcode</th>
130
                                                    <th>Barcode</th>
113
                                                [% END %]
131
                                                [% END %]
114
                                                    <th>Call No.</th>
132
                                                    <th>Call No.</th>
115
                                                [% IF ( OpacRenewalAllowed ) %]
133
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
116
                                                    <th class="nosort">Renew</th>
134
                                                    <th class="nosort">Renew</th>
117
                                                [% END %]
135
                                                [% END %]
118
                                                [% IF ( OPACFinesTab ) %]
136
                                                [% IF ( OPACFinesTab ) %]
Lines 198-204 Link Here
198
                                                    <span class="tdlabel">Call number:</span>
216
                                                    <span class="tdlabel">Call number:</span>
199
                                                    [% ISSUE.itemcallnumber %]
217
                                                    [% ISSUE.itemcallnumber %]
200
                                                </td>
218
                                                </td>
201
                                                [% IF ( OpacRenewalAllowed ) %]
219
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
202
                                                    <td class="renew">
220
                                                    <td class="renew">
203
                                                        [% IF ( ISSUE.status ) %]
221
                                                        [% IF ( ISSUE.status ) %]
204
                                                            [% IF ( canrenew ) %]
222
                                                            [% IF ( canrenew ) %]
Lines 234-245 Link Here
234
                                        [% END # /FOREACH ISSUES %]
252
                                        [% END # /FOREACH ISSUES %]
235
                                    </tbody>
253
                                    </tbody>
236
                                </table>
254
                                </table>
237
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
255
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
238
                                    <input type="submit" class="btn" value="Renew selected" />
256
                                    <input type="submit" class="btn" value="Renew selected" />
239
                                [% END %]
257
                                [% END %]
240
                                </form>
258
                                </form>
241
259
242
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
260
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
243
                                <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
261
                                <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
244
                                    <input type="hidden" name="from" value="opac_user" />
262
                                    <input type="hidden" name="from" value="opac_user" />
245
                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
263
                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
Lines 631-637 Link Here
631
        var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
649
        var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
632
        var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended holds?");
650
        var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended holds?");
633
651
634
        $(function() {
652
        $(document).ready(function(){
635
            $('#opac-user-views').tabs();
653
            $('#opac-user-views').tabs();
636
654
637
            var dTables = $("#checkoutst,#holdst,#overduest");
655
            var dTables = $("#checkoutst,#holdst,#overduest");
Lines 667-674 Link Here
667
                $("#renewall_link").live('click',function(){
685
                $("#renewall_link").live('click',function(){
668
                    $("#renewall").submit();
686
                    $("#renewall").submit();
669
                });
687
                });
670
                $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
688
                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
689
                    $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
690
                [% END %]
671
            [% END %]
691
            [% END %]
692
672
            $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
693
            $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
673
        });
694
        });
674
        //]]>
695
        //]]>
675
- 

Return to bug 6739