From c19d6be2c0e7f7518523eec48687237b3ca71e44 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Tue, 19 Jul 2016 05:03:45 +0000 Subject: [PATCH] Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard --- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 13 ++++--------- .../prog/en/modules/acqui/neworderempty.tt | 3 +-- .../prog/en/modules/acqui/newordersubscription.tt | 6 +++--- .../prog/en/modules/acqui/z3950_search.tt | 18 ++++++++++++++---- .../prog/en/modules/circ/reserveratios.tt | 14 ++++++++++++-- koha-tmpl/intranet-tmpl/prog/js/additem.js | 7 +++---- 7 files changed, 38 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index acf84e1..359bca6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -470,7 +470,7 @@ [% batch_lis.staged_date | $KohaDates with_hours => 1 %] [% batch_lis.num_records %] - Add orders + Add orders [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt index 21b428c..14a1fb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -66,8 +66,7 @@ Summary Publisher Copyright -   -   + Actions @@ -89,13 +88,9 @@ [% biblio.copyrightdate %] - - View MARC - - - - Order - + + View MARC + Order [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index e8463d1..6f23969 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -423,8 +423,7 @@ $(document).ready(function() - - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index b97b20a..ad3ab5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -94,12 +94,12 @@ [% END %] - - - + + [% FOREACH breeding_loo IN breeding_loop %] [% IF ( breeding_loo.breedingid ) %] @@ -142,8 +142,18 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : - - + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt index ec92cb7..86cd77e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -111,8 +111,18 @@ [% END %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js index 0f93310..d87f2c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/additem.js +++ b/koha-tmpl/intranet-tmpl/prog/js/additem.js @@ -87,13 +87,12 @@ function constructTrNode(index, unique_item_fields) { 'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes']; var result = ""; - var edit_link = "" + var edit_link = " " + (window.MSG_ADDITEM_JS_EDIT || "Edit") + ""; var del_link = "" + + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-mini'> " + (window.MSG_ADDITEM_JS_DELETE || "Delete") + ""; - result += ""; - result += ""; + result += ""; for(i in fields) { var field = fields[i]; var field_elt = $("#" + index) -- 2.1.4
  Actions Barcode Home library Holding library + [% IF (sub.alreadyOnOrder) %] Outstanding order (only one order per subscription is allowed) [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%] - - Order + + Order [% ELSE %] Cannot be ordered diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index e7e8fff..fe1be2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -130,8 +130,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Author ISBN LCCNPreview   
[% breeding_loo.author %] [% breeding_loo.isbn %] [% breeding_loo.lccn %]MARCCardOrder + + Order
[% IF ( reserveloo.thisratio_atleast1 ) %]

[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %][% reserveloo.ratiocalc %] to order[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %] - [% IF ( reserveloo.pendingorders ) %]
[% reserveloo.pendingorders %] pending[% END %]

[% END %]
+

+ [% IF ( reserveloo.thisratio_atleast1 ) %] + [% IF ( CAN_user_acquisition && basketno && booksellerid ) %] + [% reserveloo.ratiocalc %] to order + [% END %] + [% IF ( reserveloo.pendingorders ) %]
[% reserveloo.pendingorders %] pending[% END %] + [% ELSE %] + 0 to order + [% END %] +

+
" + edit_link + "" + del_link + "" + edit_link + " " + del_link + "