From bc427bf433c86a7a13a65725e01d2cc1d702169b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 21 Aug 2023 15:11:38 +0000
Subject: [PATCH] Bug 34388: Fix inconsistencies in Patron restriction types
 page headers

This patch fixes a couple of inconsistencies in the style of the patron
restriction types administration screen, making sure the restriction
type name is consistently in single quotes in headings and formatting
the deletion confirmation page like other administration interfaces.

Note: This patch contains indentation spaces, so ignore whitespace when
viewing the diff.

To test, apply the patch and go to Administration -> Patron restriction
types.

- If necessary, add a custom restriction type.
- After saving it, edit it.
- The page title, breadcrumb, and page heading should match: "Modify
  restriction type 'X'

- From the list of restriction types, click "Delete" on one of your
  custom restriction types.
- On the deletion confirmation page you should see a standard
  alert-style dialog box and two button options: "Yes, delete" and "No,
  do not delete." Both should work correctly.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/admin/restrictions.tt     | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
index 59576114c1..dd530d964f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
@@ -96,7 +96,7 @@
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="checked" value="0" />
         [% IF restriction %]
-            <h1>Modify restriction type [% PROCESS restriction_type_description restriction_type=restriction %]</h1>
+            <h1>Modify restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]'</h1>
             <input type="hidden" name="is_a_modif" value="1" />
         [% ELSE %]
             <h1>New restriction type</h1>
@@ -136,22 +136,18 @@
 [% END %]
 
 [% IF op == 'delete_confirm' %]
-    <form action="/cgi-bin/koha/admin/restrictions.pl" method="post">
-        <fieldset>
-            <legend>
-                Confirm restriction type deletion
-            </legend>
-
-            <p>Are you sure you want to delete '[% PROCESS restriction_type_description restriction_type=restriction %]'?</p>
-
-            <fieldset class="action">
-                <input type="hidden" name="op" value="delete_confirmed" />
-                <input type="hidden" name="code" value="[% restriction.code | html %]" />
-                <input type="submit" class="btn btn-primary" value="Delete this restriction type" />
-                <a class="cancel" href="/cgi-bin/koha/admin/restrictions.pl">Cancel</a>
-            </fieldset>
-        </fieldset>
-    </form>
+    <div class="dialog alert">
+        <h1>Confirm restriction type deletion</h1>
+        <p>Are you sure you want to delete '[% PROCESS restriction_type_description restriction_type=restriction %]'?</p>
+        <form action="/cgi-bin/koha/admin/restrictions.pl" method="post">
+            <input type="hidden" name="op" value="delete_confirmed" />
+            <input type="hidden" name="code" value="[% restriction.code | html %]" />
+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
+        </form>
+        <form action="/cgi-bin/koha/admin/restrictions.pl" method="get">
+            <button type="submit" class="deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
+        </form>
+    </div>
 [% END %]
 
 [% IF op == 'list' %]
-- 
2.39.5