From 2fcf3d8eab46d66c4df01d4dc7fe68b9a9fc8fdd 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/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 @@ - - + + - + [% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %] - + [% END %] [% IF ( IntranetUserCSS ) %][% END %] @@ -23,7 +23,7 @@ [% IF ( login ) %] - + [% END %] [% IF ( IntranetUserCSS ) %][% 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 @@ 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 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' %] Koha › Acquisitions 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' %] Koha › Acquisitions › Order staged MARC records @@ -7,8 +9,7 @@ › Batch list [% END %] - - + [% 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 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' %] Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% 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 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' %] 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 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' %] Koha › Acquisitions › Invoice › Files - + [% 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 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' %] 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 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' %] 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 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' %] Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %] @@ -145,9 +147,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/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' %] Koha › Administration › System preferences [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% IF ( bidi ) %] - + [% END %] @@ -43,7 +43,7 @@ //]]> - + 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' %] 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 %] @@ -6,7 +6,7 @@ [%# Add WYSIWYG editor for htmlarea system preferences %] [% INCLUDE 'wysiwyg-systempreferences.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 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' %] [% 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 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' %] 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 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' %] Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -105,9 +105,9 @@ function confirm_deletion() { //]]> - + [% IF ( bidi ) %] - + [% END %] 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' %] Koha › Z39.50 search results [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'datatables.inc' %] @@ -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({ //]]> [% INCLUDE intranetstylesheet.inc %] - +

Online Help

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' %] Koha staff client - + [% INCLUDE 'doc-head-close.inc' %] 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' %] Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %] [% 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 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' %] Koha › Patrons [% IF ( searching ) %]› Search results[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] 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' %] Koha › Tools › Patron lists [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'greybox.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 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 @@ 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 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' %] 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 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' %] 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 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' %] 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 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' %] 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 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') %] @@ -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 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 @@ [% 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 %] [% 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 greybox.inc %] 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' %] [% 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 %]