Bugzilla – Attachment 88319 Details for
Bug 18308
Default value of minPasswordLength should be increased
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18308: Changed templates to use Asset plugin rather than full path
Bug-18308-Changed-templates-to-use-Asset-plugin-ra.patch (text/plain), 5.21 KB, created by
Liz Rea
on 2019-04-18 15:52:21 UTC
(
hide
)
Description:
Bug 18308: Changed templates to use Asset plugin rather than full path
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2019-04-18 15:52:21 UTC
Size:
5.21 KB
patch
obsolete
>From eba893bac7795e0d78b290c4d94cc472fb6319ab Mon Sep 17 00:00:00 2001 >From: Hayley Mapley <hayleymapley@catalyst.net.nz> >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 > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >--- > .../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' %] > <title>Koha › Web installer › Add a patron category</title> > [%# 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' %] >- <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script> >+ [% 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' %] > <title>Koha › Web installer › 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 %] >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' %] > <title>Koha › Web installer › Create a new item type </title> > [% INCLUDE 'installer-doc-head-close.inc' %] >@@ -49,7 +51,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/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' %] > <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' %] >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18308
:
68374
|
68381
|
68451
|
69318
|
69319
|
69320
|
69321
|
69323
|
69324
|
69459
|
69461
|
69462
|
87124
|
87125
|
87126
|
87128
|
87129
|
87339
|
87340
|
87564
|
87572
|
87573
|
87747
|
87959
|
87960
|
87961
|
87962
|
87963
|
87964
|
87966
|
88010
|
88011
|
88012
|
88013
|
88014
|
88242
|
88243
|
88306
|
88307
|
88308
|
88309
|
88310
|
88311
|
88312
|
88313
|
88314
|
88315
|
88316
|
88317
|
88318
|
88319
|
88320
|
88321
|
88840
|
90079
|
103617
|
104235
|
104236
|
104351