From 3a47b5812a939aaff02871b96411ea17e8d33598 Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 Signed-off-by: Jonathan Druart --- .../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 %] -
Note about the accompanying materials:
- [% ADDITIONAL_MATERIALS | html %] +
Note about the accompanying materials: [% ADDITIONAL_MATERIALS | html %]
[% 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 @@
[% END %] - [% IF additional_materials && !multiple_confirmed %] -
-
    -
  • - Note about the accompanying materials: [% additional_materials | html %] -
  • -
+ [% IF additional_materials && !needs_confirm && !multiple_confirmed %] +
+ Note about the accompanying materials: [% additional_materials | html %]
[% END %] @@ -314,7 +310,7 @@ -- 2.39.5