From 587516c2efb697bf54a4dce73bf7ca1845febad7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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/columns_settings.inc | 2 +- .../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 | 4 +++- .../prog/en/modules/acqui/addorderiso2709.tt | 4 +++- 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 +++- .../prog/en/modules/acqui/invoice-files.tt | 4 +++- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 4 +++- .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 4 +++- .../prog/en/modules/acqui/neworderbiblio.tt | 4 +++- .../prog/en/modules/acqui/newordersubscription.tt | 4 +++- .../prog/en/modules/acqui/newordersuggestion.tt | 4 +++- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +++- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 4 +++- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 4 +++- .../prog/en/modules/acqui/uncertainprice.tt | 4 +++- .../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 ++- .../intranet-tmpl/prog/en/modules/admin/branches.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/admin/categorie.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 3 ++- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 3 ++- .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 3 ++- .../prog/en/modules/admin/marctagstructure.tt | 3 ++- .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 9 +++++---- .../prog/en/modules/admin/systempreferences.tt | 3 ++- .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 3 ++- .../prog/en/modules/authorities/authorities.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 3 ++- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 ++- .../prog/en/modules/catalogue/itemsearch.tt | 5 +++-- .../prog/en/modules/catalogue/search-history.tt | 3 ++- .../prog/en/modules/cataloguing/addbiblio.tt | 5 +++-- .../prog/en/modules/cataloguing/additem.tt | 7 ++++--- .../en/modules/cataloguing/value_builder/labs_theses.tt | 3 ++- .../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 ++- .../prog/en/modules/circ/pendingreserves.tt | 3 ++- .../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 ++- .../prog/en/modules/circ/view_holdsqueue.tt | 3 ++- .../prog/en/modules/circ/waitingreserves.tt | 3 ++- .../prog/en/modules/course_reserves/course-details.tt | 3 ++- .../prog/en/modules/course_reserves/course-reserves.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 3 ++- .../prog/en/modules/labels/label-edit-batch.tt | 3 ++- .../intranet-tmpl/prog/en/modules/labels/label-home.tt | 4 ++-- .../prog/en/modules/labels/label-manage.tt | 3 ++- .../prog/en/modules/labels/spinelabel-print.tt | 3 ++- .../prog/en/modules/members/member-flags.tt | 3 ++- .../intranet-tmpl/prog/en/modules/members/member.tt | 3 ++- .../prog/en/modules/members/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 | 3 ++- .../prog/en/modules/members/printfeercpt.tt | 3 ++- .../prog/en/modules/members/printinvoice.tt | 3 ++- .../prog/en/modules/members/purchase-suggestions.tt | 3 ++- .../intranet-tmpl/prog/en/modules/members/readingrec.tt | 3 ++- .../intranet-tmpl/prog/en/modules/members/statistics.tt | 3 ++- .../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 ++- .../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 ++- .../prog/en/modules/tools/batchMod-edit.tt | 5 +++-- .../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 ++- .../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 ++- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 7 ++++--- .../opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 7 ++++--- 105 files changed, 260 insertions(+), 139 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/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index 7647393..24e9b0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -2,7 +2,7 @@ [% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE ColumnsSettings %] - + @@ -19,7 +19,7 @@ [% IF ( login ) %] - + [% 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 4a0a8ba..3cf2c83 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 @@ Online help - - + + [% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %] - + [% END %] @@ -16,6 +16,6 @@ - + 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 3c1df10..2710974 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,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE Price %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] 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 056a92a..b59fe13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %] - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] 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 3bb7fcb..f4cce68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %] - + [% 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 08ca3cd..26121c1 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' %] Koha › Acquisitions › Invoice › Files - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.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 c466cd1..8d27528 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' %] Koha › Acquisitions › Search existing records - + [% INCLUDE 'greybox.inc' %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] 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 18cfdec..985a6d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Serials [% biblionumber %] - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] 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 5e73a24..7d8b110 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' %] Koha › Acquisitions › Receive shipment from vendor [% name %] - + [% 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 dbc69d6..1219db8 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' %] Koha › Acquisitions › Spent - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] [% END %] 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 b97d0d8..7ee4bc4 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' %] Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %] @@ -144,9 +146,9 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") //]]> [% ELSIF op == 'list' %] - + [% INCLUDE 'datatables.inc' %] - + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 2d27d83..46991c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -1,9 +1,10 @@ +[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] [% INCLUDE 'doc-head-open.inc' %] 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 %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( else ) %] - + [% INCLUDE 'datatables.inc' %] - + [% IF ( bidi ) %] - + [% END %] 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 5a3d22e..d0eb414 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog › Your cart [% IF ( print_basket ) %] @@ -10,7 +11,7 @@ [% ELSE %][% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'datatables.inc' %] [% 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 57d605e..aa00842 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 %] @@ -132,10 +133,10 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › Item search [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + - + [% IF ( bidi ) %] - + [% END %] 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 85a4486..62bb51e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -1,6 +1,7 @@ +[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -101,9 +102,9 @@ $(document).ready(function() { }); //]]> - + [% IF ( bidi ) %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt index 2162747..40cba21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt @@ -1,3 +1,4 @@ +[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] [% INCLUDE 'doc-head-open.inc' %] Koha › Labs thesis selection plugin [% INCLUDE 'doc-head-close.inc' %] @@ -13,7 +14,7 @@ function Help() { //]]> - + 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 6666537..14a756d 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' %] Koha › Tools › Labels › Manage label batches [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'greybox.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'datatables.inc' %] 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 2d302c4..b300f6f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -1,7 +1,8 @@ +[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons [% IF ( searching ) %]› Search results[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.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 31d40ba..8366da9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -1,8 +1,9 @@ +[% USE Koha %]\[% SET KOHA_VERSION = Koha.Preference(Version) %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Sent notices for [% INCLUDE 'patron-title.inc' %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] 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 561e032..4e777d7 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 @@ Koha › Serials [% biblionumber %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - + [% INCLUDE 'datatables.inc' %] [% END %] [% IF ( op_else ) %] - + [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index 71cc9af..b442831 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' %] Koha › Tools › Batch item deletion [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] 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 ab9c2de..8aae411 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' %] Koha › Tools › Batch item modification [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] @@ -39,7 +40,7 @@ $(document).ready(function(){ - + [% 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 57193a5..f982fcd 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' %] Koha › Tools › [% branchname %] calendar [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - + [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index 5671c7b..fe11f3f 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' %] Koha › Tools › News [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] [% IF ( opac_news_count ) %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'datatables.inc' %] 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 a70adcb..d406414 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') %] @@ -6,15 +7,15 @@ [% IF ( bidi ) %] - + [% ELSE %] - + [% END %] [% IF ( bidi ) %] - + [% ELSE %] - + [% END %] [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] @@ -33,12 +34,12 @@ [% IF ( opac_css_override ) %] [% END %] - + [% IF persona %] - + [% END %] [% IF ( bidi ) %] - + [% END %] [% IF ( OPACUserCSS ) %][% END %] 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 e641d76..cad61a5 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 %] @@ -26,10 +27,10 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( bidi ) %] - [% BLOCK cssinclude %][% END %] + [% BLOCK cssinclude %][% END %] [% END %] [% IF ( OpacStarRatings != 'disable' ) %] - [% BLOCK cssinclude %][% END %] + [% BLOCK cssinclude %][% END %] [% END %] [% INCLUDE 'bodytag.inc' bodyid='opac-detail' bodyclass='scrollto' %] 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 c214297..e4b94dd 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]' [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] - + [% END %] [% IF ( SCOUserCSS ) %][% END %] - - - + + + [% IF ( OPACUserCSS ) %][% END %] [% IF ( SCOUserCSS ) %][% END %]