From bd938e1d9f49f34f641d4ebcd88ef889ca683ca1 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Tue, 26 Feb 2019 13:54:28 +0000
Subject: [PATCH] Bug 22451: Use Asset everywhere

Test plan:
Use installer and onboaarding tool, make sure the js and css files are
loaded

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f1c150c98fb60ea75eae7d3b55adbcb7620b7519)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/includes/installer-doc-head-close.inc     |  8 +++++---
 .../prog/en/includes/installer-intranet-bottom.inc    | 11 ++++++-----
 koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc  |  2 +-
 .../prog/en/modules/onboarding/onboardingstep3.tt     |  4 +++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
index cf4dd76b48..3c1a5f4659 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
@@ -1,6 +1,8 @@
+[% USE raw %]
+[% USE Asset %]
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.css" />
-<link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/bootstrap/bootstrap.min.css" />
-<link rel="stylesheet" type="text/css" href="[% interface | html %]/[% theme | html %]/css/installer.css" />
+[% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") | $raw %]
+[% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %]
+[% Asset.css("css/installer.css")  | $raw %]
 <style id="antiClickjack">body{display:none !important;}</style>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
index 163e736e3a..42ab14efdc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
@@ -1,9 +1,10 @@
 [% USE raw %]
-        <script src="[% interface | html %]/lib/jquery/jquery-2.2.3.min.js"></script>
-        <script src="[% interface | html %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
-        <script src="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
-        <script src="[% interface | html %]/lib/bootstrap/bootstrap.min.js"></script>
-        <script src="[% interface | html %]/lib/jquery/plugins/jquery.validate.min.js"></script>
+[% USE Asset %]
+        [% Asset.js("lib/jquery/jquery-2.2.3.min.js") | $raw %]
+        [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") | $raw %]
+        [% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %]
+        [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
+        [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
         <script>
             function _(s) { return s } // dummy function for gettext
             [%# Prevent XFS attacks -%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
index 13db6fbc90..335420070d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
@@ -1,6 +1,6 @@
 [% USE raw %]
 [% USE Asset %]
-<script src="[% interface | html %]/lib/select2/js/select2.min.js"></script>
+[% Asset.js("lib/select2/js/select2.min.js") | $raw %]
 [% Asset.css("lib/select2/css/select2.min.css") | $raw %]
 [% Asset.css("css/select2.css") | $raw %]
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
index eed7068f05..63314b6fa8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
@@ -1,4 +1,6 @@
 [% USE Koha %]
+[% USE raw %]
+[% USE Asset %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Web installer &rsaquo; Create Koha administrator patron</title>
 [% INCLUDE 'installer-doc-head-close.inc' %]
@@ -113,7 +115,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 %]
     [% PROCESS 'password_check.inc' %]
     [% PROCESS 'add_password_check' new_password => 'password' %]
 [% END %]
-- 
2.39.5