Attachment 154760 Details for Bug 34382 – Bug 34382: Fix inconsistencies in Patron categories page titles, breadcrumbs, and header

[patch] Bug 34382: Fix inconsistencies in Patron categories page titles, breadcrumbs, and header

Bug-34382-Fix-inconsistencies-in-Patron-categories.patch (text/plain), 11.59 KB, created by Katrin Fischer on 2023-08-24 21:38:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-08-24 21:38:12 UTC

Size: 11.59 KB

patch

obsolete

>From 8e7a60122e6c6673d88074522cb4fcc861b39df8 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 18 Aug 2023 10:03:49 +0000
>Subject: [PATCH] Bug 34382: Fix inconsistencies in Patron categories page
> titles, breadcrumbs, and header
>
>This patch makes some changes to the patron categories administration
>page so that the page title, breadcrumb navigation, and headings are
>more consistent with each other.
>
>To test, apply the patch and go to Administration -> Patron categories.
>
>- Test all variations of the page:
>  - Main page (listing categories)
>  - New category
>  - Edit category
>  - Confirm deletion of category when the category is in use (there are
>    existing patrons who have that category)
>  - Confirm deletion of category when the category is not in use
>
>Note: This patch contains whitespace changes, so please ignore
>whitespace if you're checking the diff.
>
>Signed-off-by: Amanda Hovey <amanda.hovey@parliament.nsw.gov.au>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/admin/categories.tt       | 154 +++++++++---------
> 1 file changed, 77 insertions(+), 77 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 89f522c24b..1e360ca394 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -18,7 +18,7 @@
>     [% END %]
>     [% IF op == 'delete_confirm' %]
>         [% IF ( patrons_in_category > 0 ) %]
>-            [% tx("Cannot delete: category '{categorycode}'", { categorycode = categorycode }) | html %]
>+            [% tx("Cannot delete category '{categorycode}'", { categorycode = categorycode }) | html %]
>         [% ELSE %]
>             [% tx("Confirm deletion of category '{categorycode}'", { categorycode = categorycode }) | html %]
>         [% END %] &rsaquo;
>@@ -55,7 +55,7 @@
>         [% IF op == 'add_form' %]
>             [% IF ( categorycode ) %]
>                 [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                    <span>Modify category '[% categorycode | html %]'</span>
>+                   [% tx("Modify category '{categorycode}'", { categorycode = categorycode }) | html %]
>                 [% END %]
>             [% ELSE %]
>                 [% WRAPPER breadcrumb_item bc_active= 1 %]
>@@ -67,11 +67,11 @@
>         [% IF op == 'delete_confirm' %]
>             [% IF ( patrons_in_category > 0 ) %]
>                 [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                    <span>Cannot delete: Category [% categorycode | html %] in use</span>
>+                    [% tx("Cannot delete category '{categorycode}'", { categorycode = categorycode }) | html %]
>                 [% END %]
>             [% ELSE %]
>                 [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                    <span>Confirm deletion of category '[% categorycode | html %]'</span>
>+                    [% tx("Confirm deletion of category '{categorycode}'", { categorycode = categorycode }) | html %]
>                 [% END %]
>             [% END %]
>         [% END %]
>@@ -117,7 +117,7 @@
>         <input type="hidden" name="op" value="add_validate" />
>         <input type="hidden" name="checked" value="0" />
>         [% IF category %]
>-            <h1>Modify category [% categorycode | html %]</h1>
>+            <h1>[% tx("Modify category '{categorycode}'", { categorycode = categorycode }) | html %]</h1>
>         [% ELSE %]
>             <h1>New category</h1>
>         [% END %]
>@@ -436,83 +436,83 @@
> [% END %]
> 
> [% IF op == 'delete_confirm' %]
>-    <form action="/cgi-bin/koha/admin/categories.pl" method="post">
>-        <fieldset>
>-            <legend>
>-                <h1>
>-                    [% IF patrons_in_category > 0 %]
>-                        <span>Category [% categorycode | html %] is in use. Deletion not possible!</span>
>+    <h1>
>+        [% IF patrons_in_category > 0 %]
>+            [% tx("Cannot delete category '{categorycode}'", { categorycode = categorycode }) | html %]
>+        [% ELSE %]
>+            [% tx("Confirm deletion of category '{categorycode}'", { categorycode = categorycode }) | html %]
>+        [% END %]
>+    </h1>
>+
>+    [% IF patrons_in_category > 0  %]
>+        <div class="dialog alert">
>+            <strong>This category is used [% patrons_in_category | html %] times</strong>. Deletion not possible
>+        </div>
>+    [% END %]
>+
>+    <div class="page-section">
>+        <table>
>+            <tr><th scope="row">Category code: </th><td>[% category.categorycode | html %]</td></tr>
>+            <tr><th scope="row">Description: </th><td>[% category.description | html %]</td></tr>
>+            <tr><th scope="row">Enrollment period: </th>
>+                <td>
>+                    [% IF category.enrolmentperiod %]
>+                        [% category.enrolmentperiod | html %] months
>                     [% ELSE %]
>-                        <span>Confirm deletion of category [% categorycode | html %]</span>
>+                        until [% category.enrolmentperioddate | $KohaDates %]
>                     [% END %]
>-            </h1>
>-            </legend>
>+                </td>
>+            </tr>
>+            <tr><th scope="row">Password expiration: </th><td>[% category.password_expiry_days | html %] days</td></tr>
>+            <tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired | html %] years</td></tr>
>+            <tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit | html %] years</td></tr>
>+            <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
>+            <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 interface</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>
> 
>-            [% IF patrons_in_category > 0  %]
>-                <div class="dialog alert">
>-                    <strong>This category is used [% patrons_in_category | html %] times</strong>. Deletion not possible
>-                </div>
>+            [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>+            <tr>
>+                <th scope="row">Check previous checkouts: </th>
>+                <td>
>+                    [% SWITCH category.checkprevcheckout %]
>+                    [% CASE 'yes' %]
>+                        <span>Yes</span>
>+                    [% CASE 'no' %]
>+                        <span>No</span>
>+                    [% CASE 'inherit' %]
>+                        <span>Inherit</span>
>+                    [% END %]
>+                </td>
>+            </tr>
>             [% END %]
>-            <table>
>-                <tr><th scope="row">Category code: </th><td>[% category.categorycode | html %]</td></tr>
>-                <tr><th scope="row">Description: </th><td>[% category.description | html %]</td></tr>
>-                <tr><th scope="row">Enrollment period: </th>
>-                    <td>
>-                        [% IF category.enrolmentperiod %]
>-                            [% category.enrolmentperiod | html %] months
>-                        [% ELSE %]
>-                            until [% category.enrolmentperioddate | $KohaDates %]
>-                        [% END %]
>-                    </td>
>-                </tr>
>-                <tr><th scope="row">Password expiration: </th><td>[% category.password_expiry_days | html %] days</td></tr>
>-                <tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired | html %] years</td></tr>
>-                <tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit | html %] years</td></tr>
>-                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
>-                <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 interface</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">Can be guarantee</th><td>[% IF category.can_be_guarantee %]Yes[% ELSE %]No[% END %]</td></tr>
>+            <tr>
>+                <th scope="row">Default privacy: </th>
>+                <td>
>+                    [% SWITCH category.default_privacy %]
>+                    [% CASE 'default' %]
>+                        <span>Default</span>
>+                    [% CASE 'never' %]
>+                        <span>Never</span>
>+                    [% CASE 'forever' %]
>+                        <span>Forever</span>
>+                    [% END %]
>+                </td>
>+            </tr>
>+        </table>
>+    </div> 
> 
>-                [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>-                  <tr>
>-                      <th scope="row">Check previous checkouts: </th>
>-                      <td>
>-                          [% SWITCH category.checkprevcheckout %]
>-                          [% CASE 'yes' %]
>-                              <span>Yes</span>
>-                          [% CASE 'no' %]
>-                              <span>No</span>
>-                          [% CASE 'inherit' %]
>-                              <span>Inherit</span>
>-                          [% END %]
>-                      </td>
>-                  </tr>
>-                [% END %]
>-                <tr><th scope="row">Can be guarantee</th><td>[% IF category.can_be_guarantee %]Yes[% ELSE %]No[% END %]</td></tr>
>-                <tr>
>-                    <th scope="row">Default privacy: </th>
>-                    <td>
>-                        [% SWITCH category.default_privacy %]
>-                        [% CASE 'default' %]
>-                            <span>Default</span>
>-                        [% CASE 'never' %]
>-                            <span>Never</span>
>-                        [% CASE 'forever' %]
>-                            <span>Forever</span>
>-                        [% END %]
>-                    </td>
>-                </tr>
>-            </table>
>-            <fieldset class="action">
>-                [% IF patrons_in_category > 0 %]
>-                    <input type="submit" class="btn btn-primary" value="OK" />
>-                [% ELSE %]
>-                    <input type="hidden" name="op" value="delete_confirmed" />
>-                    <input type="hidden" name="categorycode" value="[% categorycode | html %]" />
>-                    <input type="submit" class="btn btn-primary" value="Delete this category" />
>-                    <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
>-                [% END %]
>-            </fieldset>
>+    <form action="/cgi-bin/koha/admin/categories.pl" method="post">
>+        <fieldset class="action">
>+            [% IF patrons_in_category > 0 %]
>+                <input type="submit" class="btn btn-primary" value="OK" />
>+            [% ELSE %]
>+                <input type="hidden" name="op" value="delete_confirmed" />
>+                <input type="hidden" name="categorycode" value="[% categorycode | html %]" />
>+                <input type="submit" class="btn btn-primary" value="Delete this category" />
>+                <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
>+            [% END %]
>         </fieldset>
>     </form>
> [% END %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 34382: 154634 | 154637 | 154760