From bf49d9535c66636b96aa621915d2f1ddab8c6b03 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 1 Feb 2013 16:10:14 -0500 Subject: [PATCH] [PASSED QA] Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap This patch converts the toolbar include file used by the quotes editor to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in the quotes editor. Buttons and menus should look correct and work correctly. Test save, delete, and upload buttons on the summary page, and save and delete buttons on the upload page. Signed-off-by: Bernardo Gonzalez Kriegel Comment: All buttons work. Tested add, delete and upload. You are using icon-remove and not icon-remove-circle, which I prefer but is different of Bug 9627. Question: "Import quotes" takes you to "Quotes uploader", would not it be more consistent to use "Upload quotes" or "Quotes importer"? Signed-off-by: Katrin Fischer Works nicely, no problems found. I think the difference to 9627 is, that this really deletes quotes, while the icon-remove-circle is used for closing subscriptions. Closed subscriptions remain in the system, it's just a way to indicate that there will be no new issues. There is a separate option to really delete subscriptions. --- .../prog/en/includes/quotes-toolbar.inc | 52 ++------------------ .../prog/en/includes/quotes-upload-toolbar.inc | 45 ++--------------- .../prog/en/modules/tools/quotes-upload.tt | 8 ++- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 8 +++ 4 files changed, 23 insertions(+), 90 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc index 7229fb5..9b8f37f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc @@ -1,47 +1,5 @@ - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc index 6d10986..ef3fd3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc @@ -1,41 +1,4 @@ - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index 19833a6..2dc4af9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -24,6 +24,10 @@ var progress = document.querySelector('.percent'); $("#server_response").hide(); + function yuiGetData() { + fnGetData(document.getElementById('quotes_editor')); + } + function fnAbortRead() { reader.abort(); } @@ -148,8 +152,8 @@ $('#file_uploader').css("position","absolute"); $('#file_uploader').css("top","-150px"); $('#quotes_editor').css("visibility","visible"); - oSaveButton.on("click", yuiGetData); - oDeleteButton.on("click", fnClickDeleteRow); + $("#save_quotes").on("click", yuiGetData); + $("#delete_quote").on("click", fnClickDeleteRow); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt index 7a838d0..493c34b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -83,6 +83,14 @@ }); }, }); + $("#add_quote").click(function(){ + fnClickAddRow(); + return false; + }); + $("#delete_quote").click(function(){ + fnClickDeleteRow(); + return false; + }); }); function fnClickAddQuote(e, node) { -- 1.7.9.5