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

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+21 lines)
Lines 2018-2020 div.ft { Link Here
2018
#opac-isbddetail #isbdcontents { margin-top: 2em; }
2018
#opac-isbddetail #isbdcontents { margin-top: 2em; }
2019
2019
2020
div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }
2020
div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }
2021
2022
#renewcontrols {
2023
	 float: right;
2024
	 font-size: 66%;
2025
}
2026
2027
#renewcontrols a {
2028
	background-position : 3px center;
2029
	background-repeat : no-repeat;
2030
	text-decoration:none;
2031
	padding : .1em .4em;
2032
	padding-left : 18px;
2033
}
2034
2035
#renewselected_link {
2036
	background-image : url(../../images/check.png);
2037
}
2038
2039
#renewall_link {
2040
	background-image : url(../../images/checks.png);
2041
}
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-6 / +27 lines)
Lines 5-11 Link Here
5
[% END %]
5
[% END %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
8
<script type="text/JavaScript" language="JavaScript">
8
<script type="text/JavaScript">
9
//<![CDATA[
9
//<![CDATA[
10
var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?");
10
var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?");
11
$.tablesorter.addParser({
11
$.tablesorter.addParser({
Lines 64-69 $.tablesorter.addParser({ Link Here
64
				[% END %]
64
				[% END %]
65
			});
65
			});
66
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
66
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
67
        [% IF ( OpacRenewalAllowed ) %][% IF ( canrenew ) %]$("#renewselected").submit(function(){
68
            valid = false;
69
            $("input[type=checkbox]").each(function(){
70
                if($(this).is(':checked')){
71
                    valid = true;
72
                }
73
            });
74
            if(!valid){
75
                alert(_("Nothing has been selected. Check the box for each item you want to renew"));
76
            }
77
            return valid;
78
        });
79
        $("#renewselected_link").live('click',function(){
80
            $("#renewselected").submit();
81
        });
82
        $("#renewall_link").live('click',function(){
83
            $("#renewall").submit();
84
        });
85
        $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %][% END %]
67
            });
86
            });
68
//]]>
87
//]]>
69
</script>
88
</script>
Lines 192-198 $.tablesorter.addParser({ Link Here
192
    [% END %]
211
    [% END %]
193
212
194
    <div id="opac-user-checkouts">[% IF ( issues_count ) %]
213
    <div id="opac-user-checkouts">[% IF ( issues_count ) %]
195
        <form action="/cgi-bin/koha/opac-renew.pl" method="post">
214
        <form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
196
	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
215
	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
197
	<input type="hidden" name="from" value="opac_user" />
216
	<input type="hidden" name="from" value="opac_user" />
198
        <table id="checkoutst">
217
        <table id="checkoutst">
Lines 254-260 $.tablesorter.addParser({ Link Here
254
                [% END %]
273
                [% END %]
255
                [% IF ( OpacRenewalAllowed ) %]
274
                [% IF ( OpacRenewalAllowed ) %]
256
                    [% UNLESS ( ISSUE.patron_flagged ) %]
275
                    [% UNLESS ( ISSUE.patron_flagged ) %]
257
                    <td>[% IF ( ISSUE.status ) %]<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> <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
276
                    <td>[% IF ( ISSUE.status ) %]<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> <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
258
                        [% ELSE %]
277
                        [% ELSE %]
259
                        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 %] 
278
                        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 %] 
260
                        [% END %]</td>
279
                        [% END %]</td>
Lines 269-282 $.tablesorter.addParser({ Link Here
269
            </tr>
288
            </tr>
270
        [% END %]</tbody>
289
        [% END %]</tbody>
271
        </table>
290
        </table>
272
	
291
	   [% IF ( canrenew ) %]
273
		[% IF ( OpacRenewalAllowed ) %]
292
		[% IF ( OpacRenewalAllowed ) %]
274
		<input type="submit" value="Renew Selected" />
293
		<input type="submit" value="Renew Selected" />
275
		[% END %]
294
		[% END %]
295
        [% END %]
276
		</form>
296
		</form>
277
		[% IF ( OpacRenewalAllowed ) %]
297
		[% IF ( OpacRenewalAllowed ) %]
278
		
298
        [% IF ( canrenew ) %]
279
		<form action="/cgi-bin/koha/opac-renew.pl" method="post">
299
		<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
280
			<input type="hidden" name="from" value="opac_user" />
300
			<input type="hidden" name="from" value="opac_user" />
281
			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
301
			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
282
			[% FOREACH ISSUE IN ISSUES %]
302
			[% FOREACH ISSUE IN ISSUES %]
Lines 285-290 $.tablesorter.addParser({ Link Here
285
			[% UNLESS ( patron_flagged ) %]<input type="submit" value="Renew All" />[% END %]
305
			[% UNLESS ( patron_flagged ) %]<input type="submit" value="Renew All" />[% END %]
286
		</form>
306
		</form>
287
		[% END %]
307
		[% END %]
308
        [% END %]
288
    [% ELSE %]
309
    [% ELSE %]
289
        <table>
310
        <table>
290
            <tr><td>You have nothing checked out</td></tr>
311
            <tr><td>You have nothing checked out</td></tr>
(-)a/opac/opac-user.pl (-3 / +6 lines)
Lines 112-117 my @overdues; Link Here
112
my @issuedat;
112
my @issuedat;
113
my $itemtypes = GetItemTypes();
113
my $itemtypes = GetItemTypes();
114
my ($issues) = GetPendingIssues($borrowernumber);
114
my ($issues) = GetPendingIssues($borrowernumber);
115
my $canrenew = 0;
115
if ($issues){
116
if ($issues){
116
	foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) {
117
	foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) {
117
		# check for reserves
118
		# check for reserves
Lines 140-146 if ($issues){ Link Here
140
		# check if item is renewable
141
		# check if item is renewable
141
		my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
142
		my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
142
		($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
143
		($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
143
		$issue->{'status'} = $status && C4::Context->preference("OpacRenewalAllowed");
144
        if($status && C4::Context->preference("OpacRenewalAllowed")){
145
            $issue->{'status'} = $status;
146
            $canrenew = 1;
147
        }
144
		$issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
148
		$issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
145
		$issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
149
		$issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
146
150
Lines 179-185 if ($issues){ Link Here
179
}
183
}
180
$template->param( ISSUES       => \@issuedat );
184
$template->param( ISSUES       => \@issuedat );
181
$template->param( issues_count => $count );
185
$template->param( issues_count => $count );
182
186
$template->param( canrenew     => $canrenew );
183
$template->param( OVERDUES       => \@overdues );
187
$template->param( OVERDUES       => \@overdues );
184
$template->param( overdues_count => $overdues_count );
188
$template->param( overdues_count => $overdues_count );
185
189
186
- 

Return to bug 6534