From 5d61b082ae9dfc7cf1202d6be91d4c8db4e5e645 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 30 Oct 2018 14:30:12 +0000
Subject: [PATCH] Bug 20844: (follow-up) Fix style of dialogs

This patch modifies the add item and item detail templates so that
the hold cancellation dialogs match other similar dialogs in Koha.

To test, apply the patch and perform step 10 or the original test plan.
Confirm that the confirmation dialogs look correct.
---
 .../prog/en/modules/catalogue/moredetail.tt        | 19 +++++++++----
 .../prog/en/modules/cataloguing/additem.tt         | 32 +++++++++++++---------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 95af665..74c7a3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -50,16 +50,23 @@
 
     [% FOREACH ITEM_DAT IN ITEM_DATA %]
     <div class="yui-g">
-         <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
+        <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
         [% IF ((ITEM_DAT.itemnumber == lostitemnumber) && (LostItemLevelHold)) %]
-        <div class="alert alert-warning">
-            <form id="DeallocateLostItemLevelHold" method="post" action="updateitem.pl" name="DeallocateLostItemLevelHold">
+        <div class="dialog alert">
+            <h4>This item has an item-level hold on it:</h4>
+            <form method="post" action="updateitem.pl">
                 <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/>
                 <input type="hidden" name="itemnumber" value="[% lostitemnumber | html %]"/>
                 <input type="hidden" name="itemlost" value="[% itemlost | html %]"/>
-                This item has an item-level hold on it:
-                <input type="submit" name="RetainHold" value="Retain Hold"/>
-                <input type="submit" name="CancelHold" value="Cancel Hold"/>
+                <input type="hidden" name="RetainHold" value="RetainHold" />
+                <button class="approve" type="submit"><i class="fa fa-fw fa-check"></i> Retain hold</button>
+            </form>
+            <form method="post" action="updateitem.pl">
+                <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/>
+                <input type="hidden" name="itemnumber" value="[% lostitemnumber | html %]"/>
+                <input type="hidden" name="itemlost" value="[% itemlost | html %]"/>
+                <input type="hidden" name="CancelHold" value="CancelHold" />
+                <button class="deny" type="submit"><i class="fa fa-fw fa-remove"></i> Cancel hold</button>
             </form>
         </div>
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 0d79293..057bf9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -247,6 +247,25 @@ function confirm_deletion() {
 </div>
 <div class="yui-u">
 <div id="cataloguing_additem_newitem">
+
+    [% IF (LostItemLevelHold) %]
+        <div class="dialog alert">
+            <h4>This item has an item-level hold on it:</h4>
+            <form method="get" action="/cgi-bin/koha/cataloguing/additem.pl">
+                <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
+                <button class="approve" type="submit"><i class="fa fa-fw fa-check"></i> Retain hold</button>
+            </form>
+            <form method="post" action="/cgi-bin/koha/cataloguing/additem.pl">
+                <input type="hidden" name="itemnumber" value="[% lostitemnumber | html %]" />
+                <input type="hidden" name="op" value="additem" />
+                <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
+                <input type="hidden" name="RetainHold" value="" />
+                <input type="hidden" name="CancelHold" value="CancelHold" />
+                <button class="deny" type="submit"><i class="fa fa-fw fa-remove"></i> Cancel hold</button>
+            </form>
+        </div>
+    [% END %]
+
     <form id="f" method="post" action="/cgi-bin/koha/cataloguing/additem.pl" name="f">
     <input type="hidden" name="op" value="[% op | html %]" />
     [% IF (popup) %]
@@ -259,19 +278,6 @@ function confirm_deletion() {
         <h2 id="edititem">Edit Item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]</h2>
     [% END %]
 
-
-    [% IF (LostItemLevelHold) %]
-        <div class="alert alert-warning">
-            <form id="DeallocateLostItemLevelHold" method="post" action="/cgi-bin/koha/cataloguing/additem.pl" name="DeallocateLostItemLevelHold">
-                <input type="hidden" id="itemnumber" name="itemnumber" value="[% lostitemnumber | html %]"/>
-                This item has an item-level hold on it:
-                <input type="submit" name="RetainHold" value="Retain Hold"/>
-                <input type="submit" name="CancelHold" value="Cancel hold"/>
-            </form>
-        </div>
-    [% END %]
-
-
 	<fieldset class="rows">
 	<ol>
         [% FOREACH ite IN item %]
-- 
2.1.4