From 73dad0648429b0ce0724092ffa67dc7d72a61953 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 23 Feb 2016 09:16:13 -0500
Subject: [PATCH] Bug 15884 - Vendor contract deletion warning is incorrectly
 styled
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

When deleting a contract in  Acquisitions -> Vendor -> Contracts, the
deletion confirmation message is not styled with the standard "dialog
alert" <div>. This patch modifies the confirmation markup to match the
standard.

To test, apply the patch and go to Acquisitions -> [ a vendor] ->
Contracts

- Try deleting a contract. The confirmation box should have the standard
  "dialog alert" class.
- Test the 'confirm' and 'cancel' actions and make sure both complete
  correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a4f1103e416357dc0635f4d5347d50ff68457459)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/modules/admin/aqcontract.tt       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index ed8336a9af..17a9fab8cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -141,9 +141,8 @@ function Check(ff) {
                 </form>
             [% END %]
             [% IF ( delete_confirm ) %]
-                <form action="[% script_name %]" method="post">
-                    <fieldset>
-                        <legend>Confirm deletion of contract [% contractnumber %]</legend>
+                    <div class="dialog alert">
+                        <h3>Confirm deletion of contract <i>[% contractname %]</i></h3>
                         <table>
                             <tr><th scope="row">Contract number:</th><td>[% contractnumber %]</td></tr>
                             <tr><th scope="row">Contract name:</th><td>[% contractname %]</td></tr>
@@ -152,15 +151,18 @@ function Check(ff) {
                             <tr><th scope="row">Contract end date:</th><td>[% contractenddate %]</td></tr>
                             <tr><th scope="row">Vendor:</th><td>[% booksellername %]</td></tr>
                         </table>
-                        <fieldset class="action">
+                        <form action="[% script_name %]" method="post">
                             <input type="hidden" name="op" value="delete_confirmed" />
                             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                             <input type="hidden" name="contractnumber" value="[% contractnumber %]" />
-                            <input type="submit" value="Delete this contract" />
-                            <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&amp;contractnumber=[% contractnumber %]">Cancel</a>
-                        </fieldset>
-                    </fieldset>
-                </form>
+                            <input type="submit" class="approve" value="Yes, delete contract"/>
+                        </form>
+                        <form action="/cgi-bin/koha/admin/aqcontract.pl" method="get">
+                            <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
+                            <input type="hidden" name="contractnumber" value="[% contractnumber %]" />
+                            <input type="submit" class="deny" value="No, do not delete"/>
+                        </form>
+                    </div>
             [% END %]
             [% IF ( delete_confirmed ) %]
                 <h3>Contract deleted</h3>
-- 
2.39.5