From a2f957c861fd845314e8844fca9634810b9ca046 Mon Sep 17 00:00:00 2001 From: Hayley Mapley Date: Tue, 9 Apr 2019 10:42:09 +1200 Subject: [PATCH] Bug 18308: Fixed issues with onboarding_messages.inc and onboardingstep6.tt Sponsored-by: Catalyst IT Signed-off-by: Liz Rea --- .../intranet-tmpl/prog/en/includes/onboarding_messages.inc | 2 +- .../prog/en/modules/onboarding/onboardingstep6.tt | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc index e50e2cdba0..4e44ef4c71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc @@ -32,10 +32,10 @@
The patron has not been created the entered password was too weak, must contain at least one uppercase, and lower case letter and one number
[% CASE 'ERROR_password_has_whitespaces' %]
The patron has not been created the entered password contained whitespaces
- [% CASE %][% message | html %] [% CASE 'success_on_update_minPasswordLength_syspref' %]
Minimum password length set!
[% CASE 'error_on_update_minPasswordLength_syspref' %]
Minimum password length not set!
+ [% CASE %][% message | html %] [% END %] [% END %] 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 f88dbaa6fa..19f945b854 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt @@ -3,13 +3,10 @@ [% IF all_done %] Complete [% ELSE %] - Create circulation rule + Set minPasswordLength system preference [% END %] [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'validator-strings.inc' %] -[% INCLUDE 'installer-strings.inc' %] - @@ -50,5 +47,12 @@ [% END %] + -[% INCLUDE 'intranet-bottom.inc' %] +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'validator-strings.inc' %] + [% INCLUDE 'installer-strings.inc' %] + +[% END %] + +[% INCLUDE 'installer-intranet-bottom.inc' %] -- 2.11.0