Bugzilla – Attachment 48739 Details for
Bug 12904
Force browser to load new JavaScript and CSS files after upgrade
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12904 [Followup] - Catch remaining JS files
Bug-12904-Followup---Catch-remaining-JS-files.patch (text/plain), 91.34 KB, created by
Jonathan Druart
on 2016-03-07 11:56:22 UTC
(
hide
)
Description:
Bug 12904 [Followup] - Catch remaining JS files
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-03-07 11:56:22 UTC
Size:
91.34 KB
patch
obsolete
>From a9aef0ae69331f1944fdb34627129a6216c474cd Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 6 Nov 2014 13:57:47 +0000 >Subject: [PATCH] Bug 12904 [Followup] - Catch remaining JS files > >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 18 +++++++++--------- > .../prog/en/modules/acqui/basketheader.tt | 4 +++- > .../prog/en/modules/acqui/neworderempty.tt | 10 ++++++---- > .../prog/en/modules/acqui/orderreceive.tt | 8 +++++--- > .../prog/en/modules/acqui/uncertainprice.tt | 2 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 6 ++++-- > .../prog/en/modules/admin/authorised_values.tt | 3 ++- > .../prog/en/modules/admin/branch_transfer_limits.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/branches.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/currency.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 3 ++- > .../prog/en/modules/admin/marctagstructure.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 3 ++- > .../prog/en/modules/admin/systempreferences.tt | 3 ++- > .../prog/en/modules/admin/z3950servers.tt | 3 ++- > .../prog/en/modules/authorities/authorities.tt | 7 ++++--- > .../intranet-tmpl/prog/en/modules/authorities/merge.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 3 ++- > .../prog/en/modules/catalogue/ISBDdetail.tt | 6 ++++-- > .../prog/en/modules/catalogue/MARCdetail.tt | 6 ++++-- > .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 8 ++++---- > .../prog/en/modules/catalogue/itemsearch.tt | 3 ++- > .../prog/en/modules/catalogue/labeledMARCdetail.tt | 6 ++++-- > .../prog/en/modules/catalogue/moredetail.tt | 5 +++-- > .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 5 +++-- > .../prog/en/modules/catalogue/search-history.tt | 4 ++-- > .../prog/en/modules/cataloguing/addbiblio.tt | 10 +++++----- > .../prog/en/modules/cataloguing/additem.tt | 9 +++++---- > .../intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 4 +++- > .../prog/en/modules/cataloguing/z3950_auth_search.tt | 3 ++- > .../prog/en/modules/cataloguing/z3950_search.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 14 +++++++------- > .../intranet-tmpl/prog/en/modules/circ/offline.tt | 8 +++++--- > .../prog/en/modules/circ/pendingreserves.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/printslip.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + > .../prog/en/modules/circ/transferstoreceive.tt | 3 ++- > .../prog/en/modules/circ/view_holdsqueue.tt | 3 ++- > .../prog/en/modules/circ/waitingreserves.tt | 3 ++- > .../prog/en/modules/course_reserves/course-details.tt | 3 ++- > .../prog/en/modules/course_reserves/course-reserves.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 3 ++- > .../prog/en/modules/labels/label-edit-batch.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/labels/label-home.tt | 2 ++ > .../prog/en/modules/labels/label-manage.tt | 3 ++- > .../prog/en/modules/labels/spinelabel-print.tt | 3 ++- > .../prog/en/modules/members/member-flags.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/members/member.tt | 3 ++- > .../prog/en/modules/members/memberentrygen.tt | 3 ++- > .../prog/en/modules/members/moremember-print.tt | 2 +- > .../prog/en/modules/members/moremember-receipt.tt | 2 +- > .../prog/en/modules/members/moremember.tt | 14 +++++++------- > .../intranet-tmpl/prog/en/modules/members/notices.tt | 3 ++- > .../prog/en/modules/members/printfeercpt.tt | 2 +- > .../prog/en/modules/members/printinvoice.tt | 2 +- > .../prog/en/modules/members/purchase-suggestions.tt | 3 ++- > .../prog/en/modules/members/readingrec.tt | 3 +-- > .../prog/en/modules/members/statistics.tt | 3 ++- > .../prog/en/modules/members/update-child.tt | 3 ++- > .../prog/en/modules/offline_circ/process_koc.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/patron_lists/list.tt | 3 ++- > .../prog/en/modules/patron_lists/lists.tt | 3 ++- > .../prog/en/modules/patroncards/edit-batch.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/patroncards/home.tt | 2 ++ > .../prog/en/modules/reports/guided_reports_start.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/reports/itemtypes.tt | 3 ++- > .../prog/en/modules/reports/serials_stats.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/serials/claims.tt | 3 ++- > .../prog/en/modules/serials/serials-collection.tt | 3 ++- > .../prog/en/modules/serials/serials-edit.tt | 6 ++++-- > .../prog/en/modules/serials/serials-search.tt | 3 ++- > .../prog/en/modules/suggestion/suggestion.tt | 7 ++++--- > koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 3 ++- > .../prog/en/modules/tools/batchMod-del.tt | 9 +++++---- > .../prog/en/modules/tools/batchMod-edit.tt | 11 ++++++----- > .../intranet-tmpl/prog/en/modules/tools/holidays.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/inventory.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- > .../prog/en/modules/tools/manage-marc-import.tt | 5 +++-- > .../prog/en/modules/tools/modborrowers.tt | 3 ++- > .../prog/en/modules/tools/quotes-upload.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 3 ++- > .../prog/en/modules/tools/stage-marc-import.tt | 4 +++- > .../prog/en/modules/tools/upload-images.tt | 4 +++- > .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 1 - > .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 12 ++++++------ > .../opac-tmpl/bootstrap/en/modules/opac-detail.tt.. | 0 > .../bootstrap/en/modules/opac-overdrive-search.tt | 6 +++--- > .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 10 +++++----- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 3 ++- > .../opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 3 ++- > .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- > 101 files changed, 262 insertions(+), 169 deletions(-) > create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt.. > >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 dab0a24..c460e30 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -12,8 +12,8 @@ > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% 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 %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/acq_[% KOHA_VERSION %].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 c52e204..93b41e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -6,16 +6,16 @@ > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/yui/utilities/utilities.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/button/button-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/container/container_core-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/menu/menu-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/js/basketgroup.js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/utilities/utilities_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/button/button-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/container/container_core-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/menu/menu-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/basketgroup_[% KOHA_VERSION %].js"></script> > [% IF ( grouping ) %] >-<script type="text/javascript" src="[% themelang %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/animation/animation-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/dragdrop/dragdrop-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/element/element-min.js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/yahoo-dom-event/yahoo-dom-event_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/animation/animation-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/dragdrop/dragdrop-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/yui/element/element-min_[% KOHA_VERSION %].js"></script> > <style type="text/css"> > /*margin and padding on body element > can introduce errors in determining >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..6708a85 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › > [% IF ( add_form ) %] >@@ -7,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/acq_[% KOHA_VERSION %].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..e99e633 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -1,13 +1,15 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <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="[% themelang %]/js/acq_[% KOHA_VERSION %].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="[% themelang %]/js/additem_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/prevent_submit_[% KOHA_VERSION %].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..52eba97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -1,12 +1,14 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title> > [% 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="[% themelang %]/js/additem_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/prevent_submit_[% KOHA_VERSION %].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 dc4faa3..1c40446 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -18,7 +18,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="[% themelang %]/js/acq_[% KOHA_VERSION %].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 54141e8..9754d34 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -35,9 +35,9 @@ > [% INCLUDE 'datatables.inc' %] > [% IF close_form %] > <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> > [% END %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/acq_[% KOHA_VERSION %].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 ec7afbb..68b9ea7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -12,7 +12,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="[% themelang %]/js/acq_[% KOHA_VERSION %].js"></script> > [% IF op == 'add_form' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -150,7 +150,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> > > <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..30a0994 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Contracts › >@@ -11,7 +13,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="[% themelang %]/js/acq_[% KOHA_VERSION %].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..d6ccc73 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -1,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] > <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 %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/acq_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > function Check(f) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 645d145..e89f1bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authorized values > [% IF op == 'add_form' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index 161acc6..3f81ea1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Library checkin and transfer policy</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 9716b3e..c7aa3fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Libraries and groups > [% IF op == 'editcategory' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index a59c691..33712f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › [% IF op =='add_form' %]Cities › [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 7ac36a9..58977eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index ef82fba..4a96ac3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index a6ee9da..574b4b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › > [% IF ( add_form ) %]MARC frameworks › [% action %] [% searchfield %][% END %] >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 3cad7b5..0b58520 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › System preferences</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 0d94d1e..7814db5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › [% IF ( add_form ) %] System preferences › [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences › Data added[% END %] > [% IF ( delete_confirm ) %] System preferences › [% searchfield %] › Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences › Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index c12b4f8..5c71ab6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > > [% BLOCK ServerType %] >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 cedf581..bcc6da0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -1,9 +1,10 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <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 %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/cataloging_[% KOHA_VERSION %].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..6677e0c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -1,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'merge-record.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <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="[% themelang %]/js/merge-record_[% KOHA_VERSION %].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/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 7c2a37f..5f781aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog › Your cart</title> > [% IF ( print_basket ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >index 1c61305..1b2142f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › > [% IF ( unknownbiblionumber ) %] >@@ -9,9 +11,9 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 4c0c115..12e2b1f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › > [% IF ( unknownbiblionumber ) %] >@@ -9,9 +11,9 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 0846c5d..b43a15d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -201,12 +201,12 @@ function verify_images() { > </script> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index ad45944..6d74537 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE CGI %] > [% USE JSON.Escape %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 957f6ce..a35ec0e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > > <title>Koha › Catalog › >@@ -12,9 +14,9 @@ > > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >- <script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >- <script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+ <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index d3caf16..c9c652c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -1,13 +1,14 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">h3{padding-top: 1em; border-top: 2px solid #CCCCCC;}#exportLabelexportModal_{border-top: 0px;}</style> > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 68658fe..29ceac0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -14,9 +15,9 @@ > [% END %] > > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_NO_ITEM_SELECTED = _("Nothing is selected."); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 58c2cef..ea03d72 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -1,6 +1,6 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >-[% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+[% INCLUDE 'doc-head-open.inc' %] > [% USE KohaDates %] > <title>Koha › Catalog › Search history</title> > [% INCLUDE 'doc-head-close.inc' %] >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 e0c5fcd..3123f32 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,15 +1,15 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <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 %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/cataloging_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >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 8b2a5c68..d8bd903 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -1,17 +1,18 @@ > [% USE ColumnsSettings %] >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/cataloging_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> > <![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >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..67519ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -1,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'merge-record.inc' %] > > [% 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="[% themelang %]/js/merge-record_[% KOHA_VERSION %].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/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index 20bca71..d918b9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Z39.50 search results</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index b44a4d1..7eede4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Z39.50/SRU search results</title> > [% INCLUDE 'doc-head-close.inc' %] >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 8cfafdb..e513e7e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE KohaDates %] > [% USE ColumnsSettings %] >@@ -22,13 +22,13 @@ > [% INCLUDE 'strings.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].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 %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/pages/circulation_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/checkouts_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/holds_[% KOHA_VERSION %].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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index 3fa54b7..5d19c3b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <!DOCTYPE html> > [% IF (AllowOfflineCirculation) %] > [% SET manifestattr = 'manifest="/cgi-bin/koha/circ/offline-mf.pl"' %] >@@ -10,9 +12,9 @@ > <title>Koha › Circulation</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.indexeddb.js"></script> >-<script type="text/javascript" src="[% interface %]/prog/en/js/offlinecirc.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.indexeddb_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/prog/en/js/offlinecirc_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'timepicker.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index 6d7da7a..5c44a67 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [%- USE Branches -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index 5656496..76df998 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF ( caller == 'hold-transfer' ) %] > <title>Koha › Circulation › Hold transfer print receipt</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 37828c3..1612ffa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Hold ratios</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index c26a285..dfd2d7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -1,6 +1,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Borrowers %] > [% USE ItemTypes %] > [% USE AuthorisedValues %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 9372e80..1eb894d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index 89c99d2..be42540 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% USE Branches %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index b528d68..2c455c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 3b64dac..ec6b7e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] > [% USE Branches %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index b32ea85..4e129fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Course reserves</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >index c6cb247..496f16c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Online help</title> > <script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 4d72a90..00eae68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha staff client</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage_[% KOHA_VERSION %].css" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 408bd9e..125b5d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index 3a2d8f0..d482c33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Label creator</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index 2744bdf..01002f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% BLOCK translate_label_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%]layout >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index 3f4b01a..a9f5b6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <!DOCTYPE html> > [% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %] > <head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index 65f4159..de4bff5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'permissions.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Set permissions for [% surname %], [% firstname %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index 5ccd733..f740d78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE ColumnsSettings %] > [% USE Branches %] > [% USE Categories %] >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 497c1a7..5bd5828 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title> >@@ -32,7 +33,7 @@ > var LABEL_SET_TO_PATRON = _("Set to patron"); > //]]> > </script> >-<script type="text/javascript" src="[% themelang %]/js/members.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/members_[% KOHA_VERSION %].js"></script> > </head> > <body id="pat_memberentrygen" class="pat"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index aafede7..ecf793c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >index 5dd3ad1..f9a3db3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print Receipt for [% cardnumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >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 4404e62..1389ac4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE ColumnsSettings %] >@@ -20,13 +20,13 @@ > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'strings.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].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 %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/pages/circulation_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/checkouts_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/holds_[% KOHA_VERSION %].js"></script> > <script type="text/JavaScript"> > //<![CDATA[ > /* Set some variable needed in circulation.js */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index bb99349..8c914fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >index 6d2e974..fcf32ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print Receipt for [% cardnumber %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >index 112a918..250426a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print Receipt for [% cardnumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 5c44a03..0d964e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 03c5898..e6b7aec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -1,6 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >-[% USE KohaDates %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 22fdb02..b83ca9a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >index 3c660d1..81b7d75 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Choose Adult category</title> > [% INCLUDE 'doc-head-close.inc' %] >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..9ab90b8 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 >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <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/background-job-progressbar_[% KOHA_VERSION %].js"></script> > <script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script> > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index cbf3a99..adeb4f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists › [% list.name %] › Add patrons</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index 1627d9e..c392f54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index e7e016b..5af6c09 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron card creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >index 49d7efc..2df62a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron card creator</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 6da4c6b..ce80c75 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > > [%- BLOCK area_name -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index ad778c0..39dddca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Catalog by item types</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index cbb28d0..1f072a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index aa73467..c3804c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 1df4c7e..2823b50 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >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 2121547..870ccf0 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 >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% 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="[% themelang %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/prevent_submit_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'calendar.inc' %] > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 642d972..150dce7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE KohaDates %] >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 951c5e2..94684a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE KohaDates %] >@@ -33,7 +34,7 @@ > [% IF ( op_else ) %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > // <![CDATA[ > /** >@@ -172,7 +173,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="[% themelang %]/js/acq_[% KOHA_VERSION %].js"></script> > </head> > <body id="acq_suggestion" class="acq"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index b9b760e..75cd1c1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index c89930a..01ad392 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> >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 405bc95..ebf9745 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,12 +1,13 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% 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="[% themelang %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/pages/batchMod_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].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 5069488..163c475 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,13 +1,14 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% 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="[% themelang %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/cataloging_[% KOHA_VERSION %].js"></script> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].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 %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% themelang %]/js/pages/batchMod_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index 43537f2..77058c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% branchname %] calendar</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index f0a7914..c925b15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index 4f36473..ab9d2f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › News</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index 28dd124..f65e992 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title> >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 687e859..7dc194e 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 >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% BLOCK final_match_link %] > [% IF ( record.record_type == 'biblio' ) %] > <a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% record.final_match_id %]">[% record.final_match_id %]</a> >@@ -33,7 +34,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="[% themelang %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index c252077..5bc63bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc'%] > <title>Koha › Tools › Batch patron modification</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >index edaadc8..47b641e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote uploader</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index 6d5d382..0bcbac1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote editor</title> > [% INCLUDE 'doc-head-close.inc' %] >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 67a07f4..a5fa56d 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 >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <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/background-job-progressbar_[% KOHA_VERSION %].js"></script> > <script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script> > > <style type="text/css"> >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..7dc2dd9 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 >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <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/background-job-progressbar_[% KOHA_VERSION %].js"></script> > <script type="text/javascript" src="[% themelang %]/js/file-upload.js"></script> > > <style type="text/css"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >index 6c1d0c0..6b6678e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >@@ -1,4 +1,3 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% SET KOHA_VERSION = Koha.Preference('Version') %] > </title> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index 1871b20..8c6c1d1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE AuthorisedValues %] >@@ -1148,7 +1148,7 @@ > [% END %] > > [% IF ( NovelistSelectProfile && normalized_isbn ) %] >- <script type="text/javascript" src="https://imageserver.ebscohost.com/novelistselect/ns2init.js"></script> >+ <script type="text/javascript" src="https://imageserver.ebscohost.com/novelistselect/ns2init_[% KOHA_VERSION %].js"></script> > [% END %] > > [% IF ( Babeltheque ) %] >@@ -1340,16 +1340,16 @@ > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] > [% IF ( SocialNetworks ) %] >- <script type="text/javascript" src="https://apis.google.com/js/plusone.js"> >+ <script type="text/javascript" src="https://apis.google.com/js/plusone_[% KOHA_VERSION %].js"> > //<![CDATA[ > {lang: '[% lang %]'} > //]]> > </script> >- <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> >+ <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets_[% KOHA_VERSION %].js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> > [% END %] >-[% IF ( OpacStarRatings != 'disable' ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating.js"></script>[% END %] >+[% IF ( OpacStarRatings != 'disable' ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script>[% END %] > >-[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3.js"></script>[% END %] >+[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3_[% KOHA_VERSION %].js"></script>[% END %] > > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt.. b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt.. >new file mode 100644 >index 0000000..e69de29 >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >index 6f26d7f..05b9112 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]'</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -58,8 +58,8 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]"; > var results_per_page = [% OPACnumSearchResults %]; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index daea6e7..14f44b2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnList ) %] > [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %] > >@@ -582,10 +582,10 @@ > <script src="http://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&systype=koha" type="text/javascript"></script> > [% END %] > [% END %] >-[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating.js"></script>[% END %] >-[% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive.js"></script>[% END %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3.js"></script> >+[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script>[% END %] >+[% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive_[% KOHA_VERSION %].js"></script>[% END %] >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3_[% KOHA_VERSION %].js"></script> > [% END %]<script type="text/javascript"> > //<![CDATA[ > [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >index ff5e1bd..88637c6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout help</title> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt >index 3002f14..780ab5e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt >@@ -1,4 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout › Print Receipt for [% borrowernumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 4c1bed6..aea2600 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -1,5 +1,5 @@ >-[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout </title> >-- >2.7.0
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 12904
:
31514
|
31547
|
33287
|
33288
|
33295
|
33296
|
33297
|
33315
|
33317
|
33318
|
33319
|
33320
|
33321
|
33323
|
33324
|
33325
|
33326
|
33327
|
33328
|
48735
|
48736
|
48737
|
48738
|
48739
|
48740
|
48741
|
48742
|
49572
|
54484
|
54485
|
54488
|
54489
|
58378
|
58379
|
58392
|
58393
|
58394
|
58395
|
60826
|
60827
|
60830
|
60831
|
63692
|
63693
|
63694
|
63695
|
63696
|
70830
|
70831
|
70832
|
70833
|
70834
|
70835
|
71250
|
71251
|
71252
|
71253
|
71254
|
71255
|
71822