From d72371ef8a43e0ead8ec51840ec54c4a6762b7a1 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Thu, 14 May 2015 10:54:28 +1200 Subject: [PATCH] Bug 8753 - followup - update text for link to match common UI paradigms, fixes OpacPublic disabled view Also corrects OpacNav being included on the reset page on private catalogues. Updated the link for forgotten passwords to more closely match common UI paradigms, i.e. Facebook and Twitter To test: apply all patches, link should now be the less verbose "Forgot your password?" disable OpacPublic, anything in opacnav should not appear (you may need to add something to opacnav to test properly) --- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt | 5 ++++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 635bb87..7571529 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -304,8 +304,7 @@ [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
-
Forgot your password?
-

If you do not remember your password, click here to create a new one.

+ Forgot your password?
[% END %] [% IF Koha.Preference( 'NoLoginInstructions' ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt index f3cd7b0..51bbab3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -152,8 +152,7 @@ [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
-
Forgot your password?
-

If you do not remember your password, click here to create a new one.

+ Forgot your password?
[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index 9dd76b2..dac6686 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -86,8 +86,7 @@ [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
-
Forgot your password?
-

If you do not remember your password, click here to create a new one.

+ Forgot your password?
[% END %] [% IF Koha.Preference( 'NoLoginInstructions' ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt index 8eedb7d..0161bd3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt @@ -36,9 +36,12 @@
+ [% IF ( OpacPublic ) %] + + [% END %]

Password recovery

@@ -131,4 +134,4 @@
-[% INCLUDE 'opac-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'opac-bottom.inc' %] -- 1.9.1