From a1d1dc2b4f85f950d5fdb0f6b65d7241ceebba39 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 19 Feb 2013 15:18:27 -0500 Subject: [PATCH] Bug 9669 - Replace YUI buttons on staff client cart toolbar This patch converts the toolbar on the staff client cart page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the staff client cart and confirm that all buttons look correct and work correctly. Functions to test include: Full/brief display Send Download (various options) Print Empty and close Hide window Signed-off-by: Bernardo Gonzalez Kriegel Comment: Tested all buttons, works very well. No errors Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 68 +++++--------------- 2 files changed, 18 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index e95c60f..8e19eea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2527,7 +2527,6 @@ a.disabled { position: inherit; top: auto; right : auto; - line-height: inherit; filter : none; float : none; font-size: inherit; @@ -2539,6 +2538,7 @@ a.disabled { .close:hover { color: #538200; filter: inherit; + font-size: inherit; opacity: inherit; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 9989194..cb1f573 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -40,8 +40,6 @@ function placeHold () { window.close(); } - - $(document).ready(function(){ $("#CheckAll").click(function(){ var checked = []; @@ -69,24 +67,6 @@ function placeHold () { headers: { 0: { sorter: false }} }); }); - -function yuiToolbar() { - var downloadmenu = [ - { text: _("iso2709"), url: "/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list %]" }, - { text: _("RIS"), url: "/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list %]" }, - { text: _("BibTex"), url: "/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&bib_list=[% bib_list %]" }, -[% FOREACH csv_profile IN csv_profiles %] - { text: _("CSV - [% csv_profile.profile %]"), url: "/cgi-bin/koha/basket/downloadcart.pl?format=[% csv_profile.export_format_id %]&bib_list=[% bib_list %]" }, -[% END %] - ]; - new YAHOO.widget.Button({ - type: "menu", - label: _("Download"), - name: "downloadmenubutton", - menu: downloadmenu, - container: "downloadcartc" - }); -} //]]> [% END %] @@ -98,37 +78,23 @@ function yuiToolbar() { [% UNLESS ( print_basket ) %]

Your cart

-
- +
+ [% IF ( verbose ) %] Brief display[% ELSE %] More details[% END %] + Send +
+ Download + +
+ Print + Empty and close + Hide window
[% END %] -- 1.7.10.4