X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fopac-tmpl%2Fprog%2Fen%2Fmodules%2Fopac-user.tt;h=9729c7c8784a14ee3b90c391faf1bd724f4187fd;hb=b20c2d6857629eed3f3eaf44cdca68dda36f4216;hp=0971f4608bc8026c149b1dbcc8ff909548cfd18c;hpb=1fe3514c3cca5ae73b370411150112bf2647c63d;p=koha.git
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 0971f4608b..9729c7c878 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -1,9 +1,9 @@
+[% USE KohaDates %]
+
[% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog › Library Home for
-[% FOREACH BORROWER_INF IN BORROWER_INFO %]
- [% INCLUDE 'patron-title.inc' category_type = BORROWER_INF.category_type firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]
-[% END %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home
[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'calendar.inc' %]
@@ -58,15 +58,14 @@ $.tablesorter.addParser({
-
[% IF ( bor_messages ) %]
-
Messages For You
+
Messages for you
[% FOREACH bor_messages_loo IN bor_messages_loop %]
[% bor_messages_loo.message %]
- Written on [% bor_messages_loo.message_date_formatted %] by [% bor_messages_loo.branchname %]
+ Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %]
[% END %]
@@ -83,33 +82,35 @@ $.tablesorter.addParser({
[% IF ( patronupdate ) %]
Thank you!
Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.
[% END %]
[% IF ( BORROWER_INF.warndeparture ) %]
-
- Please note: Your card will expire on [% BORROWER_INF.warndeparture %]. Please contact the library if you wish to renew your subscription.
- [% IF ( BORROWER_INF.returnbeforeexpiry ) %] Also note that you must return all checked out items before your card expires.[% END %]
+
+ Please note: Your card will expire on [% BORROWER_INF.warndeparture %]. Please contact the library if you wish to renew your subscription.
+ [% IF ( BORROWER_INF.returnbeforeexpiry ) %] Also note that you must return all checked out items before your card expires.[% END %]
[% END %]
- [% IF ( BORROWER_INF.flagged ) %]
+ [% IF ( patron_flagged ) %]
- [% IF ( BORROWER_INF.debarred ) %]
-
Please note: Your account has been frozen until [% BORROWER_INF.debarred %] - [% BORROWER_INF.debarredcomment %]. Usually the reason for freezing an account is old overdues or damage fees.If your account page shows your account to be clear, please contact the library.
+ [% IF ( userdebarred ) %]
+
Please note: Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate | $KohaDates %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please contact the library.
[% END %]
[% IF ( BORROWER_INF.gonenoaddress ) %]
-
Please note: According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]contact information[% ELSE %]contact information[% END %] on file. Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the online update form to submit current information (Please note: there may be a delay in restoring your account if you submit online)[% END %].
+
Please note: According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]contact information[% ELSE %]contact information[% END %] on file. Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the online update form to submit current information (Please note: there may be a delay in restoring your account if you submit online)[% END %].
[% END %]
[% IF ( BORROWER_INF.lost ) %]
-
Please note: Your library card has been marked as lost or stolen. If this is an error, please contact the library.
+
Please note: Your library card has been marked as lost or stolen. If this is an error, please contact the library.
[% END %]
- [% IF renewal_blocked_fines %]
-
Please note: Since you have more than [% renewal_blocked_fines %] in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.
Please note: Since you have more than [% renewal_blocked_fines %] in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.
[% IF ( ISSUE.status ) %] Renew([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
+
[% IF ( ISSUE.status ) %][% IF ( canrenew ) %] Renew[% END %] ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
[% ELSE %]
Not renewable[% IF ( ISSUE.too_many ) %] ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)[% ELSE %][% IF ( ISSUE.on_reserve ) %] (On hold)[% END %][% END %]
[% END %]
- [% END %]
[% END %]
[% IF ( OPACFinesTab ) %]
[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
@@ -260,24 +259,20 @@ $.tablesorter.addParser({
[% END %]
- [% IF ( canrenew ) %]
- [% IF ( OpacRenewalAllowed ) %]
+ [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
[% END %]
- [% END %]
- [% IF ( OpacRenewalAllowed ) %]
- [% IF ( canrenew ) %]
+ [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
[% END %]
- [% END %]
[% ELSE %]