Bugzilla – Attachment 48737 Details for
Bug 12904
Force browser to load new JavaScript and CSS files after upgrade
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12904 [Followup] - Give same treatment to CSS
Bug-12904-Followup---Give-same-treatment-to-CSS.patch (text/plain), 109.66 KB, created by
Jonathan Druart
on 2016-03-07 11:56:14 UTC
(
hide
)
Description:
Bug 12904 [Followup] - Give same treatment to CSS
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-03-07 11:56:14 UTC
Size:
109.66 KB
patch
obsolete
>From 2fcf3d8eab46d66c4df01d4dc7fe68b9a9fc8fdd Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 6 Nov 2014 09:33:48 +0000 >Subject: [PATCH] Bug 12904 [Followup] - Give same treatment to CSS > >We should really do this for other static files too, else you'll still get >strange results when mismtaches of resource versions happen > >This patch applies the same logic to CSS files >--- > debian/templates/apache-shared-intranet.conf | 1 + > debian/templates/apache-shared-opac.conf | 1 + > .../intranet-tmpl/prog/en/includes/doc-head-close.inc | 10 +++++----- > koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc | 8 ++++---- > .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 ++ > .../prog/en/modules/acqui/addorderiso2709.tt | 5 +++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/acqui/invoice-files.tt | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt | 4 +++- > .../prog/en/modules/acqui/newordersubscription.tt | 4 +++- > .../prog/en/modules/acqui/newordersuggestion.tt | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 4 +++- > .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 4 +++- > .../prog/en/modules/admin/aqbudgetperiods.tt | 6 ++++-- > .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 6 ++++-- > .../prog/en/modules/admin/auth_tag_structure.tt | 4 +++- > .../prog/en/modules/admin/authorised_values.tt | 3 ++- > .../prog/en/modules/admin/branch_transfer_limits.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 5 +++-- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 5 ++--- > .../prog/en/modules/admin/marctagstructure.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 10 +++++----- > .../prog/en/modules/admin/systempreferences.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 3 ++- > .../prog/en/modules/authorities/authorities.tt | 5 +++-- > koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt | 5 +++-- > .../prog/en/modules/catalogue/search-history.tt | 3 ++- > .../prog/en/modules/cataloguing/addbiblio.tt | 5 +++-- > .../intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 8 ++++---- > .../prog/en/modules/cataloguing/z3950_auth_search.tt | 3 ++- > .../prog/en/modules/cataloguing/z3950_search.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 3 ++- > .../prog/en/modules/circ/transferstoreceive.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 3 ++- > .../prog/en/modules/course_reserves/course-details.tt | 3 ++- > .../prog/en/modules/course_reserves/course-reserves.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt | 5 +++-- > koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 4 ++-- > .../prog/en/modules/labels/label-edit-batch.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/labels/label-home.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/labels/label-manage.tt | 3 ++- > .../prog/en/modules/labels/spinelabel-print.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/members/member-flags.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 4 ++-- > .../prog/en/modules/members/moremember-print.tt | 3 ++- > .../prog/en/modules/members/moremember-receipt.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/members/moremember.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/members/notices.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/members/printinvoice.tt | 3 ++- > .../prog/en/modules/members/purchase-suggestions.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/members/readingrec.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/members/statistics.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/members/update-child.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/patron_lists/list.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/patron_lists/lists.tt | 3 ++- > .../prog/en/modules/patroncards/edit-batch.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/patroncards/home.tt | 2 +- > .../prog/en/modules/reports/guided_reports_start.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/reports/itemtypes.tt | 3 ++- > .../prog/en/modules/reports/serials_stats.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt | 3 ++- > .../prog/en/modules/serials/serials-collection.tt | 3 ++- > .../prog/en/modules/serials/serials-search.tt | 3 ++- > .../prog/en/modules/suggestion/suggestion.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 5 +++-- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/inventory.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 5 +++-- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 3 ++- > .../prog/en/modules/tools/manage-marc-import.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/modborrowers.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/quotes-upload.tt | 7 ++++--- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt | 5 +++-- > .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 15 ++++++++------- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 5 +++-- > .../bootstrap/en/modules/opac-overdrive-search.tt | 3 ++- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 3 ++- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 7 ++++--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 3 ++- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 7 ++++--- > 102 files changed, 252 insertions(+), 146 deletions(-) > >diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf >index 37f86d0..211bcab 100644 >--- a/debian/templates/apache-shared-intranet.conf >+++ b/debian/templates/apache-shared-intranet.conf >@@ -18,3 +18,4 @@ RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT] > RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] > RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] > RewriteRule ^(.*)_(.*).js$ $1.js [R=301,N,L] >+RewriteRule ^(.*)_(.*).css$ $1.css [R=301,N,L] >diff --git a/debian/templates/apache-shared-opac.conf b/debian/templates/apache-shared-opac.conf >index 4cc58a2..cbb88c5 100644 >--- a/debian/templates/apache-shared-opac.conf >+++ b/debian/templates/apache-shared-opac.conf >@@ -18,3 +18,4 @@ RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT] > RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] > RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] > RewriteRule ^(.*)_(.*).js$ $1.js [R=301,N,L] >+RewriteRule ^(.*)_(.*).css$ $1.css [R=301,N,L] >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 d056449..fa8f628 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 >@@ -5,13 +5,13 @@ > <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.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui_[% 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/font-awesome/css/font-awesome.min.css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print_[% KOHA_VERSION %].css" /> > [% INCLUDE intranetstylesheet.inc %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery_[% KOHA_VERSION %].js"></script> >@@ -23,7 +23,7 @@ > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min_[% KOHA_VERSION %].js"></script> > > [% IF ( login ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >index 4fbf21e..53b3b2f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >@@ -4,11 +4,11 @@ > <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.css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print_[% KOHA_VERSION %].css" /> > [% INCLUDE intranetstylesheet.inc %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left_[% KOHA_VERSION %].css" /> > [% END %] > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery_[% KOHA_VERSION %].js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].js"></script> >@@ -16,6 +16,6 @@ > <!-- koha core js --> > <script type="text/javascript" src="[% themelang %]/js/staff-global_[% KOHA_VERSION %].js"></script> > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/help.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/help_[% KOHA_VERSION %].css" /> > </head> > <body id="help" class="help"> >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 112a4ab..86d6b25 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,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions</title> >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 36bf23d..dab0a24 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 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Order staged MARC records >@@ -7,8 +9,7 @@ > › Batch list > [% END %] > </title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >-<style type="text/css">#dataPreview { width : 80%; margin-left : -40%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >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 7bcbbbe..2b31029 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -1,10 +1,12 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > [% USE Price %] > [% USE AuthorisedValues %] > > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 0bdd830..c52e204 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,7 +1,9 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% themelang %]/lib/yui/utilities/utilities.js"></script> >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 988fd27..2b28aca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -1,8 +1,10 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index b2e26aa..f549e6a 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 3c0991e..e590571 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 e458af1..0932d53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -1,8 +1,10 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE KohaDates %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoices</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 5bebcb6..906b3a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -1,9 +1,11 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >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 037dc10..6fb1bc8 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 d6e65a0..1d0c9da 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 11ab144..caec226 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 bc9de26..8265c79 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 05de288..4db9f74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -1,11 +1,12 @@ > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >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 613098d..3a56cf5 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 754c200..15c77a6 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 74ff5f7..22d7b80 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"> >@@ -77,7 +79,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Vendor [% bookselname %]</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 df50898..dc4faa3 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 6e1ad43..677ee7c 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,6 +1,8 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > >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 27f3247..54141e8 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,12 +29,12 @@ > [% END -%] > > [% INCLUDE 'doc-head-open.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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" /> >+ <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> > [% END %] > <script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >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 3257fc5..ec7afbb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET KOHA_VERSION = Koha.Preference('Version') %] > [% USE Price %] > [% 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> >@@ -145,9 +147,9 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > //]]> > </script> > [% ELSIF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >- <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> >+ <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> > > <script type="text/javascript"> >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 c495205..9acf5e8 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,3 +1,5 @@ >+[% 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 %] >@@ -5,7 +7,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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 d3a5f20..645d145 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authorized values > [% IF op == 'add_form' %] >@@ -8,7 +9,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 1a335a2..161acc6 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,7 +1,8 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >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 8c66bed..9716b3e 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Libraries and groups > [% IF op == 'editcategory' %] >@@ -11,7 +12,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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"> >@@ -40,7 +41,7 @@ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% themelang %]/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/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index eb21abd..a59c691 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,8 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 99557a2..7ac36a9 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -6,7 +7,7 @@ > [% IF op == 'delete_' %]Confirm deletion of currency '[% searchfield %]'[% END %] > [% IF op == 'list' %]Currencies[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 1649702..ef82fba 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,4 @@ >-[% USE Koha %] >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE AuthorisedValues %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -21,8 +21,7 @@ Data deleted > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >-[% INCLUDE 'greybox.inc' %] >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 4213f49..a6ee9da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › > [% IF ( add_form ) %]MARC frameworks › [% action %] [% searchfield %][% END %] >@@ -5,7 +6,7 @@ > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> > >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 b95436f..3cad7b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -1,12 +1,12 @@ >-[% USE Koha %] >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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> >@@ -43,7 +43,7 @@ > > //]]> > </script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/humanmsg.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/humanmsg_[% KOHA_VERSION %].css" /> > <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> > <script src="[% themelang %]/js/ajax.js" type="text/javascript"></script> > <script src="[% themelang %]/js/pages/preferences.js" type="text/javascript"></script> >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 eca3be5..0d94d1e 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,4 @@ >-[% USE Koha %] >+[% 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 +6,7 @@ > [%# Add WYSIWYG editor for htmlarea system preferences %] > [% INCLUDE 'wysiwyg-systempreferences.inc' %] > [% IF ( else ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 8131083..c12b4f8 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > > [% BLOCK ServerType %] >@@ -15,7 +16,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > > [% IF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 7faf688..cedf581 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -1,3 +1,4 @@ >+[% 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' %] >@@ -152,9 +153,9 @@ function confirmnotdup(redirect){ > } > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index ff9095c..7c2a37f 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog › Your cart</title> > [% IF ( print_basket ) %] >@@ -10,7 +11,7 @@ > </style> > [% ELSE %][% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 e46428a..0846c5d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE KohaDates %] > [% USE AuthorisedValues %] >@@ -198,7 +199,7 @@ function verify_images() { > });[% END %] > //]]> > </script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> > [% INCLUDE 'browser-strings.inc' %] >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 bc1ffb9..ad45944 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE CGI %] > [% USE JSON.Escape %] > >@@ -159,10 +160,10 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Item search</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/itemsearchform.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 48310c1..58c2cef 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,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] > [% USE KohaDates %] > <title>Koha › Catalog › Search history</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >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 0d31c4b..e0c5fcd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title> >@@ -379,9 +380,9 @@ function Changefwk(FwkList) { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 1de8960..8b2a5c68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -1,8 +1,8 @@ > [% USE ColumnsSettings %] >- >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> >@@ -105,9 +105,9 @@ function confirm_deletion() { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index de1c781..20bca71 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,9 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 d66c007..b44a4d1 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,9 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 c4b41f3..8cfafdb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >@@ -17,7 +18,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'strings.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >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 919f0c3..6d7da7a 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [%- USE Branches -%] >@@ -7,7 +8,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <!-- Plugin datatables --> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/JavaScript"> > //<![CDATA[ >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 9bf6707..5656496 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF ( caller == 'hold-transfer' ) %] >@@ -12,7 +13,7 @@ > > <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="[% themelang %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 67f4226..37828c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -1,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Hold ratios</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 877be7c..9372e80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -1,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Transfers to your library</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 461a8da..89c99d2 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,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% USE Branches %] >@@ -7,7 +8,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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 5c871fe..b528d68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -1,9 +1,10 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 2284c17..3b64dac 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] > [% USE Branches %] >@@ -5,7 +6,7 @@ > <title>Koha › Course reserves › Course details for [% course.course_name %]</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 5d755fc..b32ea85 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,10 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 4dd38a1..c6cb247 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >@@ -1,3 +1,4 @@ >+[% 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> >@@ -5,7 +6,7 @@ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% themelang %]/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 +23,7 @@ tinyMCE.init({ > //]]> > </script> > [% INCLUDE intranetstylesheet.inc %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/help.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 be0e5aa..4d72a90 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -1,7 +1,7 @@ >-[% USE Koha %] >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha staff client</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> </style> > >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 355cfa4..408bd9e 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,10 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 4744d9b..3a2d8f0 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,9 +1,9 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Label creator</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/label.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/label_[% KOHA_VERSION %].css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 cadf54c..2744bdf 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% BLOCK translate_label_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%]layout >@@ -67,7 +68,7 @@ > //]]> > </script> > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index fabc07b..3f4b01a 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,10 @@ >+[% 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="[% themelang %]/css/spinelabel.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/spinelabel_[% KOHA_VERSION %].css" /> > > <style type="text/css"> > @media print { >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 f68027a..65f4159 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,7 +1,8 @@ >+[% 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="[% themelang %]/css/treeview/jquery.treeview.css"/> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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> > <!-- set up tree --> >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 ad360ec..5ccd733 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,11 @@ >-[% USE Koha %] >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index d7637ec..aafede7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >@@ -5,7 +6,7 @@ > <title>Summary for [% firstname %] [% surname %] ([% 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="[% themelang %]/css/print.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 c7d67a1..5dd3ad1 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,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% 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="[% themelang %]/css/print.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 a9ce12a..4404e62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE KohaDates %] > [% USE AuthorisedValues %] >@@ -15,7 +16,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'strings.inc' %] >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 6572e6c..bb99349 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -1,10 +1,10 @@ >-[% USE Koha %] >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE AuthorisedValues %] > [% USE KohaDates %] > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 d99c1a9..6d2e974 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -1,10 +1,11 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE KohaDates %] > [% 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="[% themelang %]/css/printreceiptinvoice.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 d5899d1..112a918 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) %] > [% USE Koha %] > [% 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="[% themelang %]/css/printreceiptinvoice.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 aebe665..5c44a03 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,8 +1,8 @@ >-[% USE Koha %] >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 0f3bbe9..03c5898 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE Koha %] > [% USE AuthorisedValues %] >@@ -5,7 +6,7 @@ > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 e39d87f..22fdb02 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -1,4 +1,4 @@ >-[% USE Koha %] >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › >@@ -9,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 947a29a..3c660d1 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,8 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index 27b68a7..cbf3a99 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,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists › [% list.name %] › Add patrons</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > > <script type="text/javascript" src="[% interface %]/js/autocomplete/patrons.js"></script> >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 2f9b7e3..1627d9e 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,9 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 05d3ca7..e7e016b 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,9 @@ >+[% 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="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/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 4d3c950..49d7efc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron card creator</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/card.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/card_[% KOHA_VERSION %].css" /> > </head> > <body id="pcard_home" class="tools pcard"> > [% INCLUDE 'header.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 1655d92..6da4c6b 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,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > > [%- BLOCK area_name -%] >@@ -33,7 +34,7 @@ > #sql { width: 90%; height: 9em;} > </style> > [% IF ( saved1 ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > [% END %] > >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 014d5aa..ad778c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE ItemTypes %] > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 6e7b8ab..cbb28d0 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,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -6,7 +7,7 @@ > <style type="text/css"> > .sql {display: none;} > </style> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 dd77a73..aa73467 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Branches %] > > [% INCLUDE 'doc-head-open.inc' %] >@@ -5,7 +6,7 @@ > <title>Koha › Serials › Claims</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 f4b6785..1df4c7e 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,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Branches %] > [% USE KohaDates %] > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > >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 be67cfa..642d972 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,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE KohaDates %] >@@ -5,7 +6,7 @@ > <title>Koha › Serials [% biblionumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 2332694..951c5e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE KohaDates %] >@@ -30,7 +31,7 @@ > </script> > [% END %] > [% IF ( op_else ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >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 01e9233..b9b760e 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,8 @@ >+[% 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 %]/en/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/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 b4dcebe..c89930a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -1,8 +1,9 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/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> >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 92d3137..405bc95 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,8 +1,9 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item deletion</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >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 38a76ce..5069488 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,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item modification</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> >@@ -39,7 +40,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="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio_[% KOHA_VERSION %].css" /> > </head> > <body id="tools_batchMod-edit" class="tools"> > [% INCLUDE 'header.inc' %] >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 4f77b04..43537f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -1,8 +1,9 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% branchname %] calendar</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 5143b3c..f0a7914 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -1,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Inventory</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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> >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 38a3598..4f36473 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,10 +1,11 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% 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="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { >@@ -29,7 +30,7 @@ tinyMCE.init({ > theme : "advanced", > convert_urls : false, > relative_urls : false, >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% themelang %]/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 1f7ad2b..28dd124 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -1,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.insertatcaret.js"></script> > <script type="text/javascript"> >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 f8cbdd0..687e859 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,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% BLOCK final_match_link %] > [% IF ( record.record_type == 'biblio' ) %] > <a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% record.final_match_id %]">[% record.final_match_id %]</a> >@@ -33,7 +34,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 3bd2bf5..c252077 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -1,9 +1,10 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE KohaDates %] > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/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 827cbd4..edaadc8 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,9 +1,10 @@ >+[% 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="[% themelang %]/css/uploader.css" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/quotes.css" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/uploader_[% KOHA_VERSION %].css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/quotes_[% KOHA_VERSION %].css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini.js"></script> > <script type="text/javascript"> >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 6f777d9..6d5d382 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,8 +1,9 @@ >+[% 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="[% themelang %]/css/quotes.css" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/quotes_[% KOHA_VERSION %].css" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.fnReloadAjax.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini.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 f33994c..6c1d0c0 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,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% SET KOHA_VERSION = Koha.Preference('Version') %] > </title> >@@ -6,15 +7,15 @@ > <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 %] >@@ -33,12 +34,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.css" /> >+ <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 %] > <link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" /> >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 6c17888..1871b20 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -27,10 +28,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> >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 5f5a836..6f26d7f 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) %] > [% USE Koha %] > [% 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; >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 061ceed..daea6e7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% 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 %] > >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..ff5e1bd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >@@ -1,12 +1,13 @@ >+[% 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]> >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..3002f14 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,9 @@ >+[% 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 3f0b1f3..4c1bed6 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,3 +1,4 @@ >+[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] > [% USE Koha %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -5,9 +6,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]> >-- >2.7.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12904
:
31514
|
31547
|
33287
|
33288
|
33295
|
33296
|
33297
|
33315
|
33317
|
33318
|
33319
|
33320
|
33321
|
33323
|
33324
|
33325
|
33326
|
33327
|
33328
|
48735
|
48736
|
48737
|
48738
|
48739
|
48740
|
48741
|
48742
|
49572
|
54484
|
54485
|
54488
|
54489
|
58378
|
58379
|
58392
|
58393
|
58394
|
58395
|
60826
|
60827
|
60830
|
60831
|
63692
|
63693
|
63694
|
63695
|
63696
|
70830
|
70831
|
70832
|
70833
|
70834
|
70835
|
71250
|
71251
|
71252
|
71253
|
71254
|
71255
|
71822