From 3f0313253da712920fb08935e7272237b5adde6b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 11 Feb 2016 12:23:49 -0500
Subject: [PATCH] Bug 15804: Use standard dialog style for confirmation of MARC
 subfield deletion
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

When deleting a MARC framework subfield, the confirmation message is not
styled. This patch modifies the template to style the confirmation
message like similar ones.

To test, apply the patch and go to Administration -> MARC framworks.

 - Click 'MARC structure' for a framework you can edit.
 - Click 'subfields' for a tag you can edit.
 - Click 'Delete' for a subfield you can delete. You should see a
   confirmation dialog styled like other "alert" type dialogs.
 - Test both canceling and confirming deletion to confirm that both
   function correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8323259d8401907975446af35f2a018748d35e40)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../modules/admin/marc_subfields_structure.tt | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index bd76f43130..20a4e1c0d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -346,25 +346,29 @@ function populateHiddenCheckboxes(tab) {
 
 [% IF ( delete_confirm ) %]
 
-<h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
-    <p>Subfield: [% tagsubfield %]</p>
-    <p>Description: [% liblibrarian %]</p>
-
-            <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
-                <input type="hidden" name="searchfield" value="[% searchfield %]" />
-                <input type="hidden" name="tagfield" value="[% tagfield  | html %]" />
-				<input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
-				<input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-				<input type="submit" value="Yes, delete this subfield" />
-            </form>
-			
-			<form action="[% script_name %]" method="post">
-			<input type="hidden" name="searchfield" value="[% searchfield %]" />
-                        <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
-			<input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
-			<input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-			<input type="submit" value="No, do not delete" />
-            </form>
+    <div class="dialog alert">
+        <h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
+        <p>Subfield: [% tagsubfield %]</p>
+        <p>Description: [% liblibrarian %]</p>
+
+        <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+            <input type="hidden" name="searchfield" value="[% searchfield %]" />
+            <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
+            <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
+            <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
+            <input type="submit" class="approve" value="Yes, delete this subfield"/>
+        </form>
+
+
+        <form action="[% script_name %]" method="post">
+            <input type="hidden" name="searchfield" value="[% searchfield %]" />
+            <input type="hidden" name="tagfield" value="[% tagfield | html%]" />
+            <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
+            <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
+            <input type="submit" class="deny" value="No, do not delete"/>
+        </form>
+    </div>
+
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-- 
2.39.5