From 36aa22d3c80f0d25e59950399ed3464ff2ef0542 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Feb 2013 12:58:46 -0500 Subject: [PATCH] Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap This patch converts the toolbar on acquisitions pages to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view acquisitions pages and confirm that buttons look correct and work correctly: - acqui-home.pl (Acquisitions home page) - booksellers.pl (Acquisitions -> Vendor search) - supplier.pl (Acquisitions -> Vendor search -> Vendor) - aqcontract.pl (Acquisitions -> Vendor search -> Vendor -> Contracts) - uncertainprice.pl (Aquisitions -> Vendor search -> Vendor -> Uncertain prices) View these pages for vendors with and without orders. Signed-off-by: Bernardo Gonzalez Kriegel Comment: Buttons works. No errors. Tested vendors with and without orders (delete button in last case) Signed-off-by: Katrin Fischer Works nicely, changes are consistent. Signed-off-by: Jared Camins-Esakov --- .../prog/en/includes/acquisitions-toolbar.inc | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index c0654fba1a..5308b5a9f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -1,44 +1,40 @@ -
+
+ [% IF ( booksellerid ) %] +
+ New + + +
+ [% IF ( CAN_user_acquisition_vendors_manage ) %] + [% UNLESS ( basketcount OR subscriptioncount ) %] -
  • Delete vendor
  • + [% END %] [% END %] - [% IF ( CAN_user_acquisition_order_receive && basketcount ) %]
  • Receive shipments
  • [% END %] + [% IF ( CAN_user_acquisition_order_receive && basketcount ) %] + + [% END %] [% ELSE %] -
  • New vendor
  • + [% END %] -
    -- 2.39.5