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

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-13 / +21 lines)
Lines 11-18 var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?"); Link Here
11
var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
11
var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
12
var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended holds?");
12
var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended holds?");
13
13
14
            $(function() {
14
    $(document).ready(function(){
15
            $('#opac-user-views').tabs();
15
16
        $('#opac-user-views').tabs();
16
17
17
        var dTables = $("#checkoutst,#holdst,#overduest");
18
        var dTables = $("#checkoutst,#holdst,#overduest");
18
        dTables.each(function(){
19
        dTables.each(function(){
Lines 27-34 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
27
            }));
28
            }));
28
        });
29
        });
29
30
30
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
31
    [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
31
        [% IF ( OpacRenewalAllowed && canrenew && !userdebarred ) %]$("#renewselected").submit(function(){
32
33
    [% IF ( OpacRenewalAllowed && canrenew && !userdebarred ) %]
34
        $("#renewselected").submit(function(){
32
            valid = false;
35
            valid = false;
33
            $("input[type=checkbox]").each(function(){
36
            $("input[type=checkbox]").each(function(){
34
                if($(this).is(':checked')){
37
                if($(this).is(':checked')){
Lines 46-54 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
46
        $("#renewall_link").live('click',function(){
49
        $("#renewall_link").live('click',function(){
47
            $("#renewall").submit();
50
            $("#renewall").submit();
48
        });
51
        });
49
        $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %]
52
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
50
        $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
53
            $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
51
            });
54
        [% END %]
55
    [% END %]
56
57
    $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
58
59
    });
52
//]]>
60
//]]>
53
</script>
61
</script>
54
</head>
62
</head>
Lines 105-111 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
105
                <string>Please note:</string>
113
                <string>Please note:</string>
106
                <span>
114
                <span>
107
                    Your account renewal failed because of the following:
115
                    Your account renewal failed because of the following:
108
                    [% FOREACH error IN RENEW_ERROR.split('|') %]
116
                    [% FOREACH error IN RENEW_ERROR.split('\|') %]
109
                        [% IF error == 'card_expired' %]
117
                        [% IF error == 'card_expired' %]
110
                            Your account has expired. Please contact the library for more information.
118
                            Your account has expired. Please contact the library for more information.
111
                        [% ELSIF error == 'too_many' %]
119
                        [% ELSIF error == 'too_many' %]
Lines 162-168 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
162
        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
170
        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
163
        [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
171
        [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
164
        <th>Call No.</th>
172
        <th>Call No.</th>
165
        [% IF ( OpacRenewalAllowed ) %]
173
        [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
166
        <th class="nosort">Renew</th>
174
        <th class="nosort">Renew</th>
167
        [% END %]
175
        [% END %]
168
[% IF ( OPACFinesTab ) %]
176
[% IF ( OPACFinesTab ) %]
Lines 210-216 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
210
                [% UNLESS ( item_level_itypes ) %]<td class="itype">[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
218
                [% UNLESS ( item_level_itypes ) %]<td class="itype">[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
211
                [% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]
219
                [% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]
212
                <td class="call_no">[% ISSUE.itemcallnumber %]</td>
220
                <td class="call_no">[% ISSUE.itemcallnumber %]</td>
213
                [% IF ( OpacRenewalAllowed ) %]
221
                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
214
                    <td class="renew">[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
222
                    <td class="renew">[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
215
                        [% ELSE %]
223
                        [% ELSE %]
216
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
224
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
Lines 225-235 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
225
            </tr>
233
            </tr>
226
        [% END %]</tbody>
234
        [% END %]</tbody>
227
        </table>
235
        </table>
228
       [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
236
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
229
        <input type="submit" value="Renew selected" />
237
        <input type="submit" value="Renew Selected" />
230
        [% END %]
238
        [% END %]
231
        </form>
239
        </form>
232
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
240
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
233
        <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
241
        <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
234
            <input type="hidden" name="from" value="opac_user" />
242
            <input type="hidden" name="from" value="opac_user" />
235
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
243
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
(-)a/opac/opac-user.pl (-1 / +1 lines)
Lines 144-149 $template->param( BORROWER_INFO => \@bordat, Link Here
144
                    surname           => $borr->{surname},
144
                    surname           => $borr->{surname},
145
                    showname          => $borr->{showname},
145
                    showname          => $borr->{showname},
146
                    RENEW_ERROR       => $renew_error,
146
                    RENEW_ERROR       => $renew_error,
147
                    borrower          => $borr,
147
                );
148
                );
148
149
149
#get issued items ....
150
#get issued items ....
150
- 

Return to bug 6739