Attachment 110339 Details for Bug 25261 – Bug 25261: (QA follow-up) Make issue and returns messages consistent

[patch] Bug 25261: (QA follow-up) Make issue and returns messages consistent

Bug-25261-QA-follow-up-Make-issue-and-returns-mess.patch (text/plain), 3.12 KB, created by Martin Renvoize (ashimema) on 2020-09-18 10:04:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-18 10:04:36 UTC

Size: 3.12 KB

patch

obsolete

>From adcbec11fd30a4501d0131270c1dbc74c525b242 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.
>---
> .../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 2985c2bb51..51d4c2e570 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 435b9a1e51..2faeb0e3ab 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 %]
> 
>@@ -312,7 +308,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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25261: 103856 | 103857 | 104011 | 104012 | 104013 | 104404 | 104405 | 104406 | 104407 | 104408 | 104409 | 104410 | 104411 | 104412 | 104413 | 104414 | 107217 | 107218 | 107219 | 107220 | 107221 | 107222 | 107228 | 107229 | 107230 | 107231 | 107232 | 107233 | 107234 | 107285 | 107331 | 107822 | 107823 | 108196 | 108197 | 108198 | 108199 | 108200 | 108201 | 108202 | 108203 | 108204 | 108205 | 108206 | 108207 | 108208 | 108230 | 108231 | 108232 | 108233 | 108234 | 108235 | 108236 | 108237 | 108238 | 108239 | 108240 | 108241 | 108242 | 109478 | 109479 | 109480 | 109481 | 109482 | 109483 | 109484 | 109485 | 109486 | 109487 | 109488 | 109489 | 109490 | 109491 | 109492 | 109493 | 109494 | 109495 | 109496 | 109497 | 109498 | 109499 | 109500 | 109501 | 109502 | 109503 | 109504 | 109508 | 110038 | 110039 | 110040 | 110041 | 110042 | 110043 | 110044 | 110045 | 110046 | 110047 | 110048 | 110049 | 110050 | 110051 | 110052 | 110133 | 110184 | 110258 | 110259 | 110268 | 110322 | 110323 | 110324 | 110325 | 110326 | 110327 | 110328 | 110329 | 110330 | 110331 | 110332 | 110333 | 110334 | 110335 | 110336 | 110337 | 110338 | 110339 | 110340 | 110341 | 110356 | 110357 | 110358 | 110359 | 110360 | 110361 | 110362 | 110363 | 110364 | 110365 | 110366 | 110367 | 110368 | 110369 | 110370 | 110371 | 110372 | 110373 | 110374 | 110375 | 110915 | 110916 | 110917 | 110918 | 110919 | 110920 | 110921 | 110922 | 110923 | 110924 | 110925 | 110926 | 110927 | 110928 | 110929 | 110930 | 110931 | 110932 | 110933 | 110934 | 111027