Attachment #77377 for bug #21137

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




[% USE ItemTypes %]
[% USE Price %]

[% SET borrower_club_enrollments =  logged_in_user.get_club_enrollments(1) %]
[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]

[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>

                            [% END %]

                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
                            [% IF Koha.Preference('ArticleRequests') && logged_in_user.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% logged_in_user.article_requests_current.count %])</a></li>[% END %]
                            [% IF ( OverDriveCirculation ) %]
                            <li><a href="#opac-user-overdrive">OverDrive Account</a></li>
                            [% END %]

                                                    <th>Barcode</th>
                                                [% END %]
                                                    <th>Call no.</th>
                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
                                                    <th class="nosort">Renew</th>
                                                [% END %]
                                                [% IF ( OPACFinesTab ) %]

                                                    <span class="tdlabel">Call no.:</span>
                                                    [% ISSUE.itemcallnumber %]
                                                </td>
                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
                                                    <td class="renew">
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
                                                    [% IF ( ISSUE.status ) %]

                                        [% END # /FOREACH ISSUES %]
                                    </tbody>
                                </table>
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
                                    <input type="submit" class="btn" value="Renew selected" />
                                [% END %]
                                </form>

                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
                                <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
                                    <input type="hidden" name="from" value="opac_user" />
                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />


                        [% IF Koha.Preference('ArticleRequests') %]
                            <div id="opac-user-article-requests">
                                [% IF logged_in_user.article_requests_current.count %]
                                    <table id="article-requests-table" class="table table-bordered table-striped">
                                        <caption>Article requests <span class="count">([% logged_in_user.article_requests_current.count %] total)</span></caption>
                                        <thead>
                                            <tr>
                                                <th class="anti-the article-request-record-title">Record title</th>

                                        </thead>

                                        <tbody>
                                        [% FOREACH ar IN logged_in_user.article_requests_current %]
                                                <td class="article-request-record-title">
                                                    <a class="article-request-title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ar.biblionumber %]">
                                                        [% ar.biblio.title %]

                    e.preventDefault();
                    $("#renewall").submit();
                });
                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
                    $("#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 %]
- 

Return to bug 21137

Lines 5-12 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-12 / +11 lines)
5	[% USE ItemTypes %]	5	[% USE ItemTypes %]
6	[% USE Price %]	6	[% USE Price %]
7		7
8	[% SET borrower_club_enrollments = borrower.get_club_enrollments(1) %]	8	[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments(1) %]
9	[% SET borrower_enrollable_clubs = borrower.get_enrollable_clubs(1,1) %]	9	[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]
10		10
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>	12	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>
Lines 159-165 Link Here
159	[% END %]	159	[% END %]
160		160
161	[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]	161	[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
162	[% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count %])</a></li>[% END %]	162	[% IF Koha.Preference('ArticleRequests') && logged_in_user.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% logged_in_user.article_requests_current.count %])</a></li>[% END %]
163	[% IF ( OverDriveCirculation ) %]	163	[% IF ( OverDriveCirculation ) %]
164	<li><a href="#opac-user-overdrive">OverDrive Account</a></li>	164	<li><a href="#opac-user-overdrive">OverDrive Account</a></li>
165	[% END %]	165	[% END %]
Lines 187-193 Link Here
187	<th>Barcode</th>	187	<th>Barcode</th>
188	[% END %]	188	[% END %]
189	<th>Call no.</th>	189	<th>Call no.</th>
190	[% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]	190	[% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
191	<th class="nosort">Renew</th>	191	<th class="nosort">Renew</th>
192	[% END %]	192	[% END %]
193	[% IF ( OPACFinesTab ) %]	193	[% IF ( OPACFinesTab ) %]
Lines 280-286 Link Here
280	<span class="tdlabel">Call no.:</span>	280	<span class="tdlabel">Call no.:</span>
281	[% ISSUE.itemcallnumber %]	281	[% ISSUE.itemcallnumber %]
282	</td>	282	</td>
283	[% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]	283	[% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
284	<td class="renew">	284	<td class="renew">
285	[% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]	285	[% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
286	[% IF ( ISSUE.status ) %]	286	[% IF ( ISSUE.status ) %]
Lines 340-351 Link Here
340	[% END # /FOREACH ISSUES %]	340	[% END # /FOREACH ISSUES %]
341	</tbody>	341	</tbody>
342	</table>	342	</table>
343	[% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]	343	[% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
344	<input type="submit" class="btn" value="Renew selected" />	344	<input type="submit" class="btn" value="Renew selected" />
345	[% END %]	345	[% END %]
346	</form>	346	</form>
347		347
348	[% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]	348	[% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
349	<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">	349	<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
350	<input type="hidden" name="from" value="opac_user" />	350	<input type="hidden" name="from" value="opac_user" />
351	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	351	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
Lines 791-799 Link Here
791		791
792	[% IF Koha.Preference('ArticleRequests') %]	792	[% IF Koha.Preference('ArticleRequests') %]
793	<div id="opac-user-article-requests">	793	<div id="opac-user-article-requests">
794	[% IF borrower.article_requests_current.count %]	794	[% IF logged_in_user.article_requests_current.count %]
795	<table id="article-requests-table" class="table table-bordered table-striped">	795	<table id="article-requests-table" class="table table-bordered table-striped">
796	<caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>	796	<caption>Article requests <span class="count">([% logged_in_user.article_requests_current.count %] total)</span></caption>
797	<thead>	797	<thead>
798	<tr>	798	<tr>
799	<th class="anti-the article-request-record-title">Record title</th>	799	<th class="anti-the article-request-record-title">Record title</th>
Lines 813-819 Link Here
813	</thead>	813	</thead>
814		814
815	<tbody>	815	<tbody>
816	[% FOREACH ar IN borrower.article_requests_current %]	816	[% FOREACH ar IN logged_in_user.article_requests_current %]
817	<td class="article-request-record-title">	817	<td class="article-request-record-title">
818	<a class="article-request-title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ar.biblionumber %]">	818	<a class="article-request-title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ar.biblionumber %]">
819	[% ar.biblio.title %]	819	[% ar.biblio.title %]
Lines 957-963 Link Here
957	e.preventDefault();	957	e.preventDefault();
958	$("#renewall").submit();	958	$("#renewall").submit();
959	});	959	});
960	[% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]	960	[% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
961	$("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");	961	$("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
962	[% END %]	962	[% END %]
963	[% END %]	963	[% END %]
964	-