From 3a47b5812a939aaff02871b96411ea17e8d33598 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 17 Sep 2020 12:21:10 +0100
Subject: [PATCH] Bug 25261: (QA follow-up) Make issue and returns messages
 consistent

This patch makes the confirmation dialogue handing and visuality
consistent between issues and returns.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/circ/circulation.tt              |  3 +--
 .../intranet-tmpl/prog/en/modules/circ/returns.tt    | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index a2b9097821..778cdb3d9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -55,8 +55,7 @@
                     [% END %]
 
                     [% IF ADDITIONAL_MATERIALS && !NEEDSCONFIRMATION %]
-                        <div id="materials" class="dialog message">Note about the accompanying materials: <br />
-                        [% ADDITIONAL_MATERIALS | html %]
+                        <div id="materials" class="dialog message">Note about the accompanying materials: [% ADDITIONAL_MATERIALS | html %]
                         </div>
                     [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index b09e43fcbf..fefcc8f02e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -118,13 +118,9 @@
                                 </div>
                             [% END %]
 
-                            [% IF additional_materials && !multiple_confirmed %]
-                                <div class="dialog alert">
-                                    <ul>
-                                        <li>
-                                        Note about the accompanying materials: [% additional_materials | html %]
-                                        </li>
-                                    </ul>
+                            [% IF additional_materials && !needs_confirm && !multiple_confirmed %]
+                                <div class="dialog message">
+                                    Note about the accompanying materials: [% additional_materials | html %]
                                 </div>
                             [% END %]
 
@@ -314,7 +310,7 @@
                                         <div class="modal-body">
                                             <ul>
                                                 <li>
-                                                    Please confirm that the accompanying materials are present: [% additional_materials | html %]
+                                                    Please confirm that the accompanying materials are present: <strong>[% additional_materials | html %]</strong>
                                                 </li>
                                             </ul>
                                         </div>
-- 
2.39.5