From da652086c457eeebf49b33da4f538a510fa3a033 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 10 Sep 2014 11:55:44 -0400 Subject: [PATCH] Bug 12904 - Force browser to load new javascript files after upgrade A common issue with Koha seems to be that the web browsers continue to use cached js files after an upgrade. If we append the version as a parameter, we can force the browser to update the javascript files. Test Plan: 1) Apply this patch 2) Note that all javascript continues to function properly --- .../prog/en/includes/columns_settings.inc | 4 +- .../intranet-tmpl/prog/en/includes/datatables.inc | 6 ++- .../prog/en/includes/doc-head-close.inc | 22 ++++++----- .../intranet-tmpl/prog/en/includes/file-upload.inc | 4 +- .../intranet-tmpl/prog/en/includes/greybox.inc | 8 ++- .../intranet-tmpl/prog/en/includes/help-top.inc | 18 +++++---- .../opac-tmpl/bootstrap/en/includes/datatables.inc | 6 ++- .../bootstrap/en/includes/doc-head-close.inc | 8 ++- .../bootstrap/en/includes/opac-bottom.inc | 40 ++++++++++--------- 9 files changed, 67 insertions(+), 49 deletions(-) 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 87d9da6..0a3dded 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE ColumnsSettings %] - + +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] + - + 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 f6269de..fed1473 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] @@ -8,20 +10,20 @@ [% END %] [% IF ( IntranetUserCSS ) %][% END %] - - - - - - - + + + + + + + [% IF ( login ) %] [% END %] - + [% INCLUDE 'validator-strings.inc' %] [% IF ( intranetuserjs ) %] - + [% END %] [% IF LocalCoverImages %] - + + - - - + + + 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 5dcbe27..bf1d957 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Online Help @@ -8,16 +10,16 @@ [% IF ( bidi ) %] [% END %] - - - + + + - - - - + + + + - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc index d3075c9..3379bab 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc @@ -1,4 +1,6 @@ - +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] + - \ No newline at end of file + 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 c3e2d83..6d4d2b4 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,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] @@ -41,11 +43,11 @@ [% IF ( OPACUserCSS ) %][% END %] [% PROCESS cssinclude %] - + - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 4128061..4d9590d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% UNLESS ( is_popup ) %] [% IF ( opaccredits ) %]
@@ -75,24 +77,24 @@ - - + + - - + + [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %] @@ -100,11 +102,11 @@ $.widget.bridge('uitooltip', $.ui.tooltip); var NO_AMAZON_IMAGE = _("No cover image available"); //]]> - + [% END %] -[% IF Koha.Preference( 'opacbookbag' ) == 1 %] @@ -154,15 +156,15 @@ $.widget.bridge('uitooltip', $.ui.tooltip); //]]> [% IF Koha.Preference( 'opacbookbag' ) == 1 %] - + [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %] - + [% ELSE %] [% END %] -[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %] +[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - + [% END %] [% IF OpenLibraryCovers %] - + + + - + [% END %] [% IF persona %] - +