Bugzilla – Attachment 70070 Details for
Bug 19849
Rebase of bug 16621 partially reverted bug 12509
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19849: Minor fixes & refactor of opac-reserve.tt & opac-user.tt
Bug-19849-Minor-fixes--refactor-of-opac-reservett-.patch (text/plain), 5.20 KB, created by
Victor Grousset/tuxayo
on 2017-12-21 17:28:18 UTC
(
hide
)
Description:
Bug 19849: Minor fixes & refactor of opac-reserve.tt & opac-user.tt
Filename:
MIME Type:
Creator:
Victor Grousset/tuxayo
Created:
2017-12-21 17:28:18 UTC
Size:
5.20 KB
patch
obsolete
>From afbd0d08fa9708cad3b25a780a7560a4100e6590 Mon Sep 17 00:00:00 2001 >From: Victor Grousset <victor.grousset@biblibre.com> >Date: Wed, 20 Dec 2017 15:15:49 +0100 >Subject: [PATCH] Bug 19849: Minor fixes & refactor of opac-reserve.tt & > opac-user.tt > >- make next patch easely reviewable. >- fix lone quote. (Replace by <strong> >- add forgotten condition for 9999-12-31 >--- > .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 23 ++++++++++++++-------- > .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 14 +++++++++++-- > 2 files changed, 27 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >index 0f2f4eb..359e1f6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -42,16 +42,23 @@ > [% IF ( debarred ) %] > <li id="debarred"> > Your account has been frozen. >- [% IF debarred_comment %] Comment: <span id="userdebarred_comment">" >- [% IF debarred_comment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %] >- [% ELSE %] >- [% debarred_comment | html_line_break %] >+ [% IF debarred_comment %] >+ Comment: >+ <span id="userdebarred_comment"> >+ <strong> >+ [% IF debarred_comment.search('OVERDUES_PROCESS') %] >+ Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %] >+ [% ELSE %] >+ [% debarred_comment | html_line_break %] >+ [% END %] >+ </strong> >+ </span> > [% END %] >- </span> >- [% END %] > >- [% IF debarred_date && debarred_date != '9999-12-31' %] End date: <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>[% END %] >+ [% IF debarred_date && debarred_date != '9999-12-31' %] >+ End date: >+ <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span> >+ [% END %] > <br /><em>Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a> > </li> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 35cf5a0..158cd77 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -108,8 +108,18 @@ Using this account is not recommended because some parts of Koha will not functi > </li> > [% ELSE %] > <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen. >- [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %] >- [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %] >+ [% IF ( BORROWER_INFO.debarredcomment ) %] >+ Comment: >+ <span id="userdebarred_comment"> >+ <strong> >+ [% BORROWER_INFO.debarredcomment %] >+ </strong> >+ </span> >+ [% END %] >+ [% IF ( BORROWER_INFO.userdebarreddate && debarred_date != '9999-12-31' ) %] >+ End date: >+ <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span> >+ [% END %] > <em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li> > [% END %] > [% END %] >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19849
:
70070
|
70071
|
76650
|
76651
|
76719
|
76720