Bugzilla – Attachment 137232 Details for
Bug 30988
Add generic OpenIDConnect client implementation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30988: Fix minor formatting issues
Bug-30988-Fix-minor-formatting-issues.patch (text/plain), 5.08 KB, created by
Shi Yao Wang
on 2022-07-06 15:41:17 UTC
(
hide
)
Description:
Bug 30988: Fix minor formatting issues
Filename:
MIME Type:
Creator:
Shi Yao Wang
Created:
2022-07-06 15:41:17 UTC
Size:
5.08 KB
patch
obsolete
>From 13f73cf37e7959e4e873a265911bbf0b6e1dcb94 Mon Sep 17 00:00:00 2001 >From: David Cook <dcook@prosentient.com.au> >Date: Fri, 24 Jun 2022 00:31:57 +0000 >Subject: [PATCH] Bug 30988: Fix minor formatting issues > >Signed-off-by: David Cook <dcook@prosentient.com.au> >--- > .../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 f47ad5836e..67766252b1 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 @@ > <p>If you do not have a Google account, but do have a local account, you can still log in: </p> > [% END # /IF GoogleOpenIDConnect %] > [% IF ( Koha.Preference('OIDC') == 1 ) %] >- <a href="/cgi-bin/koha/svc/auth/openidconnect" class="btn btn-light" id="oidc">Log in with [% Koha.Preference('OIDCProviderName') | html %]</a> >+ <div class="oidc-generic"> >+ <a href="/cgi-bin/koha/svc/auth/openidconnect" class="btn btn-light" id="oidc">Log in with [% Koha.Preference('OIDCProviderName') | html %]</a> >+ </div> > [% 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 2c9f5f7828..d7bf888a04 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 @@ > <p>If you do not have a Google account, but do have a local account, you can still log in: </p> > [% END # /IF GoogleOpenIDConnect %] > [% IF ( Koha.Preference('OIDC') == 1 ) %] >- [% IF ( invalidOIDCLogin ) %] >- <h2>OpenID login</h2> >- <p>Sorry, your login using [% Koha.Preference('OIDCProviderName') | html %] failed. <span class="error">[% invalidOIDCLogin | html %]</span></p> >- <p>Please note that the login will only work if you are using the e-mail address registered with this library.</p> >- [% END %] >- <a href="/cgi-bin/koha/svc/auth/openidconnect" class="btn btn-light" id="oidc">Log in with [% Koha.Preference('OIDCProviderName') | html %]</a> >+ <div class="oidc-generic"> >+ [% IF ( invalidOIDCLogin ) %] >+ <h2>[% Koha.Preference('OIDCProviderName') | html %] login</h2> >+ <p>Sorry, your login using [% Koha.Preference('OIDCProviderName') | html %] failed. <span class="error">[% invalidOIDCLogin | html %]</span></p> >+ <p>Please note that the login will only work if you are using the e-mail address registered with this library.</p> >+ [% END %] >+ <a href="/cgi-bin/koha/svc/auth/openidconnect" class="btn btn-light" id="oidc">Log in with [% Koha.Preference('OIDCProviderName') | html %]</a> >+ </div> > [% 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 e3c82d7322..fbc026e5b6 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 @@ > <p>If you do not have a Google account, but do have a local account, you can still log in: </p> > [% END # /IF GoogleOpenIDConnect %] > [% IF ( Koha.Preference('OIDC') == 1 ) %] >- <a href="/cgi-bin/koha/svc/auth/openidconnect" class="btn btn-light" id="oidc">Log in with [% Koha.Preference('OIDCProviderName') | html %]</a> >+ <div class="oidc-generic"> >+ <a href="/cgi-bin/koha/svc/auth/openidconnect" class="btn btn-light" id="oidc">Log in with [% Koha.Preference('OIDCProviderName') | html %]</a> >+ </div> > [% END # /IF OIDC %] > <div class="local-login"> > <label for="userid">Login:</label> >-- >2.25.1
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 30988
:
136301
|
136302
|
136382
|
136396
|
136397
|
136403
|
136430
|
136431
|
136450
|
136451
|
136467
|
136468
|
136469
|
137230
|
137231
| 137232