Attachment 86117 Details for Bug 22451 – Bug 22451: Use Asset everywhere

[patch] Bug 22451: Use Asset everywhere

Bug-22451-Use-Asset-everywhere.patch (text/plain), 4.60 KB, created by Josef Moravec on 2019-03-05 19:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-03-05 19:30:19 UTC

Size: 4.60 KB

patch

obsolete

>From 076df4b32b95239f7d38be628a1d3e85d66d04c2 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
>---
> .../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 cf4dd76..3c1a5f4 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 163e736..42ab14e 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 13db6fb..3354200 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 eed7068..63314b6 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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 22451: 86034 | 86035 | 86036 | 86115 | 86116 | 86117 | 87821 | 87822 | 87823 | 87897 | 87899 | 87900