From 86d96899a4a0a0de90af8f17c273fd205316a9e7 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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"
. 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. Followed test plan, works as expected. Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../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 684d69fb99..382caf1c4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -142,9 +142,8 @@ function Check(ff) { [% END %] [% IF ( delete_confirm ) %] -
-
- Confirm deletion of contract [% contractnumber %] +
+

Confirm deletion of contract [% contractname %]

@@ -153,15 +152,18 @@ function Check(ff) {
Contract number:[% contractnumber %]
Contract name:[% contractname %]
Contract end date:[% contractenddate | $KohaDates %]
Vendor:[% booksellername %]
-
+ - - Cancel -
-
-
+ + +
+ + + +
+
[% END %] [% IF ( delete_confirmed ) %]

Contract deleted

-- 2.39.5