Bugzilla – Attachment 50470 Details for
Bug 16242
Move staff client JavaScript out of language directory
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 16242 - Move staff client JavaScript out of language directory
SIGNED-OFF-Bug-16242---Move-staff-client-JavaScrip.patch (text/plain), 49.75 KB, created by
Bernardo Gonzalez Kriegel
on 2016-04-20 16:34:14 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 16242 - Move staff client JavaScript out of language directory
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2016-04-20 16:34:14 UTC
Size:
49.75 KB
patch
obsolete
>From d17d68f547cd5beb485e208b6c24dc21959cbdbe Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 12 Apr 2016 13:50:54 -0400 >Subject: [PATCH] [SIGNED-OFF] 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 >--- > 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"); > //]]> > </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 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 ) %]<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 330ca33..5299afd 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 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' %] > <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 8327140..e3b0907 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 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 %] > </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 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 @@ > <title>Koha › Acquisitions › Basket [% basketno %] › [% 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 31b08c5..436c40a 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 6a13bf4..1853805 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 3d285e2..814354a 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 c6cbfc8..15eadbc 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 382caf1..da8c08a 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 988f88a..f5bed63 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 › Administration › Budgets › Funds › 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 83c9eca..ecec1c5 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 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 %]"; > </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 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 @@ > <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 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 @@ > <title>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 %]</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 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 @@ > </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 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"); > //]]> > </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 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 @@ > <title>Koha › Authorities › [% 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 a029c3e..39d2c62 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 › Cataloging › 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 a56a252..a7f5300 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 › Cataloging › [% 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 130481c..89df33b 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 deb74ab..9b9e944 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 › Cataloging › 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 4f2fe48..4dd529c 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 › Cataloging › 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 fc2499a..7b3c573 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 › Cataloging › 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 939a52e..81326e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -25,9 +25,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 be8b544..90ff15b 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 d54c29e..21bbcc4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -170,7 +170,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 6a4add0..1d5d1a3 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 714596f..6fdf5ce 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 › Circulation › 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 0ff89b2..a32c604 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 › Serials › 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 be8c95c..e21350e 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 ae80d7f..612ec2c 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 › Tools › 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 9e862bf..110fc82 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 › Tools › 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 16385d6..6cb6fbf 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 f313b81..bc07502 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 1086670..8ca6b04 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 e2b6425..b55d685 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 › Tools › 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 f501a90..4fa8092 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 › Tools › 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 6e20a8f..62f18f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -210,7 +210,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 >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16242
:
50130
|
50156
|
50470
|
50629
|
50642
|
50661
|
50664