From 5e1bcc4aa79098045a2240be2aaf7d33ea2965f0 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 12 Apr 2016 13:50:54 -0400
Subject: [PATCH] Bug 16242 - Move staff client JavaScript out of language
 directory

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.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of 15883 and 16241
All seems to work, js files pulled from new dir.
No errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc   | 2 +-
 .../intranet-tmpl/prog/en/includes/doc-head-close.inc     | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc     | 2 +-
 .../prog/en/modules/acqui/addorderiso2709.tt              | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/basketheader.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt  | 8 ++++----
 .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt   | 6 +++---
 .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt              | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt   | 2 +-
 .../prog/en/modules/admin/biblio_framework.tt             | 2 +-
 .../prog/en/modules/admin/items_search_fields.tt          | 2 +-
 .../prog/en/modules/admin/marc_subfields_structure.tt     | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/preferences.tt    | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/sms_providers.tt  | 2 +-
 .../prog/en/modules/authorities/authorities.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/authorities/merge.tt    | 2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt              | 2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/additem.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/merge.tt    | 2 +-
 .../modules/cataloguing/value_builder/marc21_field_006.tt | 2 +-
 .../modules/cataloguing/value_builder/marc21_field_008.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt     | 6 +++---
 .../intranet-tmpl/prog/en/modules/circ/offline-mf.tt      | 6 +++---
 .../prog/en/modules/members/memberentrygen.tt             | 2 +-
 .../intranet-tmpl/prog/en/modules/members/moremember.tt   | 6 +++---
 .../prog/en/modules/offline_circ/process_koc.tt           | 4 ++--
 .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 4 ++--
 .../prog/en/modules/suggestion/suggestion.tt              | 2 +-
 .../intranet-tmpl/prog/en/modules/tools/batchMod-del.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt  | 6 +++---
 .../prog/en/modules/tools/batch_record_modification.tt    | 2 +-
 .../prog/en/modules/tools/manage-marc-import.tt           | 2 +-
 .../prog/en/modules/tools/marc_modification_templates.tt  | 2 +-
 .../prog/en/modules/tools/stage-marc-import.tt            | 4 ++--
 .../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
 .../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
 .../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
 .../intranet-tmpl/prog/{en => }/js/item_search_fields.js  | 0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js   | 0
 .../prog/{en => }/js/marc_modification_templates.js       | 0
 .../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
 .../intranet-tmpl/prog/{en => }/js/pages/addbiblio.js     | 0
 .../intranet-tmpl/prog/{en => }/js/pages/batchMod.js      | 0
 .../intranet-tmpl/prog/{en => }/js/pages/circulation.js   | 0
 .../intranet-tmpl/prog/{en => }/js/pages/preferences.js   | 0
 .../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
 .../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 40626f541b..72be3f10e8 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");
 //]]>
 </script>
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script>
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 2dfba4b510..43236f9a9b 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 ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %]
 
 <!-- koha core js -->
-<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
 
 [% INCLUDE 'validator-strings.inc' %]
 [% IF ( IntranetUserJS ) %]
@@ -68,11 +68,11 @@
     //]]>
     </script>
 
-    <script type="text/javascript" src="[% themelang %]/js/basket.js"></script>
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script>
 [% END %]
 
 [% IF LocalCoverImages %]
-    <script type="text/javascript" src="[% themelang %]/js/localcovers.js"></script>
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers.js"></script>
     <script type="text/javascript">
         //<![CDATA[
             var NO_LOCAL_JACKET = _("No cover image available");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
index 330ca336d8..5299afde63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="[% interface %]/lib/jquery-ui-1.11.4.min.js"></script>
 <script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
 <!-- koha core js -->
-<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
 
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" />
 </head>
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 ddd37d0beb..c7b04cf290 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' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
     $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index f23d67edc6..e4f7b75998 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -8,7 +8,7 @@
 <script type="text/javascript" src="[% interface %]/lib/yui/button/button-min.js"></script>
 <script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min.js"></script>
 <script type="text/javascript" src="[% interface %]/lib/yui/menu/menu-min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/basketgroup.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/basketgroup.js"></script>
 [% IF ( grouping ) %]
 <script type="text/javascript" src="[% interface %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
 <script type="text/javascript" src="[% interface %]/lib/yui/animation/animation-min.js"></script>
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 cc06ae329e..761660e399 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 %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 </head>
 <body id="acq_basketheader" class="acq">
 [% 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 c01641d3c7..805b1a6a02 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 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Basket [% basketno %] &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 [% INCLUDE 'additem.js.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 actTotal = "";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index c229aa2f8a..676933f404 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -4,9 +4,9 @@
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 [% INCLUDE 'additem.js.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script>
 <script type="text/javascript">
 //<![CDATA[
     function Check(form) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index 6a13bf4349..1853805fe0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -17,7 +17,7 @@
 var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!");
  //]]>
 </script>
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 function check(form) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 3d285e2f64..814354a0d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -35,7 +35,7 @@
     <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script>
 [% END %]
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 <script type="text/javascript">
 // #################################################################################
 // Javascript
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index b63edefc5b..2719a436de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -10,7 +10,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
 //]]>
 </script>
 
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 [% IF op == 'add_form' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 382caf1c4a..da8c08a48d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -11,7 +11,7 @@
 [% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 // to check if the data are correctly entered.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index b9ebb9ec97..66f6b9f879 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -3,7 +3,7 @@
 <title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description %] by [% authcat %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 <script type="text/javascript">
 //<![CDATA[
     function Check(f) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
index 83c9eca306..ecec1c530d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
@@ -6,7 +6,7 @@
     var MSG_AUDIO_CONFIRM_DELETE = _("Are you sure you want to delete the selected audio alerts?");
     var MSG_AUDIO_CHECK_CHECKBOXES = _("Check the box next to the alert you want to delete.")
 </script>
-<script type="text/javascript" src="[% themelang %]/js/audio_alerts.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/audio_alerts.js"></script>
 </head>
 
 <body id="admin_audio_alerts" class="admin">
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 407c9c826f..ebf449c1c7 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 %]";
 </script>
-<script type="text/javascript" src="[% themelang %]/js/biblio_framework.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/biblio_framework.js"></script>
 
 </head>
 <body id="admin_biblio_framework" class="admin">
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 fffe809b51..411afa66c1 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 @@
   <script type="text/javascript">
       var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?");
   </script>
-  <script type="text/javascript" src="[% themelang %]/js/item_search_fields.js"></script>
+  <script type="text/javascript" src="[% interface %]/[% theme %]/js/item_search_fields.js"></script>
 </head>
 <body id="admin_itemssearchfields" class="admin">
   [% 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 78e12ac23e..30b830e35f 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 @@
 <title>Koha &rsaquo; Administration &rsaquo;[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure &rsaquo; Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure &rsaquo; [% action %][% END %][% END %]
 [% IF ( delete_confirm ) %] MARC subfield structure &rsaquo; Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure &rsaquo; Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/marc_subfields_structure.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_subfields_structure.js"></script>
 </head>
 <body id="admin_marc_subfields_structure" class="admin">
 [% 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 a580e66656..8f1e824b80 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 @@
 </script>
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/humanmsg.css" />
 <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script>
-<script src="[% themelang %]/js/ajax.js" type="text/javascript"></script>
-<script src="[% themelang %]/js/pages/preferences.js" type="text/javascript"></script>
+<script src="[% interface %]/[% theme %]/js/ajax.js" type="text/javascript"></script>
+<script src="[% interface %]/[% theme %]/js/pages/preferences.js" type="text/javascript"></script>
 [%# Add WYSIWYG editor for htmlarea system preferences %]
 [% INCLUDE 'wysiwyg-systempreferences.inc' %]
 </head>
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 d164a0d160..0f396230ee 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");
     //]]>
 </script>
-<script type="text/javascript" src="[% themelang %]/js/sms_providers.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/sms_providers.js"></script>
 </head>
 
 <body id="admin_sms_providers" class="admin">
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 49528d9d8a..260746d01a 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 @@
 <title>Koha &rsaquo; Authorities &rsaquo; [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority ([% authtypetext %])[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
 
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
index a029c3ea9c..39d2c62b48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -3,7 +3,7 @@
 <title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/merge-record.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/merge-record.js"></script>
 [% INCLUDE 'merge-record-strings.inc' %]
 <style type="text/css">
 div.record ul, div.record li { float:none; display:block; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index a56a252300..a7f5300a1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -3,7 +3,7 @@
 <title>Koha &rsaquo; Cataloging &rsaquo; [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
 [% INCLUDE 'browser-strings.inc' %]
 <!--[if lt IE 9]>
 <script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index bf9936ba9b..0b5bde4569 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
 [% INCLUDE 'columns_settings.inc' %]
 [% INCLUDE 'browser-strings.inc' %]
 <!--[if lt IE 9]>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index f21a9234f1..2805661354 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -3,7 +3,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/merge-record.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/merge-record.js"></script>
 [% INCLUDE 'merge-record-strings.inc' %]
 <style type="text/css">
 div.record ul, div.record li { float:none; display:block; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
index 4f2fe48e65..4dd529c443 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Cataloging &rsaquo; 006 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript" src='[% themelang %]/js/xmlControlfield.js'></script>
+<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield.js'></script>
 <script type="text/javascript">
     var objXmlControlField;
     var tr_result;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
index fc2499a9da..7b3c573f71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Cataloging &rsaquo; 008 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript" src='[% themelang %]/js/xmlControlfield.js'></script>
+<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield.js'></script>
 <script type="text/javascript">
     var objXmlControlField;
     var tr_result;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 55ded555ae..b1e4c9d559 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -26,9 +26,9 @@
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
 [% INCLUDE 'timepicker.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/pages/circulation.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/checkouts.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/holds.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 /* Set some variable needed in circulation.js */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt
index c6f862a8f9..c2dc188d05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt
@@ -19,9 +19,9 @@ CACHE:
 [% interface %]/lib/jquery/plugins/jquery.validate.min.js
 [% interface %]/[% theme %]/css/print.css
 [% interface %]/[% theme %]/css/staff-global.css
-[% themelang %]/js/basket.js
-[% themelang %]/js/offlinecirc.js
-[% themelang %]/js/staff-global.js
+[% interface %]/[% theme %]/js/basket.js
+[% interface %]/[% theme %]/js/offlinecirc.js
+[% interface %]/[% theme %]/js/staff-global.js
 [% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js
 [% themelang %]/lib/yui/reset-fonts-grids.css
 [% interface %]/prog/img/cart-small.gif
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 77b4df9ae6..6086b3c242 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -173,7 +173,7 @@ function select_user(borrowernumber, borrower) {
         var LABEL_SET_TO_PATRON = _("Set to patron");
 //]]>
 </script>
-<script type="text/javascript" src="[% themelang %]/js/members.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/members.js"></script>
 </head>
 <body id="pat_memberentrygen" class="pat">
 [% INCLUDE 'header.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index d6369e2e59..b7756735a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -23,9 +23,9 @@
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
 [% INCLUDE 'timepicker.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/pages/circulation.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/checkouts.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/holds.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
 /* Set some variable needed in circulation.js */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index 714596fdc4..6fdf5ce1e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -2,8 +2,8 @@
 <title>Koha &rsaquo; Circulation &rsaquo; Offline circulation file upload</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 var xhr;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 0ff89b2a1e..a32c60427a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -2,8 +2,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials &rsaquo; Serial edition [% bibliotitle %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script>
 [% INCLUDE 'calendar.inc' %]
 <script language="JavaScript" type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index be8c95cc93..e21350e927 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -171,7 +171,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
         // ]]>
     </script>
 [% END %]
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 </head>
 <body id="acq_suggestion" class="acq">
 [% INCLUDE 'header.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index ae80d7fb7a..612ec2c081 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; Batch item deletion</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script>
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 98f187b604..7626c04233 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -1,12 +1,12 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; Batch item modification</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
index 16385d6d3e..6cb6fbf219 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index bba226cfa3..3a786e9edf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -32,7 +32,7 @@
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 10866709e5..8ca6b04f1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -17,7 +17,7 @@
     var MSG_MMT_UPDATE_ACTION = _("Update action");
     //]]>
 </script>
-<script type="text/javascript" src="[% themelang %]/js/marc_modification_templates.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_modification_templates.js"></script>
 </head>
 
 <body id="tools_marc_modification_templates" class="tools">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index e2b6425594..b55d685a7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -2,8 +2,8 @@
 <title>Koha &rsaquo; Tools &rsaquo; Stage MARC records for import</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script>
 
 <style type="text/css">
     #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
index f501a90904..4fa8092928 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
@@ -2,8 +2,8 @@
 <title>Koha &rsaquo; Tools &rsaquo; Upload images</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script>
 
 <style type="text/css">
     #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
index 686b50873f..dc26484597 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -212,7 +212,7 @@
     ];
 //]]>
 </script>
-<script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 function StartUpload() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/js/acq.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/acq.js
rename to koha-tmpl/intranet-tmpl/prog/js/acq.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/additem.js
rename to koha-tmpl/intranet-tmpl/prog/js/additem.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js b/koha-tmpl/intranet-tmpl/prog/js/ajax.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/ajax.js
rename to koha-tmpl/intranet-tmpl/prog/js/ajax.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/audio_alerts.js b/koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/audio_alerts.js
rename to koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js b/koha-tmpl/intranet-tmpl/prog/js/background-job-progressbar.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js
rename to koha-tmpl/intranet-tmpl/prog/js/background-job-progressbar.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/js/basket.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/basket.js
rename to koha-tmpl/intranet-tmpl/prog/js/basket.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basketgroup.js b/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/basketgroup.js
rename to koha-tmpl/intranet-tmpl/prog/js/basketgroup.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/biblio_framework.js b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/biblio_framework.js
rename to koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js b/koha-tmpl/intranet-tmpl/prog/js/cataloging.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
rename to koha-tmpl/intranet-tmpl/prog/js/cataloging.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
rename to koha-tmpl/intranet-tmpl/prog/js/checkouts.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
rename to koha-tmpl/intranet-tmpl/prog/js/datatables.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/file-upload.js b/koha-tmpl/intranet-tmpl/prog/js/file-upload.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/file-upload.js
rename to koha-tmpl/intranet-tmpl/prog/js/file-upload.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/holds.js
rename to koha-tmpl/intranet-tmpl/prog/js/holds.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/item_search_fields.js b/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/item_search_fields.js
rename to koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js b/koha-tmpl/intranet-tmpl/prog/js/localcovers.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js
rename to koha-tmpl/intranet-tmpl/prog/js/localcovers.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/marc_modification_templates.js b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/marc_modification_templates.js
rename to koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/marc_subfields_structure.js b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/marc_subfields_structure.js
rename to koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/members.js
rename to koha-tmpl/intranet-tmpl/prog/js/members.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js b/koha-tmpl/intranet-tmpl/prog/js/merge-record.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js
rename to koha-tmpl/intranet-tmpl/prog/js/merge-record.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/offlinecirc.js b/koha-tmpl/intranet-tmpl/prog/js/offlinecirc.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/offlinecirc.js
rename to koha-tmpl/intranet-tmpl/prog/js/offlinecirc.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/addbiblio.js b/koha-tmpl/intranet-tmpl/prog/js/pages/addbiblio.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/pages/addbiblio.js
rename to koha-tmpl/intranet-tmpl/prog/js/pages/addbiblio.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js b/koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js
rename to koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js
rename to koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js
rename to koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js b/koha-tmpl/intranet-tmpl/prog/js/prevent_submit.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js
rename to koha-tmpl/intranet-tmpl/prog/js/prevent_submit.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/sms_providers.js b/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/sms_providers.js
rename to koha-tmpl/intranet-tmpl/prog/js/sms_providers.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
rename to koha-tmpl/intranet-tmpl/prog/js/staff-global.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js b/koha-tmpl/intranet-tmpl/prog/js/xmlControlfield.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js
rename to koha-tmpl/intranet-tmpl/prog/js/xmlControlfield.js
-- 
2.39.5