From 1f53e721ef3f0cc5e7885e478f59c04497f197a7 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>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../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 7df1808123..04b3401ebb 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 5ef54f9a73..8666fa2f12 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -58,23 +58,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 84fbd6be40..8942e50a96 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.39.5