Bugzilla – Attachment 48745 Details for
Bug 15884
Vendor contract deletion warning is incorrectly styled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[3.22.x] Bug 15884 - Vendor contract deletion warning is incorrectly styled
Bug-15884---Vendor-contract-deletion-warning-is-in.patch (text/plain), 3.57 KB, created by
Julian Maurice
on 2016-03-07 12:47:52 UTC
(
hide
)
Description:
[3.22.x] Bug 15884 - Vendor contract deletion warning is incorrectly styled
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2016-03-07 12:47:52 UTC
Size:
3.57 KB
patch
obsolete
>From a4f1103e416357dc0635f4d5347d50ff68457459 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 > >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> >--- > .../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 684d69f..004a6af 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) { > </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> >@@ -153,15 +152,18 @@ function Check(ff) { > <tr><th scope="row">Contract end date:</th><td>[% contractenddate | $KohaDates %]</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 %]&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.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15884
:
48311
|
48316
|
48464
| 48745