Bugzilla – Attachment 48582 Details for
Bug 15950
Use Font Awesome icons for acquisitions basket close confirmation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 15950: Use Font Awesome icons for acquisitions basket close confirmation
PASSED-QA-Bug-15950-Use-Font-Awesome-icons-for-acq.patch (text/plain), 2.97 KB, created by
Katrin Fischer
on 2016-03-03 06:48:16 UTC
(
hide
)
Description:
[PASSED QA] Bug 15950: Use Font Awesome icons for acquisitions basket close confirmation
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2016-03-03 06:48:16 UTC
Size:
2.97 KB
patch
obsolete
>From 17452a3696ad95aad5de0c74bea9ebe5f8b78dd2 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 1 Mar 2016 13:23:52 -0500 >Subject: [PATCH] [PASSED QA] Bug 15950: Use Font Awesome icons for > acquisitions basket close confirmation > >When closing a basket in Acquisitions the confirmation dialog should be >styled using Font Awesome icons. This patch adds them. > >The cancel button has been moved into its own form so that we can get >rid of several problematic JavaScript issues: The use of the >"javascript:" pseudo-protocol, the use of an "onclick" attribute, and >the use of a JS redirect where a GET action will do. > >To test, apply the patch and locate an open basket in Acquisitions which >can be closed. > >- Click the 'Close this basket' button and confirm that the icons in the > dialog look correct. >- Test the cancel operation to make sure you are redirected back to the > page showing the basket details. >- Test the confirm operation and verify that the basket is closed. > >Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> >Works as advertised > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >Please note that the confirmation message display depends on >BasketConfirmations. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 67ee332..7bcbbbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -649,7 +649,7 @@ > [% IF ( confirm_close ) %] > <div id="closebasket_needsconfirmation" class="dialog alert"> > >- <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm"> >+ <form action="/cgi-bin/koha/acqui/basket.pl"> > <h1>Are you sure you want to close basket [% basketname|html %]?</h1> > [% IF ( CAN_user_acquisition_group_manage ) %] > <p> >@@ -662,8 +662,11 @@ > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > <input type="hidden" name="confirm" value="1" /> > <input type="hidden" name="basketgroupname" value="[% basketgroupname %]" /> >- <input type="submit" class="approve" value="Yes, close (Y)" accesskey="y" /> >- <input type="submit" class="deny" value="No, don't close (N)" accesskey="n" onclick="javascript:window.location='/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]';return false;" /> >+ <button type="submit" class="approve" accesskey="y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button> >+ </form> >+ <form action="/cgi-bin/koha/acqui/basket.pl" method="get"> >+ <input type="hidden" name="basketno" value="[% basketno %]" /> >+ <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button> > </form> > </div> > [% END %] >-- >1.9.1
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 15950
:
48517
|
48518
| 48582