gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 f1c150c98f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Josef Moravec 2019-02-26 13:54:28 +00:00 committed by Martin Renvoize
parent ddd6d66f09
commit bd938e1d9f
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
View File

@ -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>

11
koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
View File

@ -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 -%]

2
koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
View File

@ -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>

4
koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
View File

@ -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 %]