From 659a635412ab85701738c708e2fe447e0adfd416 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: [Revised] Use standard dialog style for
 confirmation of MARC subfield deletion

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.

Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs

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.

Revised to fix conflicts with rollback of Bug 13618

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as expected. Revised according with bug revert 13618

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 .../modules/admin/marc_subfields_structure.tt | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 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 0268800ff9..883d1689c7 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
@@ -188,25 +188,29 @@
 
 [% IF ( delete_confirm ) %]
 
-<h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
-    <p>Subfield: [% tagsubfield %]</p>
-    <p>Description: [% liblibrarian %]</p>
+    <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 %]" />
+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button>
+        </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 %]" />
+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
+        </form>
+    </div>
 
-            <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>
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-- 
2.39.5