From 250467eb414b816ca09c298a222b726d5f811b3c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 8 Mar 2013 09:46:13 -0500 Subject: [PATCH] Bug 9769 [Revised] Replace YUI buttons on acquisitions basket page with Bootstrap Toolbar buttons on the acquisitions basket page are constructed by YUI. They should use Bootstrap instead. Other minor changes: Fixes for invalid markup. To test, view baskets in various states: Empty, open closed. View baskets in groups and not in groups. Buttons should look correct and work correctly: - Edit - Delete - Close - Reopen - Export Revision corrects check for 'skip_confirm_reopen' variable when reopening baskets. Please test with BasketConfirmations both on and off. Signed-off-by: Brendan Signed-off-by: Katrin Fischer Tested all options, some notes about behaviour: - closing a basket is only possible, when there are no uncertain prices (no button close basket) - reopening a basket requires, that you first remove the basket from any basket group (no button to reopen basket) Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/acqui/basket.tt | 94 +++++++------------ 1 file changed, 36 insertions(+), 58 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 386d699723..463760f0ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -78,7 +78,8 @@ [% UNLESS ( grouped ) %] @@ -127,62 +136,25 @@ [% UNLESS ( confirm_close ) %] [% UNLESS ( selectbasketg ) %] [% UNLESS ( closedate ) %] -
- - - +
[% ELSE %] [% UNLESS ( grouped ) %] -
- - + [% END %] [% END %] @@ -307,13 +279,16 @@ [% FOREACH foot_loo IN book_foot_loop %] Total (GST [% foot_loo.gstgsti %]) - +   +   +   +   [% foot_loo.quantity %] [% foot_loo.totalgste %] [% foot_loo.totalgsti %] - +   [% foot_loo.gstvalue %] - +   [% IF ( active ) %] [% UNLESS ( closedate ) %]   @@ -324,13 +299,16 @@ [% END %] Total ([% currency %]) - +   +   +   +   [% total_quantity %] [% total_gste %] [% total_gsti %] - +   [% total_gstvalue %] - +   [% IF ( active ) %] [% UNLESS ( closedate ) %]   @@ -356,12 +334,12 @@ Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %] (suggestion #[% books_loo.suggestionid %]) [% END %] +

[% IF ( books_loo.notes ) %]

Note: [% books_loo.notes|html %] [Change note]

[% ELSE %] - [Add note] +

[Add note]

[% END %] -

[% books_loo.rrpgste %] [% books_loo.ecostgste %] -- 2.39.5