@@ -, +, @@ --- .../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 | 2 +- koha-tmpl/intranet-tmpl/prog/js/additem.js | 7 +++---- 7 files changed, 27 insertions(+), 24 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -442,7 +442,7 @@ [% batch_lis.staged_date | $KohaDates with_hours => 1 %] [% batch_lis.num_records %] - Add orders + Add orders [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ a/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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -422,8 +422,7 @@ $(document).ready(function() - - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -90,12 +90,12 @@ [% END %] - - - + + [% FOREACH breeding_loo IN breeding_loop %] [% IF ( breeding_loo.breedingid ) %] @@ -146,8 +146,18 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : - - + + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -111,7 +111,7 @@ [% END %] - [% END %] --- a/koha-tmpl/intranet-tmpl/prog/js/additem.js +++ a/koha-tmpl/intranet-tmpl/prog/js/additem.js @@ -47,13 +47,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) --
  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 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -134,8 +134,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.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 %]
" + edit_link + "" + del_link + "" + edit_link + " " + del_link + "