From 6216eedcbe4a3c7e5d2d242740c19e9a48e26edb Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 12 Apr 2016 13:50:54 -0400 Subject: [PATCH] Bug 16242 - Move staff client JavaScript out of language directory Content-Type: text/plain; charset="utf-8" This patch moves the JavaScript files in prog/en/js to prog/js. JavaScript files do not need to be in the directory which is processed by the translator. To test, apply the patch and visit various pages in the staff client to confirm that JavaScript files are still loading correctly. Revised: I intended for this to be built on top of Bug 15883 as well as Bug 16242. Now it is. --- 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%) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc index 40626f5..72be3f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc @@ -22,4 +22,4 @@ var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); //]]> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 2dfba4b..43236f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -40,7 +40,7 @@ [% IF ( IntranetUserCSS ) %][% END %] - + [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] @@ -68,11 +68,11 @@ //]]> - + [% END %] [% IF LocalCoverImages %] - + - + 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 b40da8b..e9ee276 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -12,7 +12,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - + - + [% IF ( grouping ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 84b318c..e5c977e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -7,7 +7,7 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] 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 dbb2b02..e59b5dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -3,11 +3,11 @@ Koha › Acquisitions › Basket [% basketno %] › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'additem.js.inc' %] - - - + + + - - + + + - + [% END %] - + - + [% IF op == 'add_form' %] + - + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 407c9c8..ebf449c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -17,7 +17,7 @@ var MSG_IMPORTING_TO_FRAMEWORK = _("Importing to framework: %s. Importing from file: %s."); var template_path = "[% interface %]/[% theme %]"; - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index fffe809..411afa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -4,7 +4,7 @@ - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 78e12ac..30b830e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -2,7 +2,7 @@ Koha › Administration ›[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure › Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure › [% action %][% END %][% END %] [% IF ( delete_confirm ) %] MARC subfield structure › Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure › Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index a580e66..8f1e824 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -45,8 +45,8 @@ - - + + [%# Add WYSIWYG editor for htmlarea system preferences %] [% INCLUDE 'wysiwyg-systempreferences.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt index d164a0d..0f39623 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -9,7 +9,7 @@ var LABEL_SMS_EDIT_PROVIDER = _("Edit provider %s"); //]]> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index 49528d9..260746d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -2,7 +2,7 @@ Koha › Authorities › [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority ([% authtypetext %])[% END %] [% INCLUDE 'doc-head-close.inc' %] - + + [% INCLUDE 'merge-record-strings.inc' %]