Bugzilla – Attachment 60827 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 - Update template css and js file references
Bug-12904---Update-template-css-and-js-file-refere.patch (text/plain), 236.11 KB, created by
Olli-Antti Kivilahti
on 2017-03-06 10:28:50 UTC
(
hide
)
Description:
Bug 12904 - Update template css and js file references
Filename:
MIME Type:
Creator:
Olli-Antti Kivilahti
Created:
2017-03-06 10:28:50 UTC
Size:
236.11 KB
patch
obsolete
>From 122d15ca2557adf97ce3a55d18fb80db6edfd12a Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 15 Aug 2016 16:02:26 +0000 >Subject: [PATCH] Bug 12904 - Update template css and js file references > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi> >--- > .../prog/en/includes/cateditor-ui.inc | 10 +++-- > .../prog/en/includes/columns_settings.inc | 2 + > .../intranet-tmpl/prog/en/includes/datatables.inc | 12 +++--- > .../prog/en/includes/doc-head-close-receipt.inc | 4 +- > .../prog/en/includes/doc-head-close.inc | 15 ++++---- > .../intranet-tmpl/prog/en/includes/greybox.inc | 8 ++-- > .../intranet-tmpl/prog/en/includes/help-top.inc | 20 +++++----- > .../prog/en/includes/installer-doc-head-close.inc | 5 ++- > .../prog/en/includes/intranetstylesheet.inc | 2 + > .../prog/en/includes/wysiwyg-systempreferences.inc | 6 ++- > .../prog/en/modules/acqui/acqui-home.tt | 8 ++-- > .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++-- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++- > .../prog/en/modules/acqui/basketgroup.tt | 22 ++++++----- > .../prog/en/modules/acqui/basketheader.tt | 3 +- > .../prog/en/modules/acqui/booksellers.tt | 4 +- > .../prog/en/modules/acqui/edifactmsgs.tt | 3 +- > .../prog/en/modules/acqui/histsearch.tt | 6 ++- > .../prog/en/modules/acqui/invoice-files.tt | 4 +- > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 3 +- > .../prog/en/modules/acqui/invoices.tt | 4 +- > .../prog/en/modules/acqui/lateorders.tt | 6 ++- > .../prog/en/modules/acqui/neworderbiblio.tt | 4 +- > .../prog/en/modules/acqui/neworderempty.tt | 12 +++--- > .../prog/en/modules/acqui/newordersubscription.tt | 4 +- > .../prog/en/modules/acqui/newordersuggestion.tt | 4 +- > .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +- > .../prog/en/modules/acqui/orderreceive.tt | 8 ++-- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 7 ++-- > .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 +- > .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 4 +- > .../prog/en/modules/acqui/supplier.tt | 4 +- > .../prog/en/modules/acqui/uncertainprice.tt | 5 ++- > .../prog/en/modules/acqui/z3950_search.tt | 8 ++-- > .../prog/en/modules/admin/aqbudgetperiods.tt | 10 +++-- > .../prog/en/modules/admin/aqbudgets.tt | 10 +++-- > .../prog/en/modules/admin/aqcontract.tt | 4 +- > .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 6 ++- > .../prog/en/modules/admin/audio_alerts.tt | 3 +- > .../prog/en/modules/admin/auth_tag_structure.tt | 4 +- > .../prog/en/modules/admin/authorised_values.tt | 4 +- > .../prog/en/modules/admin/authtypes.tt | 4 +- > .../prog/en/modules/admin/biblio_framework.tt | 6 ++- > .../en/modules/admin/branch_transfer_limits.tt | 6 ++- > .../prog/en/modules/admin/branches.tt | 8 ++-- > .../prog/en/modules/admin/categories.tt | 5 ++- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 4 +- > .../prog/en/modules/admin/currency.tt | 4 +- > .../prog/en/modules/admin/items_search_fields.tt | 4 +- > .../prog/en/modules/admin/itemtypes.tt | 3 +- > .../prog/en/modules/admin/localization.tt | 4 +- > .../en/modules/admin/marc_subfields_structure.tt | 4 +- > .../prog/en/modules/admin/marctagstructure.tt | 6 ++- > .../prog/en/modules/admin/preferences.tt | 21 ++++++----- > .../prog/en/modules/admin/sms_providers.tt | 4 +- > .../prog/en/modules/admin/systempreferences.tt | 3 +- > .../prog/en/modules/admin/z3950servers.tt | 4 +- > .../prog/en/modules/authorities/authorities.tt | 10 +++-- > .../prog/en/modules/authorities/detail.tt | 4 +- > .../prog/en/modules/authorities/merge.tt | 4 +- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 10 +++-- > .../prog/en/modules/batch/print-notices.tt | 2 + > .../prog/en/modules/catalogue/ISBDdetail.tt | 6 ++- > .../prog/en/modules/catalogue/MARCdetail.tt | 6 ++- > .../prog/en/modules/catalogue/advsearch.tt | 4 +- > .../prog/en/modules/catalogue/detail.tt | 11 +++--- > .../prog/en/modules/catalogue/issuehistory.tt | 3 +- > .../prog/en/modules/catalogue/itemsearch.tt | 10 +++-- > .../prog/en/modules/catalogue/labeledMARCdetail.tt | 6 ++- > .../prog/en/modules/catalogue/moredetail.tt | 7 ++-- > .../prog/en/modules/catalogue/results.tt | 5 ++- > .../prog/en/modules/catalogue/search-history.tt | 7 ++-- > .../prog/en/modules/cataloguing/addbiblio.tt | 13 ++++--- > .../prog/en/modules/cataloguing/additem.tt | 14 +++---- > .../prog/en/modules/cataloguing/editor.tt | 14 ++++--- > .../prog/en/modules/cataloguing/merge.tt | 4 +- > .../cataloguing/value_builder/cn_browser.tt | 4 +- > .../cataloguing/value_builder/marc21_field_006.tt | 4 +- > .../cataloguing/value_builder/marc21_field_008.tt | 4 +- > .../en/modules/cataloguing/z3950_auth_search.tt | 8 ++-- > .../prog/en/modules/cataloguing/z3950_search.tt | 8 ++-- > .../prog/en/modules/circ/circulation.tt | 15 ++++---- > .../en/modules/circ/circulation_batch_checkouts.tt | 4 +- > .../prog/en/modules/circ/offline-mf.tt | 40 ++++++++++---------- > .../intranet-tmpl/prog/en/modules/circ/offline.tt | 8 ++-- > .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- > .../prog/en/modules/circ/pendingreserves.tt | 4 +- > .../prog/en/modules/circ/printslip.tt | 3 +- > .../prog/en/modules/circ/reserveratios.tt | 4 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 5 ++- > .../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/common/patron_search.tt | 3 +- > .../en/modules/course_reserves/course-details.tt | 4 +- > .../en/modules/course_reserves/course-reserves.tt | 4 +- > .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 8 ++-- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 3 +- > .../prog/en/modules/labels/label-edit-batch.tt | 4 +- > .../prog/en/modules/labels/label-home.tt | 4 +- > .../prog/en/modules/labels/label-manage.tt | 4 +- > .../intranet-tmpl/prog/en/modules/labels/result.tt | 4 +- > .../prog/en/modules/labels/spinelabel-print.tt | 8 ++-- > .../prog/en/modules/members/boraccount.tt | 3 +- > .../prog/en/modules/members/member-flags.tt | 6 ++- > .../prog/en/modules/members/member.tt | 3 +- > .../prog/en/modules/members/memberentrygen.tt | 5 ++- > .../prog/en/modules/members/moremember-print.tt | 3 +- > .../prog/en/modules/members/moremember-receipt.tt | 3 +- > .../prog/en/modules/members/moremember.tt | 15 ++++---- > .../prog/en/modules/members/notices.tt | 3 +- > .../intranet-tmpl/prog/en/modules/members/pay.tt | 3 +- > .../prog/en/modules/members/printfeercpt.tt | 4 +- > .../prog/en/modules/members/printinvoice.tt | 3 +- > .../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 | 4 +- > .../prog/en/modules/offline_circ/list.tt | 4 +- > .../prog/en/modules/offline_circ/process_koc.tt | 6 ++- > .../prog/en/modules/patron_lists/list.tt | 6 ++- > .../prog/en/modules/patron_lists/lists.tt | 4 +- > .../prog/en/modules/patroncards/edit-batch.tt | 4 +- > .../prog/en/modules/patroncards/home.tt | 2 + > .../en/modules/reports/guided_reports_start.tt | 5 ++- > .../prog/en/modules/reports/itemslost.tt | 4 +- > .../prog/en/modules/reports/itemtypes.tt | 4 +- > .../prog/en/modules/reports/orders_by_budget.tt | 4 +- > .../prog/en/modules/reports/serials_stats.tt | 4 +- > .../prog/en/modules/reserve/request.tt | 3 +- > .../rotating_collections/rotatingCollections.tt | 4 +- > .../prog/en/modules/serials/add_fields.tt | 4 +- > .../prog/en/modules/serials/claims.tt | 5 ++- > .../prog/en/modules/serials/serials-collection.tt | 6 ++- > .../prog/en/modules/serials/serials-edit.tt | 6 ++- > .../prog/en/modules/serials/serials-search.tt | 6 ++- > .../prog/en/modules/suggestion/suggestion.tt | 8 ++-- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 4 +- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 6 ++- > .../tools/automatic_item_modification_by_age.tt | 6 ++- > .../prog/en/modules/tools/batchMod-del.tt | 8 ++-- > .../prog/en/modules/tools/batchMod-edit.tt | 13 ++++--- > .../prog/en/modules/tools/batch_delete_records.tt | 6 ++- > .../en/modules/tools/batch_record_modification.tt | 8 ++-- > .../prog/en/modules/tools/holidays.tt | 4 +- > .../prog/en/modules/tools/inventory.tt | 6 ++- > .../prog/en/modules/tools/koha-news.tt | 8 ++-- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 5 ++- > .../prog/en/modules/tools/manage-marc-import.tt | 33 ++++++++++++++++- > .../modules/tools/marc_modification_templates.tt | 4 +- > .../prog/en/modules/tools/modborrowers.tt | 3 +- > .../prog/en/modules/tools/quotes-upload.tt | 10 +++-- > .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 10 +++-- > .../prog/en/modules/tools/showdiffmarc.tt | 4 +- > .../prog/en/modules/tools/stage-marc-import.tt | 6 ++- > .../prog/en/modules/tools/upload-images.tt | 6 ++- > .../intranet-tmpl/prog/en/modules/tools/upload.tt | 5 ++- > .../prog/en/modules/virtualshelves/shelves.tt | 9 +++-- > .../opac-tmpl/bootstrap/en/includes/datatables.inc | 6 ++- > .../bootstrap/en/includes/doc-head-close.inc | 26 ++++++++----- > .../opac-tmpl/bootstrap/en/includes/greybox.inc | 10 +++-- > .../bootstrap/en/includes/opac-bottom.inc | 43 ++++++++++++---------- > .../bootstrap/en/modules/opac-advsearch.tt | 5 ++- > .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 3 +- > .../bootstrap/en/modules/opac-auth-detail.tt | 3 +- > .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 3 +- > .../bootstrap/en/modules/opac-course-details.tt | 3 +- > .../bootstrap/en/modules/opac-course-reserves.tt | 3 +- > .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 15 ++++---- > .../bootstrap/en/modules/opac-memberentry.tt | 6 ++- > .../bootstrap/en/modules/opac-overdrive-search.tt | 7 ++-- > .../bootstrap/en/modules/opac-results-grouped.tt | 3 +- > .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 11 +++--- > .../bootstrap/en/modules/opac-search-history.tt | 3 +- > .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 3 +- > .../bootstrap/en/modules/opac-suggestions.tt | 5 ++- > .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 12 +++--- > .../bootstrap/en/modules/sco/printslip.tt | 4 +- > .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 9 +++-- > 179 files changed, 752 insertions(+), 416 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index 83a0890..4693e15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -1,7 +1,9 @@ >-<script src="[% interface %]/lib/codemirror/codemirror-compressed.js"></script> >-<script src="[% interface %]/lib/filesaver.js"></script> >-<script src="[% interface %]/lib/koha/cateditor/marc-mode.js"></script> >-<script src="[% interface %]/lib/require.js"></script> >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+<script src="[% interface %]/lib/codemirror/codemirror-compressed_[% KOHA_VERSION %].js"></script> >+<script src="[% interface %]/lib/filesaver_[% KOHA_VERSION %].js"></script> >+<script src="[% interface %]/lib/koha/cateditor/marc-mode_[% KOHA_VERSION %].js"></script> >+<script src="[% interface %]/lib/require_[% KOHA_VERSION %].js"></script> > <script> > require.config( { > baseUrl: '[% interface %]/lib/koha/cateditor/', >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc >index b065a35..c4efc26 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE ColumnsSettings %] > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >index 72be3f1..9fcf692 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'format_price.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/buttons.dataTables.min.css" /> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.buttons.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/buttons.colVis.min.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/buttons.dataTables.min_[% KOHA_VERSION %].css" /> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.buttons.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/buttons.colVis.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_DT_FIRST = _("First"); >@@ -22,4 +24,4 @@ > var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc >index c564793..aefe18e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc >@@ -1,4 +1,6 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index 48484f6..a4157a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -1,6 +1,7 @@ > [% USE Koha %] > [% USE String %] > [% PROCESS 'html_helpers.inc' %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > > [%# Prevent XFS attacks -%] >@@ -10,16 +11,16 @@ > > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap-theme.min.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap-theme.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > [% INCLUDE intranetstylesheet.inc %] >-[% IF ( bidi ) %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />[% END %] >+[% IF ( bidi ) %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" />[% END %] > > [% IF ( login ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/login.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/login_[% KOHA_VERSION %].css" /> > [% END %] > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >index 11d7581..473ad54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >@@ -1,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <script type="text/javascript"> > var GB_ROOT_DIR = "[% interface %]/lib/greybox/"; > </script> >-<script type="text/javascript" src="[% interface %]/lib/greybox/AJS.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/greybox/AJS_fx.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/greybox/gb_scripts.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/greybox/AJS_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/greybox/AJS_fx_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/greybox/gb_scripts_[% KOHA_VERSION %].js"></script> > <link href="[% interface %]/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >index 7d85d95..ff3fae9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >@@ -1,20 +1,22 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Online help</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > [% INCLUDE intranetstylesheet.inc %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut_[% KOHA_VERSION %].js"></script> > <!-- koha core js --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global_[% KOHA_VERSION %].js"></script> > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help_[% KOHA_VERSION %].css" /> > </head> > <body id="help" class="help"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >index a4b435c..ba897cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >@@ -2,8 +2,11 @@ > <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> > <style type="text/css" media="screen"> > >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+ > [% IF ( login ) %] >- @import url([% interface %]/[% theme %]/css/login.css); >+ @import url([% interface %]/[% theme %]/css/login_[% KOHA_VERSION %].css); > [% END %] > > html { background: #eee; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >index 54ead22..5a0a474 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %] > [% IF (intranetstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc >index 89230df..20920df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc >@@ -1,5 +1,7 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% #Enable tinymce for system preferences %] >-<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> > <script> > > [%# Save TinyMCE content and trigger an event on the original element %] >@@ -46,7 +48,7 @@ tinyMCE.init({ > mode : "specific_textareas", > editor_selector : "mce", > theme : "advanced", >- content_css : "[% interface %]/[% theme %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce_[% KOHA_VERSION %].css", > plugins : "table,save,advhr,advlink,contextmenu,advimage", > theme_advanced_buttons1 : "bold,italic,|,cut,copy,paste,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,image,link,unlink,anchor,cleanup,help,code,advhr,", > theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap|,forecolor,backcolor", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index f64a60b..cb72e1d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -1,12 +1,14 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Price %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >+<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_[% KOHA_VERSION %].js"></script> > > <script type="text/javascript"> > //<![CDATA[ >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 fe420c4..240f88e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -8,12 +10,12 @@ > › Batch list > [% END %] > </title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > [% 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="[% interface %]/[% theme %]/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="[% interface %]/[% theme %]/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/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index b7e080a..ae167e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Price %] >@@ -5,10 +7,10 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > function updateColumnsVisibility(visible) { >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 1ee7083..5179afa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,19 +1,21 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Basket grouping for [% booksellername |html %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/menu/menu-min.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/basketgroup.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/menu/menu-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/basketgroup_[% KOHA_VERSION %].js"></script> > [% IF ( grouping ) %] >-<script type="text/javascript" src="[% interface %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/animation/animation-min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/dragdrop/dragdrop-min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/element/element-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/yahoo-dom-event/yahoo-dom-event_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/animation/animation-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/dragdrop/dragdrop-min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/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 5cc8cc7..06c67c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -1,4 +1,5 @@ > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › > [% IF ( add_form ) %] >@@ -8,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 1384c1a..ca0fda3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -1,4 +1,6 @@ >+[% USE Koha %] > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Search for vendor [% supplier %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -7,7 +9,7 @@ > vertical-align: top; > } > </style> >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 80affbe..e64fad9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -1,7 +1,8 @@ > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › EDIFACT messages</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index a3ef54a..314f9f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -1,14 +1,16 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > >-<script type="text/javascript" src="[% interface %]/js/autocomplete/patrons.js"></script> >+<script type="text/javascript" src="[% interface %]/js/autocomplete/patrons_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_REMOVE_PATRON = _("Remove"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index 92c31fe..6e054a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoice › Files</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 9d156ef..99db277 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Price %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoice</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 79f1b79..69c3d6f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -1,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoices</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 2363765..a732b2d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -1,13 +1,15 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Late orders</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.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.checkboxes.min_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 3796d18..7628dff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -1,6 +1,8 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Search existing records</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 7feb3d9..34f3dd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -1,14 +1,16 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] > <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="[% interface %]/[% theme %]/js/acq.js"></script> >-[% INCLUDE 'additem.js.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+[% INCLUDE 'additem_[% KOHA_VERSION %].js.inc' %] >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > actTotal = ""; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index b97b20a..178e1eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -1,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials [% biblionumber %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index d50adf4..494fb9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -1,6 +1,8 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Add order from a suggestion</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index 19e9618..cd22144 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Ordered</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 b6e790c..176daab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Price %] >@@ -6,9 +8,9 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'additem.js.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 82bca90..d69e77f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -1,15 +1,16 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Price %] > [% USE currency = format('%.2f') -%] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( date ) %] > Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% 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.cookie.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> > <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 802533f..f9e69f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -1,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Receive shipment from vendor [% name %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 0b1bdc6..2e64e53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Spent</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 25a3d65..5fbb582 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% BLOCK edit_contact %] > <ol id="contact-form"> >@@ -87,7 +89,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Vendor [% bookselname %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > >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 b5491cf..35e24c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -1,7 +1,8 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >@@ -22,7 +23,7 @@ > var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> > </head> > <body id="acq_uncertainprice" class="acq"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index ddf104a..193dd67 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -1,10 +1,12 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >@@ -39,7 +41,7 @@ > //]]> > </script> > [% INCLUDE 'z3950_search.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search_[% KOHA_VERSION %].js"></script> > <style type="text/css"> > .linktools { background-color:#FFF;border-top:1px solid #DDD; border-left: 1px solid #DDD; border-right: 1px solid #666; border-bottom:1px solid #666;display: none; white-space: nowrap;} > .linktools a { font-size : 85%; text-decoration:none; padding:.3em;;background-color:#FFF; display:block;float:left;border-right:1px solid #DDD;} >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 76f0701..fc60cf0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Price %] > >@@ -27,15 +29,15 @@ > [% END -%] > > [% INCLUDE 'doc-head-open.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% IF close_form %] >- <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >+ <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_[% KOHA_VERSION %].js"></script> > [% END %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 a3c9ee9..01830f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -1,6 +1,8 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE Price %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,7 +14,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > //]]> > </script> > >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> > [% IF op == 'add_form' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -170,10 +172,10 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > //]]> > </script> > [% ELSIF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >- <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >+ <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_[% 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 1cff513..ecd5543 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="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 66f6b9f..14b104a 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="[% interface %]/[% theme %]/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="[% interface %]/[% theme %]/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/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >index a1d3309..d67a705 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Audio alerts</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -7,7 +8,7 @@ > var MSG_AUDIO_CONFIRM_DELETE = _("Are you sure you want to delete the selected audio alerts?"); > var MSG_AUDIO_CHECK_CHECKBOXES = _("Check the box next to the alert you want to delete.") > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/audio_alerts.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/audio_alerts_[% KOHA_VERSION %].js"></script> > </head> > > <body id="admin_audio_alerts" class="admin"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index f083e25..8b3eb53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -1,4 +1,6 @@ > [% USE AuthorisedValues %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %] > [% IF ( heading_modify_tag_p ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Modify tag[% END %] >@@ -6,7 +8,7 @@ > [% ELSE %]› [% action %][% END %][% END %][% IF ( delete_confirm ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Confirm deletion[% END %][% IF ( delete_confirmed ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Data deleted[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 5aee840..ef7fffe 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,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authorized values > [% IF op == 'add_form' %] >@@ -8,7 +10,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index f76f394..c1a520a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authority types > [% IF op == 'add_form' %] >@@ -7,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index 4edc861..ab30ef9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › MARC frameworks > [% IF op == 'add_form' %] >@@ -7,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > /* Set some variable needed in biblio_framework.js */ >@@ -17,7 +19,7 @@ > var MSG_IMPORTING_TO_FRAMEWORK = _("Importing to framework: %s. Importing from file: %s."); > var template_path = "[% interface %]/[% theme %]"; > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/biblio_framework.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/biblio_framework_[% KOHA_VERSION %].js"></script> > > </head> > <body id="admin_biblio_framework" class="admin"> >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 2ff8f84..72aa9f4 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,10 +1,12 @@ > [% USE Branches %] >+[% 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' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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[ > $(document).ready(function(){ >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 7a5f22a..021a253 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Libraries and groups > [% IF op == 'editcategory' %] >@@ -11,9 +13,9 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >@@ -40,7 +42,7 @@ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% interface %]/[% theme %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce_[% KOHA_VERSION %].css", > plugins : "table,save,advhr,advlink,contextmenu", > theme_advanced_buttons1 : "save,|,bold,italic,|,cut,copy,paste,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,link,unlink,anchor,cleanup,help,code,advhr,", > theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index b28b634..63b6ebd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -7,14 +8,14 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _."); > var MSG_BOTH_ENROLLMENTPERIODS = _("Please choose only one enrollment period setting."); > var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date."); > </script> >-<script type="text/javascript" src="[% themelang %]/js/categories.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/categories_[% KOHA_VERSION %].js"></script> > <style type="text/css">#enrolmentmessage.hint { display : none; }</style> > </head> > <body id="admin_categorie" class="admin"> >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 7acb4d6..8ddd378 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,7 +1,9 @@ >+[% 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' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 3f2c5bf..e4a30c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -6,7 +8,7 @@ > [% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency %]'[% END %] > [% IF op == 'list' %]Currencies[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >index eb67749..8753e92 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >@@ -1,11 +1,13 @@ > [% USE AuthorisedValues %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Item search fields</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript"> > var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/item_search_fields.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/item_search_fields_[% KOHA_VERSION %].js"></script> > </head> > <body id="admin_itemssearchfields" class="admin"> > [% INCLUDE 'header.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 040b52e..c0e8ac5 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 AuthorisedValues %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -21,7 +22,7 @@ Data deleted > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >index 9d53e5c..87d452f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >@@ -1,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Localization</title> > [% INCLUDE 'doc-head-close.inc' popup => 1 %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index efdac8d..3d6c418 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration ›[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure › Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure › [% action %][% END %][% END %] > [% IF ( delete_confirm ) %] MARC subfield structure › Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure › Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_subfields_structure.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_subfields_structure_[% KOHA_VERSION %].js"></script> > </head> > <body id="admin_marc_subfields_structure" class="admin"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index a5d354d..9f90cf8 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,6 @@ > [% USE AuthorisedValues %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › > [% IF ( add_form ) %]MARC frameworks › [% action %] [% searchfield %][% END %] >@@ -6,9 +8,9 @@ > [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] > [% IF ( else ) %]MARC frameworks[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> > > <script type="text/javascript"> > //<![CDATA[ >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 22fb001..c230074 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -1,16 +1,17 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › System preferences</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/preferences.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/preferences_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/multiple-select/jquery.multiple.select.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/plugins/multiple-select/multiple-select.css" /> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/multiple-select/jquery.multiple.select_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/plugins/multiple-select/multiple-select_[% KOHA_VERSION %].css" /> > <script type="text/javascript"> > //<![CDATA[ > [% UNLESS ( searchfield ) %]$(document).ready(function(){ >@@ -47,10 +48,10 @@ > > //]]> > </script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/humanmsg.css" /> >-<script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> >-<script src="[% interface %]/[% theme %]/js/ajax.js" type="text/javascript"></script> >-<script src="[% interface %]/[% theme %]/js/pages/preferences.js" type="text/javascript"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/humanmsg_[% KOHA_VERSION %].css" /> >+<script src="[% interface %]/lib/jquery/plugins/humanmsg_[% KOHA_VERSION %].js" type="text/javascript"></script> >+<script src="[% interface %]/[% theme %]/js/ajax_[% KOHA_VERSION %].js" type="text/javascript"></script> >+<script src="[% interface %]/[% theme %]/js/pages/preferences_[% KOHA_VERSION %].js" type="text/javascript"></script> > [%# Add WYSIWYG editor for htmlarea system preferences %] > [% INCLUDE 'wysiwyg-systempreferences.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index c974417..6717a7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › SMS cellular providers</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,7 +11,7 @@ > var LABEL_SMS_EDIT_PROVIDER = _("Edit provider %s"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/sms_providers.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/sms_providers_[% KOHA_VERSION %].js"></script> > </head> > > <body id="admin_sms_providers" class="admin"> >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 4f8f511..a4cb17d 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') %] > [% 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> >@@ -6,7 +7,7 @@ > [%# Add WYSIWYG editor for htmlarea system preferences %] > [% INCLUDE 'wysiwyg-systempreferences.inc' %] > [% IF ( else ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 4a6a968..f807a44 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > > [% BLOCK ServerType %] >@@ -15,7 +17,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > > [% IF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% END %] > >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 ceb6e60..45b53da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -1,8 +1,10 @@ >+[% 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="[% interface %]/[% theme %]/js/cataloging.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> > > <script type="text/javascript"> > //<![CDATA[ >@@ -152,9 +154,9 @@ function confirmnotdup(redirect){ > } > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > </head> > <body id="auth_authorities" class="auth"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index 295c325..659d16b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Authorities › >@@ -9,7 +11,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( displayhierarchy ) %] >-<script type="text/javascript" src="/intranet-tmpl/lib/jquery/plugins/jquery.jstree.js"></script> >+<script type="text/javascript" src="/intranet-tmpl/lib/jquery/plugins/jquery.jstree_[% KOHA_VERSION %].js"></script> > [% END %] > <script type="text/javascript"> > >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 c8fe357..0807e27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -1,8 +1,10 @@ >+[% 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="[% interface %]/[% theme %]/js/merge-record.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 c4f0e11..25ec230 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% BLOCK controls %] > <p style="padding: 7px 0; border-top : 1px solid #E8E8E8;"> > <a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a> >@@ -28,12 +30,12 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <style type="text/css"> >- @import url([% interface %]/[% theme %]/css/print.css); >+ @import url([% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css); > </style> > [% ELSE %][% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cart.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cart_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% END %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt >index ddf39a3..4810da2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print Notices for [% today %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >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 abe3ea2..c83a6f4 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 004d77f..a3f6e8d 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/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 6a7e045..df2cedb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -1,8 +1,10 @@ > [% USE Branches %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Advanced search</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> > <script type="text/JavaScript" language="JavaScript"> > /** > * Function add_field(); >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 b9bf9ed..02cf6c6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -28,7 +29,7 @@ > </title> > > [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %] >- <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 %] > > [% INCLUDE 'doc-head-close.inc' %]<script type="text/JavaScript"> >@@ -228,14 +229,14 @@ function verify_images() { > });[% END %] > //]]> > </script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index ed58a96..f36804f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Checkout history for [% title |html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >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 e88d774..db9f908 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE CGI %] > [% USE JSON.Escape %] > >@@ -160,11 +162,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Item search</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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.fixFloat.js"></script> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/itemsearchform.css" /> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/itemsearchform_[% KOHA_VERSION %].css" /> > <script type="text/javascript"> > //<![CDATA[ > var authorised_values = [% authorised_values_json %]; >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 c56a3cc..76a24d6 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 b04fd39..4639f55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -1,14 +1,15 @@ >-[% USE Koha %] > [% USE Branches %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Item details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% 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 b9861bc..954d6cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -1,5 +1,6 @@ > [% USE Koha %] > [% USE Biblio %] >+[% 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' %] >@@ -15,9 +16,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 f55d4fc..9b4b751 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,11 +1,12 @@ >-[% 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' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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[ > $(document).ready(function() { >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 7a50096..27c6a7a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,14 +1,15 @@ > [% 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="[% interface %]/[% theme %]/js/cataloging.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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)); >@@ -380,7 +381,7 @@ function Changefwk() { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> > > [% INCLUDE 'select2.inc' %] > <script> >@@ -390,7 +391,7 @@ function Changefwk() { > </script> > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > </head> > <body id="cat_addbiblio" class="cat"> >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 7eaec91..5586f27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -1,18 +1,18 @@ > [% USE Koha %] > [% USE ColumnsSettings %] >- >+[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber %]) › Items</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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)); >@@ -126,7 +126,7 @@ function confirm_deletion() { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> > > [% INCLUDE 'select2.inc' %] > <script type="text/javascript"> >@@ -136,7 +136,7 @@ function confirm_deletion() { > </script> > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > </head> > <body id="cat_additem" class="cat"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index dd3ab74..e2ce3a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -1,13 +1,15 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › Editor</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/cateditor.css" /> >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> >-<link rel="stylesheet" href="[% interface %]/lib/codemirror/codemirror.css" /> >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/humanmsg.css" /> >-<script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/cateditor_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" href="[% interface %]/lib/codemirror/codemirror_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/humanmsg_[% KOHA_VERSION %].css" /> >+<script src="[% interface %]/lib/jquery/plugins/humanmsg_[% KOHA_VERSION %].js" type="text/javascript"></script> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > </head> > <body id="cat_addbiblio" class="cat"> >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 464d763..5c59838 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="[% interface %]/[% theme %]/js/merge-record.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >index b1a3142..c98aaaf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >@@ -1,6 +1,8 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >index 2124634..c6481c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › 006 builder</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield.js'></script> >+<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield_[% KOHA_VERSION %].js'></script> > <script type="text/javascript"> > var objXmlControlField; > var tr_result; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >index d32e202..39cca93 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › 008 builder</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield.js'></script> >+<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield_[% KOHA_VERSION %].js'></script> > <script type="text/javascript"> > var objXmlControlField; > var tr_result; >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 6e6de65..8211439 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,8 +1,10 @@ >+[% 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' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %]_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %]_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -39,7 +41,7 @@ $(document).ready(function(){ > //]]> > </script> > [% INCLUDE 'z3950_search.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search_[% KOHA_VERSION %].js"></script> > <style type="text/css"> > .linktools { background-color:#FFF;border-top:1px solid #DDD; border-left: 1px solid #DDD; border-right: 1px solid #666; border-bottom:1px solid #666;display: none; white-space: nowrap;} > .linktools a { font-size : 85%; text-decoration:none; padding:.3em;;background-color:#FFF; display:block;float:left;border-right:1px solid #DDD;} >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 733c6b5..88a95cb 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,8 +1,10 @@ >+[% 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' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -40,7 +42,7 @@ $(document).ready(function(){ > //]]> > </script> > [% INCLUDE 'z3950_search.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search_[% KOHA_VERSION %].js"></script> > <style type="text/css"> > .linktools { background-color:#FFF;border-top:1px solid #DDD; border-left: 1px solid #DDD; border-right: 1px solid #666; border-bottom:1px solid #666;display: none; white-space: nowrap;} > .linktools a { font-size : 85%; text-decoration:none; padding:.3em;;background-color:#FFF; display:block;float:left;border-right:1px solid #DDD;} >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 114f2e7..da54c36 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE KohaDates %] > [% USE Categories %] >@@ -19,17 +20,17 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% 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="[% interface %]/[% theme %]/js/pages/circulation.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index e1c7c14..7702572 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE KohaDates %] > [% USE Price %] >@@ -14,7 +16,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >index 3a29622..3e8af41 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >@@ -1,30 +1,32 @@ >+[%- USE Koha -%] >+[%- SET KOHA_VERSION = Koha.Preference('Version') -%] > CACHE MANIFEST > # [% cookie %] > > # Explicitly cached 'master entries'. > CACHE: > /cgi-bin/koha/circ/offline.pl >-[% interface %]/lib/bootstrap/bootstrap.min.css >-[% interface %]/lib/bootstrap/bootstrap-theme.min.css >-[% interface %]/lib/bootstrap/bootstrap.min.js >+[% interface %]/lib/bootstrap/bootstrap.min_[% KOHA_VERSION %].css >+[% interface %]/lib/bootstrap/bootstrap-theme.min_[% KOHA_VERSION %].css >+[% interface %]/lib/bootstrap/bootstrap.min_[% KOHA_VERSION %].js > [% interface %]/lib/jquery/images/ui-icons_222222_256x240.png > [% interface %]/lib/jquery/images/ui-icons_454545_256x240.png >-[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css >-[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js >-[% interface %]/lib/jquery/jquery-2.2.3.min.js >-[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js >-[% interface %]/lib/jquery/plugins/jquery.cookie.min.js >-[% interface %]/lib/jquery/plugins/jquery.highlight-3.js >-[% interface %]/lib/shortcut/shortcut.js >-[% interface %]/lib/jquery/plugins/jquery.indexeddb.js >-[% interface %]/lib/jquery/plugins/jquery.validate.min.js >-[% interface %]/[% theme %]/css/print.css >-[% interface %]/[% theme %]/css/staff-global.css >-[% interface %]/[% theme %]/js/basket.js >-[% interface %]/[% theme %]/js/offlinecirc.js >-[% interface %]/[% theme %]/js/staff-global.js >-[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js >-[% themelang %]/lib/yui/reset-fonts-grids.css >+[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].css >+[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/plugins/jquery.highlight-3_[% KOHA_VERSION %].js >+[% interface %]/lib/shortcut/shortcut_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/plugins/jquery.indexeddb_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/plugins/jquery.validate.min_[% KOHA_VERSION %].js >+[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css >+[% interface %]/[% theme %]/css/staff-global_[% KOHA_VERSION %].css >+[% interface %]/[% theme %]/js/basket_[% KOHA_VERSION %].js >+[% interface %]/[% theme %]/js/offlinecirc_[% KOHA_VERSION %].js >+[% interface %]/[% theme %]/js/staff-global_[% KOHA_VERSION %].js >+[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].js >+[% themelang %]/lib/yui/reset-fonts-grids_[% KOHA_VERSION %].css > [% interface %]/prog/img/cart-small.gif > [% interface %]/prog/img/koha-logo-medium.gif > [% interface %]/prog/img/loading.gif >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 2bd1b4c..4ce1436 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 %]/[% theme %]/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 %]/[% theme %]/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/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 648225c..f7ec1b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -5,7 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Pending on-site checkouts</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.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 7017465..30345d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% USE AuthorisedValues %] >@@ -8,7 +10,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <!-- Plugin datatables --> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/JavaScript"> >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 93ff49b..cae5d1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -1,4 +1,5 @@ > [% 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> >@@ -12,7 +13,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > [% IF ( Koha.Preference('SlipCSS') ) %] > <link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') %]" /> > [% END %] >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 ec92cb7..db751a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -6,7 +8,7 @@ > <title>Koha › Circulation › Hold ratios</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 702a039..4e563f2 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 %] >@@ -23,12 +24,12 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Check in [% title |html %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'calendar.inc' %] >-<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-ui-timepicker-addon.min_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'timepicker.inc' %] > > <script type="text/javascript"> >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 8b82028..98451ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Transfers to receive</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 509e5ba..95bc9c5 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 KohaDates %] > [% USE ItemTypes %] > [% USE Branches %] >@@ -9,7 +10,7 @@ > <title>Koha › Circulation › Holds queue</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> p { margin-top: 0; }</style> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript">//<![CDATA[ >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 80af602..c1e0ceb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds awaiting pickup</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >index 8b52cac..dd33fea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >@@ -1,9 +1,10 @@ > [% USE Koha %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patron search</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > > <script type="text/javascript"> >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 9360706..329be7d 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,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] > [% USE Branches %] >@@ -5,7 +7,7 @@ > <title>Koha › Course reserves › Course details for [% course.course_name %]</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 97c2f65..6687649 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,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Course reserves</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >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 67b4c19..d0cc3fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >@@ -1,11 +1,13 @@ >+[% 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> >+<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> > <script type="text/javascript">//<![CDATA[ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% interface %]/[% theme %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce_[% KOHA_VERSION %].css", > plugins : "table,save,advhr,advlink,searchreplace,print,contextmenu", > theme_advanced_disable : "underline,strikethrough,styleselect,image", > theme_advanced_buttons1_add_before : "save,|", >@@ -22,7 +24,7 @@ tinyMCE.init({ > //]]> > </script> > [% INCLUDE intranetstylesheet.inc %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help_[% KOHA_VERSION %].css" /> > </head> > <body id="help_edithelp" class="help"> > <h1>Online Help</h1> >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 fa5cde8..f1ea4b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -1,8 +1,9 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha staff client</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="main_intranet-main" class="main"> >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 ed905a9..b0e6c7c 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,9 +1,11 @@ >+[% 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> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 f5e7725..bc91560 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,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Label creator</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > </head> > <body id="labels_label-home" class="tools labels"> >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 3444b21..099d94d 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,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% BLOCK translate_label_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%]layout >@@ -75,7 +77,7 @@ > //]]> > </script> > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index e8e0180..a414faf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Barcodes and labels › Search results</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >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 85aaae4..02a8625 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,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <!DOCTYPE html> > [% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %] > <head> > <title>Koha › Tools › Spine labels</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/spinelabel.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/spinelabel_[% KOHA_VERSION %].css" /> > > <style type="text/css"> > @media print { >@@ -12,8 +14,8 @@ > </style> > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] > [% IF ( IntranetUserJS ) %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > [% IntranetUserJS %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index a8e3667..b347df5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> >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 524c0a1..3bdfa76 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,10 +1,12 @@ > [% USE Branches %] >+[% 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> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview.css"/> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview_[% KOHA_VERSION %].css"/> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack_[% KOHA_VERSION %].js"></script> > <!-- set up tree --> > <script type="text/javascript"> > $(document).ready(function() { >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 6938f57..b5c565e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -1,11 +1,12 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE ColumnsSettings %] > [% USE Branches %] > [% USE Categories %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons [% IF ( searching ) %]› Search results[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> >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 ff3ef68..2997cee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% 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> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -100,7 +101,7 @@ $(document).ready(function() { > > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/members.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 66f13d7..05fb6b1 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 >@@ -2,12 +2,13 @@ > [% USE Branches %] > [% USE KohaDates %] > [% USE Price %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title> > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> > <body id="pat_moremember-print" class="pat" onload="printThenClose();"> >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 b91a69e..32e9940 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,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print Receipt for [% cardnumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> >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 271b30b..de75c36 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -3,6 +3,7 @@ > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE ColumnsSettings %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %] > [% SET exports_enabled = 1 %] > [% END %] >@@ -16,17 +17,17 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% 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="[% interface %]/[% theme %]/js/pages/circulation.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 cea5b0d..4a13ae2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -2,10 +2,11 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index b37ce3c..0551d76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -1,10 +1,11 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %]</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="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type= "text/javascript"> > //<![CDATA[ > function enableCheckboxActions(){ >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 ee44c89..c05e086 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -1,11 +1,13 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print Receipt for [% cardnumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" /> > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> > <body id="pat_printfeercpt" class="pat" onload="printThenClose();"> >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 6bc8ebb..0efab4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -1,9 +1,10 @@ > [% 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" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" /> > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> > <body id="printinvoice" class="pat" onload="printThenClose();"> >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 a6f1e8f..100d8b3 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,9 +1,10 @@ > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 5f2e1d8..059ddbb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -2,10 +2,11 @@ > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation History for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > //<![CDATA[ >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 ae5c276..93421af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -1,6 +1,7 @@ > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › > [% IF ( unknowuser ) %] >@@ -10,7 +11,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >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 8dcd682..6fcc327 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,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Choose Adult category</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index 2500456..5cee687 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -1,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE "doc-head-open.inc" %] > <title>Koha › Circulation › Offline circulation</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="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >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 26937d9..5255b2b 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,9 +1,11 @@ >+[% 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="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var xhr; >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 956cc28..f53a50a 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,12 +1,14 @@ >+[% USE Koha %] > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists › [% list.name %] › Add patrons</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > >-<script type="text/javascript" src="[% interface %]/js/autocomplete/patrons.js"></script> >+<script type="text/javascript" src="[% interface %]/js/autocomplete/patrons_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_REMOVE_PATRON = _("Remove"); >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 fb60e2e..26a2b2a 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,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > > <script type="text/javascript"> >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 eabc2fe..b48eb5c 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,8 +1,10 @@ >+[% 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' %] > [% INCLUDE 'greybox.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 a251810..700a39a 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 ad53c08..cbf77be 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,5 +1,8 @@ >+[% USE Koha %] > [% USE KohaDates %] > >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+ > [%- BLOCK area_name -%] > [%- SWITCH area -%] > [%- CASE 'CIRC' -%]Circulation >@@ -33,7 +36,7 @@ > #sql { width: 90%; height: 9em;} > </style> > [% IF ( saved1 ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index c6f9661..f1f3325 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -1,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Lost items</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type='text/javascript'> >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 1bfd416..bf46396 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,10 +1,12 @@ > [% USE Branches %] >+[% USE Koha %] > [% USE ItemTypes %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Catalog by item types</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( do_it ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index fc4eef7..2c057c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -1,4 +1,6 @@ >+[% USE Koha %] > [% USE Price %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Orders by fund</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -7,7 +9,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready( function () { >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 3b9ac4c..7e4b238 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,12 +1,14 @@ >+[% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Serials subscriptions stats</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > .sql {display: none;} > </style> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 34a7304..1d9f206 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Categories %] >@@ -10,7 +11,7 @@ > <title>Koha › Circulation › Holds › Confirm holds</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index 7cf35f7..169521d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Rotating collections</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index c74bf15..3a45d03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -1,4 +1,6 @@ > [% USE AuthorisedValues %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Manage new fields for subscriptions > [% IF op == "list" %] › List of fields >@@ -9,7 +11,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE "datatables.inc" %] > <script type="text/javascript"> > //<![CDATA[ >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 59beed1..63d6ca6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -1,11 +1,14 @@ >+[% USE Koha %] > [% USE Branches %] > >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+ > [% INCLUDE 'doc-head-open.inc' %] > [% USE AuthorisedValues %] > <title>Koha › Serials › Claims</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 628276e..507cf33 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,12 +1,14 @@ > [% USE AuthorisedValues %] >+[% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Serial collection information for [% bibliotitle %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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[ >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 3a2ca8f..263d758 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,9 +1,11 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Serial edition [% bibliotitle %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 1728fb0..67b43ab 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,11 +1,13 @@ >+[% USE Koha %] > [% USE Branches %] >-[% INCLUDE 'doc-head-open.inc' %] > [% USE KohaDates %] > [% USE AuthorisedValues %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+[% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials [% biblionumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 62335e8..703ba88 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -1,7 +1,9 @@ >+[% USE Koha %] > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE KohaDates %] > [% USE Price %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › > [% IF ( op_save ) %] >@@ -30,9 +32,9 @@ > </script> > [% END %] > [% IF ( op_else ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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[ > /** >@@ -176,7 +178,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > // ]]> > </script> > [% END %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 798e252..d8819d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -1,7 +1,9 @@ >+[% 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' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 9b7ecd1..81c25b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -1,11 +1,13 @@ >+[% USE Koha %] > [% USE KohaDates %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.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> > <style type="text/css"> > .setlabel {width: 6em; font-family: courier; background-color:#E8E8E8;} > .rejected { color: #CC0033; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index 946ad3a..4eaee1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Automatic item modifications by age</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/automatic_item_modification_by_age.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/automatic_item_modification_by_age_[% KOHA_VERSION %].js"></script> > [% IF op == 'edit_form' %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { >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 d66d15d..2734d92 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -1,10 +1,12 @@ >+[% 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' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/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 c04733c..7e6fa15 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') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item modification</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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 %]/[% theme %]/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="[% interface %]/[% theme %]/js/pages/batchMod_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > >@@ -42,7 +43,7 @@ $(document).ready(function(){ > <style type="text/css">#selections { display: none; }</style> > <![endif]--> > <style type="text/css">input[type=checkbox]{ margin : 0 .5em; }</style> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> > > [% INCLUDE 'select2.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 4d0eb18..af397a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -1,10 +1,12 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record deletion</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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[ > var MSG_CANNOT_BE_DELETED = _("This record cannot be deleted, at least one item is currently checked out."); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 32034a5..6ea0308 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -1,11 +1,13 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record modification</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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 %]/[% theme %]/js/background-job-progressbar.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >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 27a060c..3f4e62a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -1,9 +1,11 @@ > [% USE Branches %] >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% Branches.GetName( branch ) %] calendar</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 a76fdef..6f66133 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -1,12 +1,14 @@ >+[% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Inventory</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.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[ > function checkForm() { >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 dd1ae84..8f907c1 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,11 +1,13 @@ >+[% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › News</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% IF ( opac_news_count ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { >@@ -45,14 +47,14 @@ > //]]> > </script> > [% END %] >-<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> > <script type="text/javascript">//<![CDATA[ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", > convert_urls : false, > relative_urls : false, >- content_css : "[% interface %]/[% theme %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce_[% KOHA_VERSION %].css", > plugins : "table,save,advhr,advlink,searchreplace,print,contextmenu", > theme_advanced_buttons1 : "save,|,bold,italic,|,cut,copy,paste,|,search,replace,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,link,unlink,anchor,cleanup,help,code,advhr,|,print", > theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap", >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 129e1bf..20b521e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -1,11 +1,12 @@ > [% USE Koha %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% 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> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.insertatcaret.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.insertatcaret_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 2f0d083..3c5fece 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,3 +1,32 @@ >+[% 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> >+ [% ELSIF ( record.record_type == 'auth' ) %] >+ <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% record.final_match_id %]">[% record.final_match_id %]</a> >+ [% END %] >+[% END %] >+[% BLOCK match_link %] >+ [% IF ( record_lis.match_id ) %] >+ <tr> >+ <td /> >+ [% IF ( record.record_type == 'biblio' ) %] >+ <td colspan="5">Matches biblio [% record_lis.match_id %] (score = [% record_lis.match_score %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% record_lis.match_id %]">[% record_lis.match_citation %]</a></td> >+ [% ELSIF ( record.record_type == 'auth' ) %] >+ <td colspan="5">Matches authority [% record_lis.match_id %] (score = [% record_lis.match_score %]): <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% record_lis.match_id %]">[% record_lis.match_citation %]</a> | >+ <a href="/cgi-bin/koha/authorities/merge.pl?mergereference=breeding&authid=[% record_lis.match_id %]&authid=[% record_lis.import_record_id %]">Merge</a> >+ </td> >+ [% END %] >+ </tr> >+ [% ELSIF ( record.record_type == 'auth') %] >+ <tr data-authid="[% record_lis.import_record_id %]"> >+ <td /> >+ <td colspan="4"><a href="#" class="merge_auth">Search for a record to merge in a new window</a></td> >+ </tr> >+ [% END %] >+[% END %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Manage staged MARC records > [% IF ( import_batch_id ) %] >@@ -5,8 +34,8 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 759c273..83137da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › MARC modification templates</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -17,7 +19,7 @@ > var MSG_MMT_UPDATE_ACTION = _("Update action"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_modification_templates.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_modification_templates_[% KOHA_VERSION %].js"></script> > <style type="text/css"> > #add_action { display: none; } > </style> >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 0ff04f5..dab4e5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -1,11 +1,12 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc'%] > <title>Koha › Tools › Batch patron modification</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 088b730..f9b4aba 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,11 +1,13 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote uploader</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/uploader.css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes.css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/uploader_[% KOHA_VERSION %].css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes_[% KOHA_VERSION %].css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var oTable; //DataTable object >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 f0d4bd8..372f0bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,11 +1,13 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote editor</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes.css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes_[% KOHA_VERSION %].css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.fnReloadAjax.js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.fnReloadAjax_[% KOHA_VERSION %].js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index 93edb39..4cfc335 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -1,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Manage staged MARC records › Compare matched records</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jsdiff/jsdiff.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jsdiff/jsdiff.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > $(document).ready(function(){ > var diff1 = $("#col1 pre").text(); >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 2383451..d52a09e 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,9 +1,11 @@ >+[% 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="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> > > <style type="text/css"> > #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 82f5912..4d45c6a 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,9 +1,11 @@ >+[% 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="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> > > <style type="text/css"> > #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 5b61b6b..a0dd96c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -1,5 +1,6 @@ >-[% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+[% INCLUDE 'doc-head-open.inc' %] > [% IF plugin %] > <title>Upload plugin</title> > [% ELSE %] >@@ -207,7 +208,7 @@ > ]; > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > function StartUpload() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 2044754..8b0f33f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -1,13 +1,14 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% SET PRIVATE = 1 %] > [% SET PUBLIC = 2 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname | html %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname | html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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> > > [% IF print %] > <script type="text/javascript"> >@@ -19,8 +20,8 @@ > [% END %] > > [% IF op == 'view' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.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.fixFloat_[% KOHA_VERSION %].js"></script> > [% END %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >index d3075c9..62db32c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >@@ -1,4 +1,6 @@ >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_DT_FIRST = _("First"); >@@ -17,4 +19,4 @@ > var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> >\ No newline at end of file >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script> >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 5635cdc..50aa786 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,17 +1,20 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <meta name="viewport" content="width=device-width, initial-scale=1" /> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap-rtl.min.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap-rtl.min_[% KOHA_VERSION %].css" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> > [% END %] > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui-rtl.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui-rtl_[% KOHA_VERSION %].css" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> > [% END %] > > [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] >@@ -30,9 +33,12 @@ > [% IF ( opac_css_override ) %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% opac_css_override %]" /> > [% END %] >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% IF persona %] >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/persona-buttons_[% KOHA_VERSION %].css" /> >+[% END %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] > [% IF SCO_login %] >@@ -43,13 +49,13 @@ > [% END %] > <link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" /> > [% PROCESS cssinclude %] >-<!-- Respond.js brings responsive layout behavior to IE < v.9 --> >+<!-- Respond_[% KOHA_VERSION %].js brings responsive layout behavior to IE < v.9 --> > <!--[if lt IE 9]> >- <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script> >+ <script src="[% interface %]/[% theme %]/lib/respond.min_[% KOHA_VERSION %].js"></script> > <![endif]--> > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min_[% KOHA_VERSION %].css" /> > [% PROCESS 'html_helpers.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc >index 92ef62d..8a2331f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc >@@ -1,7 +1,9 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > <script type="text/javascript"> > var GB_ROOT_DIR = "[% interface %]/[% theme %]/lib/greybox/"; > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS_fx.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/gb_scripts.js"></script> >-<link href="[% interface %]/[% theme %]/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS_fx_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/gb_scripts_[% KOHA_VERSION %].js"></script> >+<link href="[% interface %]/[% theme %]/lib/greybox/gb_styles_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index 80626e0..4afb558 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% UNLESS ( is_popup ) %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] > [% IF ( opaccredits ) %] >@@ -77,24 +79,24 @@ > > > <!-- JavaScript includes --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery-ui.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > // Resolve name collision between jQuery UI and Twitter Bootstrap > $.widget.bridge('uitooltip', $.ui.tooltip); > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/bootstrap/js/bootstrap.min.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/global.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/bootstrap/js/bootstrap.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/global_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > Modernizr.load([ > // Test need for polyfill > { > test: window.matchMedia, >- nope: "[% interface %]/[% theme %]/lib/media.match.min.js" >+ nope: "[% interface %]/[% theme %]/lib/media.match.min_[% KOHA_VERSION %].js" > }, > // and then load enquire >- "[% interface %]/[% theme %]/lib/enquire.min.js", >- "[% interface %]/[% theme %]/js/script.js" >+ "[% interface %]/[% theme %]/lib/enquire.min_[% KOHA_VERSION %].js", >+ "[% interface %]/[% theme %]/js/script_[% KOHA_VERSION %].js" > ]); > > // Fix for datepicker in a modal >@@ -105,9 +107,8 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > var NO_AMAZON_IMAGE = _("No cover image available"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/amazonimages.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/amazonimages_[% KOHA_VERSION %].js"></script> > [% END %] >- > <script type="text/javascript"> > //<![CDATA[ > var MSG_CONFIRM_AGAIN = _("Warning: Cannot be undone. Please confirm once again") >@@ -172,16 +173,16 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > > [% IF Koha.Preference( 'opacbookbag' ) == 1 %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket_[% KOHA_VERSION %].js"></script> > [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket_[% KOHA_VERSION %].js"></script> > [% ELSE %] > <script type="text/javascript">var readCookie;</script> > [% END %] > >-[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/tags.js"></script>[% END %][% ELSE %][% END %] >+[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/tags_[% KOHA_VERSION %].js"></script>[% END %][% ELSE %][% END %] > [% IF ( GoogleJackets ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/google-jackets.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/google-jackets_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var NO_GOOGLE_JACKET = _("No cover image available"); >@@ -189,7 +190,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > [% END %] > [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/coce.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/coce_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var NO_COCE_JACKET = _("No cover image available"); >@@ -198,7 +199,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > > [% IF OpenLibraryCovers || OpenLibrarySearch %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/openlibrary.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/openlibrary_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var NO_OL_JACKET = _("No cover image available"); >@@ -208,7 +209,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > > [% IF OPACLocalCoverImages %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var NO_LOCAL_JACKET = _("No cover image available"); >@@ -217,7 +218,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > > [% IF ( BakerTaylorEnabled ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/bakertaylorimages.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/bakertaylorimages_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var NO_BAKERTAYLOR_IMAGE = _("No cover image available"); >@@ -229,7 +230,11 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > [% IF ( GoogleIndicTransliteration ) %] > <script type="text/javascript" src="https://www.google.com/jsapi"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/googleindictransliteration.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/googleindictransliteration_[% KOHA_VERSION %].js"></script> >+[% END %] >+[% IF persona %] >+ <script src="https://login.persona.org/include_[% KOHA_VERSION %].js"></script> >+ <script type="text/javascript"> > [% END %] > > [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] >@@ -240,7 +245,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > [% END %] > >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > $(document).ready(function() { > if($('#searchsubmit').length) { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >index 94963c4..1f09ef3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >@@ -1,5 +1,6 @@ > [% USE Koha %] > [% USE Branches %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Advanced search</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -395,8 +396,8 @@ > [% END %] > > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.deserialize.min.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.deserialize.min_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { > $('#advsearches').tabs(); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index 7aded0b..25af0a4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'opac-authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Entry [% authtypetext %]</title> >@@ -63,7 +64,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree.js"></script> >+<script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index fd85eda..e14ab9e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% PROCESS 'opac-authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Authority search › [% summary.mainentry %][% IF authtypetext %] ([% authtypetext %])[% END %]</title> >@@ -128,7 +129,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% IF ( displayhierarchy ) %] >- <script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree.js"></script> >+ <script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree_[% KOHA_VERSION %].js"></script> > [% END %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >index fa7e496..479e6c1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && TagsEnabled && TagsInputOnList ) %] > >@@ -320,7 +321,7 @@ > //]]> > </script> > [% ELSE %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >index fd2e739..cccaae8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] >@@ -7,7 +8,7 @@ > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Course reserves for [% course.course_name %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% END %] > > </head> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >index 9744455..7db85ca 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >@@ -1,11 +1,12 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE AuthorisedValues %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Courses</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% END %] > > </head> >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 e4fb61f..6c71e15 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,6 @@ > [% USE Math %] > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Branches %] > [% USE AuthorisedValues %] >@@ -28,10 +29,10 @@ > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield |html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( bidi ) %] >- [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />[% END %] >+ [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" />[% END %] > [% END %] > [% IF ( OpacStarRatings != 'disable' ) %] >- [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating.css" />[% END %] >+ [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating_[% KOHA_VERSION %].css" />[% END %] > [% END %] > [% INCLUDE greybox.inc %] > </head> >@@ -1141,7 +1142,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 ) %] >@@ -1334,16 +1335,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-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index 53401b9..8d6614a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -1,7 +1,9 @@ >-[% USE Categories %] > [% USE Koha %] > [% USE Branches %] >+[% USE Categories %] > [% USE KohaDates %] >+ >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% SET userupdateview = 1 %] > > [% INCLUDE 'doc-head-open.inc' %] >@@ -944,7 +946,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.validate.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.validate.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >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 f5a26af..237f9d7 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,9 +1,10 @@ > [% 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' %] > [% BLOCK cssinclude %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating_[% KOHA_VERSION %].css" /> > <style> > .actions a.addtocart { > display: inline; >@@ -59,8 +60,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-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >index 8595f9a..bd2c48e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › > [% IF ( searchdesc ) %] >@@ -269,7 +270,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > >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 2d85671..0e2caef 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -1,4 +1,5 @@ > [% 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 ) %] > >@@ -12,7 +13,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating_[% KOHA_VERSION %].css" /> > [% END %] > [% END %] > >@@ -588,10 +589,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/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index d8d6c57..2ac3281 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your search history</title> >@@ -215,7 +216,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete selected search history entries?"); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index 0e20fcf..93fc7cf 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% SET PRIVATE = 1 %] > [% SET PUBLIC = 2 %] > [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %] >@@ -748,7 +749,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?"); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >index fa9da1f..4d7a86c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -2,6 +2,9 @@ > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE KohaDates %] >+ >+[% SET KOHA_VERSION = Koha.Preference('Version') %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › > [% IF ( op_add ) %]Enter a new purchase suggestion[% END %] >@@ -272,7 +275,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 3bf2f15..ab229d9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >@@ -1,21 +1,23 @@ >+[% 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> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco_[% KOHA_VERSION %].css" /> > [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] > [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] > <!--[if lt IE 9]> >- <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script> >+ <script src="[% interface %]/[% theme %]/lib/respond.min_[% KOHA_VERSION %].js"></script> > <![endif]--> > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> > </head> > <body id="sco_help" class="sco"> > [% INCLUDE 'masthead-sco.inc' %] >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 f9a6582..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,8 +1,10 @@ >+[% 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" /> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> > [% IF stylesheet %] > <link rel="stylesheet" type="text/css" href="[% stylesheet %]" /> > [% END %] >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 d97c5f1..e475101 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,4 +1,5 @@ > [% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE AudioAlerts %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -6,9 +7,9 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco_[% KOHA_VERSION %].css" /> > [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] > [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] > <!--[if lt IE 9]> >@@ -17,7 +18,7 @@ > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> > </head> > <body id="sco_main" class="sco" onload="dofocus();" onunload="mungeHistory();"> > [% INCLUDE 'masthead-sco.inc' %] >-- >2.7.4
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