From fa2cdaf444dd3eb2702b314ffeefff6aaa9d40c2 Mon Sep 17 00:00:00 2001 From: Hayley Mapley Date: Thu, 18 Apr 2019 10:01:58 +1200 Subject: [PATCH] Bug 18308: Changed templates to use Asset plugin rather than full path Test plan: Same as before Sponsored-by: Catalyst IT --- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt | 6 ++++-- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt | 4 +++- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt | 4 +++- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt | 4 +++- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep8.tt | 4 +++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt index 4f7643c083..e5d8047033 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -1,5 +1,7 @@ [% USE Koha %] [% USE KohaDates %] +[% USE raw %] +[% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › Add a patron category [%# The following if statement checks if the categories variable handed to this template %] @@ -129,7 +131,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] - + [% Asset.js("js/onboarding.js") | $raw %]> [% END %] -[% INCLUDE 'installer-intranet-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'installer-intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt index e5ade1f501..b75e013110 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -1,4 +1,6 @@ [% USE Koha %] +[% USE raw %] +[% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › Create Koha administrator patron [% INCLUDE 'installer-doc-head-close.inc' %] @@ -113,7 +115,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] - + [% Asset.js("js/onboarding.js") | $raw %] [% PROCESS 'password_check.inc' %] [% PROCESS 'add_password_check' new_password => 'password' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt index a024db23c6..65d9bfbfeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -1,3 +1,5 @@ +[% USE raw %] +[% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › Create a new item type [% INCLUDE 'installer-doc-head-close.inc' %] @@ -49,7 +51,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] - + [% Asset.js("js/onboarding.js") | $raw %] [% END %] [% INCLUDE 'installer-intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt index 8abdf21dbd..bbdc7f7d8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt @@ -1,3 +1,5 @@ +[% USE raw %] +[% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › [% IF all_done %] @@ -134,7 +136,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] - <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script> + [% Asset.js("js/onboarding.js") | $raw %] [% END %] [% INCLUDE 'installer-intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep8.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep8.tt index 680be3a0a2..fc18ae8497 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep8.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep8.tt @@ -1,3 +1,5 @@ +[% USE raw %] +[% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Web installer › [% IF all_done %] @@ -134,7 +136,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] - <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script> + [% Asset.js("js/onboarding.js") | $raw %] [% END %] [% INCLUDE 'installer-intranet-bottom.inc' %] -- 2.11.0