From 250212fb56c4fef0d82084fc148e42bd6e5adb6b Mon Sep 17 00:00:00 2001 From: David Cook Date: Fri, 24 Jun 2022 00:31:57 +0000 Subject: [PATCH] Bug 30988: Fix minor formatting issues Signed-off-by: David Cook --- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 4 +++- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 14 ++++++++------ .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 4 +++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index bafe4914ce..22fbb9b512 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -371,7 +371,9 @@

If you do not have a Google account, but do have a local account, you can still log in:

[% END # /IF GoogleOpenIDConnect %] [% IF ( Koha.Preference('OIDC') == 1 ) %] - Log in with [% Koha.Preference('OIDCProviderName') | html %] + [% END # /IF OIDC %] [% IF ( shibbolethAuthentication ) %] [% IF ( invalidShibLogin ) %] 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 023725d940..edd64b7cf8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -166,12 +166,14 @@

If you do not have a Google account, but do have a local account, you can still log in:

[% END # /IF GoogleOpenIDConnect %] [% IF ( Koha.Preference('OIDC') == 1 ) %] - [% IF ( invalidOIDCLogin ) %] -

OpenID login

-

Sorry, your login using [% Koha.Preference('OIDCProviderName') | html %] failed. [% invalidOIDCLogin | html %]

-

Please note that the login will only work if you are using the e-mail address registered with this library.

- [% END %] - Log in with [% Koha.Preference('OIDCProviderName') | html %] +
+ [% IF ( invalidOIDCLogin ) %] +

[% Koha.Preference('OIDCProviderName') | html %] login

+

Sorry, your login using [% Koha.Preference('OIDCProviderName') | html %] failed. [% invalidOIDCLogin | html %]

+

Please note that the login will only work if you are using the e-mail address registered with this library.

+ [% END %] + Log in with [% Koha.Preference('OIDCProviderName') | html %] +
[% END # /IF OIDC %] [% END # /UNLESS OPACShibOnly %] 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 ed05887bb2..15626e5aee 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -190,7 +190,9 @@

If you do not have a Google account, but do have a local account, you can still log in:

[% END # /IF GoogleOpenIDConnect %] [% IF ( Koha.Preference('OIDC') == 1 ) %] - Log in with [% Koha.Preference('OIDCProviderName') | html %] + [% END # /IF OIDC %] -- 2.30.2