From 775dd56a21fbd777f1f5a87c18587c7410824e6b Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Mon, 22 Jan 2018 17:32:19 +0100
Subject: [PATCH] Bug 18818: (follow-up) Correct template

Main change is the use of Yes/No instead if Display/Don't display.
It is more compact and more explicit.

And fixes in categories.tt :
- Template Toolkit markup inside HTML in <select id="quick_add_display">
- Missing double-quotes in HTML attributes
- Missing value display in delete confirmation table
- Correct capitalization

Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../prog/en/modules/admin/categories.tt            | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index 59ee124..1d22149 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -211,10 +211,15 @@
                   </li>
                 [% END %]
                 <li>
-                    <label for="quick_add_display">Display in quick add patron list:</label>
-                    <select id=quick_add_display name=quick_add_display>
-                        <option value=1 [% UNLESS category.quick_add_display %]selected=selected [% END %]>Display</option>
-                        <option value=0 [% UNLESS category.quick_add_display %]selected=selected [% END %]>Don't Display</option>
+                    <label for="quick_add_display">Display in quick add: </label>
+                    <select id="quick_add_display" name="quick_add_display">
+                        [% IF category.quick_add_display %]
+                            <option value="1" selected="selected">Yes</option>
+                            <option value="0">No</option>
+                        [% ELSE %]
+                            <option value="1">Yes</option>
+                            <option value="0" selected="selected">No</option>
+                        [% END %]
                     </select>
                 </li>
                 <li>
@@ -289,7 +294,7 @@
                 <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
                 <tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
                 <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price %]</td></tr>
-                <tr><th scope="row">Display in Quick Add Patron</th>></tr>
+                <tr><th scope="row">Display in quick add</th><td>[% IF category.quick_add_display %]Yes[% ELSE %]No[% END %]</td></tr>
 
                 [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
                   <tr>
@@ -362,7 +367,7 @@
                     <th scope="col">Messaging</th>
                     [% END %]
                     <th scope="col">Branches limitations</th>
-                    <th scope="col">Display in Quick Add Patron</th>
+                    <th scope="col">Display in quick add</th>
                     [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
                     <th scope="col">Check previous checkout?</th>
                     [% END %]
@@ -471,8 +476,10 @@
                           </td>
                         [% END %]
                         <td>
-                            [% IF category.quick_add_display %] Display
-                            [% ELSE %] Don't Display
+                            [% IF category.quick_add_display %]
+                                Yes
+                            [% ELSE %]
+                                No
                             [% END %]
                         </td>
                         <td>
-- 
2.1.4