Bugzilla – Attachment 49787 Details for
Bug 10988
Allow login via Google OAuth2 (OpenID Connect)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10988: Tabs vs Spaces qa failure patch
Bug-10988-Tabs-vs-Spaces-qa-failure-patch.patch (text/plain), 2.75 KB, created by
Martin Renvoize (ashimema)
on 2016-04-01 13:57:13 UTC
(
hide
)
Description:
Bug 10988: Tabs vs Spaces qa failure patch
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2016-04-01 13:57:13 UTC
Size:
2.75 KB
patch
obsolete
>From 6bf8f058149521b3c43b58ec70110f480279b723 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Mon, 8 Feb 2016 17:54:12 -0500 >Subject: [PATCH] Bug 10988: Tabs vs Spaces qa failure patch > >Run Koha QA Test tools and discovered this failed because of tabs. >Rather than fail this and wait forever for it to get fixed, this >patches it, and I'll mark it as signed off anyways. > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > >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 ad327e6..a20490e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -137,17 +137,17 @@ > [% END %] > > [% END # / IF casAuthentication %] >- [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] >- [% IF ( invalidGoogleOpenIDConnectLogin ) %] >+ >+ [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] >+ [% IF ( invalidGoogleOpenIDConnectLogin ) %] > <h4>Google login</h4> > <p>Sorry, your Google login failed. <span class="error">[% invalidGoogleOpenIDConnectLogin %]</span></p> > <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p> > <p>If you want to, you can try to <a href="/cgi-bin/koha/svc/auth/googleopenidconnect?reauthenticate=select_account">log in using a different account</a> >- [% END %] >- <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-primary" id="openid_connect">Log in with Google</a> >- <p>If you don not have a Google account, but do have a local account, you can still l >-og in: </p> >- [% END %] >+ [% END %] >+ <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-primary" id="openid_connect">Log in with Google</a> >+ <p>If you do not have a Google account, but do have a local account, you can still log in: </p> >+ [% END %] > > <form action="/cgi-bin/koha/opac-user.pl" name="auth" id="auth" method="post"> > <input type="hidden" name="koha_login_context" value="opac" /> >-- >2.1.4
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 10988
:
21740
|
21936
|
21938
|
21939
|
25343
|
25570
|
25684
|
29594
|
29595
|
30014
|
30015
|
36354
|
36355
|
40087
|
40252
|
40442
|
40979
|
41663
|
43791
|
43792
|
43938
|
45667
|
45668
|
45895
|
46016
|
46473
|
46474
|
47780
|
47781
|
47782
|
49785
|
49786
| 49787