Attachment 70802 Details for Bug 18818 – Bug 18818: (followup) correct template

[patch] Bug 18818: (followup) correct template

Bug-18818-followup-correct-template.patch (text/plain), 3.91 KB, created by Fridolin Somers on 2018-01-22 16:39:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2018-01-22 16:39:18 UTC

Size: 3.91 KB

patch

obsolete

>From 9d866090e06e185548e919f73520566efc77e669 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: (followup) 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
>---
> .../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 77c1a86..ff4aff4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -210,10 +210,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>
>@@ -288,7 +293,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>
>@@ -361,7 +366,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 %]
>@@ -470,8 +475,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.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 18818: 64422 | 70801 | 70802 | 70955 | 70956 | 70959 | 70960 | 70962 | 70963 | 70964 | 71227 | 71228 | 71229 | 72867 | 72868 | 72869 | 73604 | 74831 | 74832 | 74833 | 74834