@@ -, +, @@ directory --- koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/marc_subfields_structure.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 2 +- .../intranet-tmpl/prog/en/modules/authorities/authorities.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- .../prog/en/modules/cataloguing/value_builder/marc21_field_006.tt | 2 +- .../prog/en/modules/cataloguing/value_builder/marc21_field_008.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 6 +++--- .../prog/en/modules/tools/batch_record_modification.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 2 +- .../prog/en/modules/tools/marc_modification_templates.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +- koha-tmpl/intranet-tmpl/prog/{en => }/js/acq.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/additem.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/ajax.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/audio_alerts.js | 0 .../intranet-tmpl/prog/{en => }/js/background-job-progressbar.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/basket.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/basketgroup.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/biblio_framework.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/cataloging.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/checkouts.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/datatables.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/file-upload.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/holds.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/item_search_fields.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js | 0 .../intranet-tmpl/prog/{en => }/js/marc_modification_templates.js | 0 .../intranet-tmpl/prog/{en => }/js/marc_subfields_structure.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/members.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/merge-record.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/offlinecirc.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/addbiblio.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/batchMod.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/circulation.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/preferences.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/prevent_submit.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/sms_providers.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/staff-global.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/xmlControlfield.js | 0 69 files changed, 62 insertions(+), 62 deletions(-) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/acq.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/additem.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/ajax.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/audio_alerts.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/background-job-progressbar.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/basket.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/basketgroup.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/biblio_framework.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/cataloging.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/checkouts.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/datatables.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/file-upload.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/holds.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/item_search_fields.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/marc_modification_templates.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/marc_subfields_structure.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/members.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/merge-record.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/offlinecirc.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/addbiblio.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/batchMod.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/circulation.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/preferences.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/prevent_submit.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/sms_providers.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/staff-global.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/xmlControlfield.js (100%) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc @@ -22,4 +22,4 @@ var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); //]]> - + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -39,7 +39,7 @@ [% IF ( IntranetUserCSS ) %][% END %] - + [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] @@ -67,11 +67,11 @@ //]]> - + [% END %] [% IF LocalCoverImages %] - + - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -12,7 +12,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - + - + [% IF ( grouping ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -7,7 +7,7 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] - +
[% INCLUDE 'header.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -3,11 +3,11 @@