@@ -, +, @@ if there is no link in comment 16 --- .../prog/en/modules/acqui/addorderiso2709.tt | 4 ++- .../prog/en/modules/acqui/neworderbiblio.tt | 13 +++------- .../prog/en/modules/acqui/neworderempty.tt | 3 +-- .../prog/en/modules/acqui/newordersubscription.tt | 8 +++--- .../prog/en/modules/acqui/z3950_search.tt | 29 ++++++++++++++-------- .../prog/en/modules/circ/reserveratios.tt | 16 ++++++++++-- koha-tmpl/intranet-tmpl/prog/js/additem.js | 7 +++--- 7 files changed, 48 insertions(+), 32 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -413,7 +413,9 @@ [% batch_lis.staged_date | $KohaDates with_hours => 1 | html %] [% batch_lis.num_records | html %] - 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 @@ -43,8 +43,7 @@ Summary Publisher Copyright -   -   + Actions @@ -67,13 +66,9 @@ [% biblio.copyrightdate | html %] - - 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 @@ -256,8 +256,7 @@ - - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -68,13 +68,13 @@ [% END %] -
  Actions Barcode Home library Holding library + [% IF (sub.alreadyOnOrder) %] Outstanding order [% END %] - [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%] - - Place order + [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %] + + 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 @@ -100,30 +100,30 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( breeding_loop ) %] - + - [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] - + [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %] + [% END %] - + [% FOREACH breeding_loo IN breeding_loop %] [% IF ( breeding_loo.breedingid ) %] - + - [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] + [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] [% END %] - - - + + [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -92,8 +92,20 @@ [% END %] - + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/js/additem.js +++ a/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-default btn-xs'> " + (window.MSG_ADDITEM_JS_DELETE || "Delete") + ""; - result += ""; - result += ""; + result += ""; for(i in fields) { var field = fields[i]; var field_elt = $("#" + index) --
Server Title Author ISBN LCCNAdditional fieldsAdditional fieldsPreview  
[% breeding_loo.server | html %] [% breeding_loo.server | html %] [% breeding_loo.title | html %] [% breeding_loo.author | html %] [% breeding_loo.isbn | html %] [% breeding_loo.lccn | html %] -
+
[% FOREACH addnumberfield IN breeding_loo.addnumberfields %] [% FOREACH string IN breeding_loo.$addnumberfield %]
[% addnumberfield | html %]:
@@ -133,9 +133,18 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
MARCCardOrder + + Order
[% IF ( reserveloo.thisratio_atleast1 ) %]

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

[% END %]
+

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

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