From bd938e1d9f49f34f641d4ebcd88ef889ca683ca1 Mon Sep 17 00:00:00 2001 From: Josef Moravec 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 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit f1c150c98fb60ea75eae7d3b55adbcb7620b7519) Signed-off-by: Martin Renvoize --- .../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 %] - - - +[% 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 %] 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 %] - - - - - +[% 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 %] +[% Asset.js("lib/select2/js/select2.min.js") | $raw %] [% Asset.css("lib/select2/css/select2.min.css") | $raw %] [% Asset.css("css/select2.css") | $raw %] + [% Asset.js("js/onboarding.js") | $raw %] [% PROCESS 'password_check.inc' %] [% PROCESS 'add_password_check' new_password => 'password' %] [% END %] -- 2.39.5