Bugzilla – Attachment 166055 Details for
Bug 31097
Patron restriction types should display in staff interface and OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31097: Add classes, drop an ELSE, drop <br />
Bug-31097-Add-classes-drop-an-ELSE-drop-br-.patch (text/plain), 8.83 KB, created by
Martin Renvoize (ashimema)
on 2024-05-02 10:50:45 UTC
(
hide
)
Description:
Bug 31097: Add classes, drop an ELSE, drop <br />
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-05-02 10:50:45 UTC
Size:
8.83 KB
patch
obsolete
>From 3229fdab45c70cd815bd17a6cf5121f33761d36d Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 2 May 2024 11:41:36 +0100 >Subject: [PATCH] Bug 31097: Add classes, drop an ELSE, drop <br /> > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/includes/patron_messages.inc | 12 +++++---- > .../bootstrap/en/modules/opac-reserve.tt | 26 +++++++------------ > .../bootstrap/en/modules/opac-user.tt | 24 +++++++---------- > 3 files changed, 26 insertions(+), 36 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >index 7df18081238..04b3401ebb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -71,16 +71,18 @@ > Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %] > [% ELSE %] > [% FOREACH restriction IN patron.restrictions %] >+ <div class="[% restriction.type.code | lower | html %]_restriction"> >+ <span class="restriction_expiration"> > [% IF restriction.expiration %] > [% restriction.expiration | $KohaDates %] > [% ELSE %] > <strong>Indefinite</strong> > [% END %] >- [% IF restriction.comment %] >- [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %]<br /> >- [% ELSE %] >- [% restriction.type.display_text | html %]<br /> >- [% END %] >+ </span> >+ <span class="restriction_detail"> >+ [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%] >+ </span> >+ </div> > [% END %] > [% END %] > </em><br/> >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 a6e8df3667b..15affad8906 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -54,23 +54,17 @@ > Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %] > [% ELSE %] > [% FOR restriction IN logged_in_user.restrictions %] >- [% IF restriction.comment %] >- [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %], frozen until: >- [% IF restriction.expiration %] >- [% restriction.expiration | $KohaDates %] >- [% ELSE %] >- <strong>Indefinite</strong> >- [% END %] >- <br /> >- [% ELSE %] >- [% restriction.type.display_text | html %], frozen until: >- [% IF restriction.expiration %] >- [% restriction.expiration | $KohaDates %] >- [% ELSE %] >- <strong>Indefinite</strong> >- [% END %] >- <br /> >+ <div class="patron_restriction"> >+ [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: <span class="restriction_comment">[% restriction.comment | html_line_break %]</span>, frozen until: >+ <span class="restriction_expiration"> >+ [%- IF restriction.expiration -%] >+ [%- restriction.expiration | $KohaDates -%] >+ [%- ELSE -%] >+ <strong>Indefinite</strong> >+ [%- END -%] >+ </span> > [% END %] >+ </div> > [% END %] > [% END %] > </strong> >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 84fbd6be406..8942e50a96c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -175,23 +175,17 @@ > Restriction added by overdues process [% borrower.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] > [% ELSE %] > [% FOR restriction IN logged_in_user.restrictions %] >- [% IF restriction.comment %] >- [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %], frozen until: >- [% IF restriction.expiration %] >- [% restriction.expiration | $KohaDates %] >- [% ELSE %] >+ <div class="patron_restriction"> >+ [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: <span class="restriction_comment">[% restriction.comment | html_line_break %]</span>, frozen until: >+ <span class="restriction_expiration"> >+ [%- IF restriction.expiration -%] >+ [%- restriction.expiration | $KohaDates -%] >+ [%- ELSE -%] > <strong>Indefinite</strong> >- [% END %] >- <br /> >- [% ELSE %] >- [% restriction.type.display_text | html %], frozen until: >- [% IF restriction.expiration %] >- [% restriction.expiration | $KohaDates %] >- [% ELSE %] >- <strong>Indefinite</strong> >- [% END %] >- <br /> >+ [%- END -%] >+ </span> > [% END %] >+ </div> > [% END %] > [% END %] > </strong> >-- >2.44.0
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 31097
:
165059
|
165060
|
165138
|
165139
|
165218
|
165219
|
165220
|
165221
|
166054
| 166055 |
166255
|
166296
|
166428