@@ -, +, @@
---
.../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(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ a/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 %]
+
+
[% IF restriction.expiration %]
[% restriction.expiration | $KohaDates %]
[% ELSE %]
Indefinite
[% END %]
- [% IF restriction.comment %]
- [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %]
- [% ELSE %]
- [% restriction.type.display_text | html %]
- [% END %]
+
+
+ [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%]
+
+
[% END %]
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ a/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 %]
- Indefinite
- [% END %]
-
- [% ELSE %]
- [% restriction.type.display_text | html %], frozen until:
- [% IF restriction.expiration %]
- [% restriction.expiration | $KohaDates %]
- [% ELSE %]
- Indefinite
- [% END %]
-
+
+ [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: , frozen until:
+
+ [%- IF restriction.expiration -%]
+ [%- restriction.expiration | $KohaDates -%]
+ [%- ELSE -%]
+ Indefinite
+ [%- END -%]
+
[% END %]
+
[% END %]
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ a/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 %]
+
+ [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: , frozen until:
+
+ [%- IF restriction.expiration -%]
+ [%- restriction.expiration | $KohaDates -%]
+ [%- ELSE -%]
Indefinite
- [% END %]
-
- [% ELSE %]
- [% restriction.type.display_text | html %], frozen until:
- [% IF restriction.expiration %]
- [% restriction.expiration | $KohaDates %]
- [% ELSE %]
- Indefinite
- [% END %]
-
+ [%- END -%]
+
[% END %]
+
[% END %]
[% END %]
--