View | Details | Raw Unified | Return to bug 29006
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+12 lines)
Lines 2656-2659 $star-selected: #EDB867; Link Here
2656
    margin-bottom: 1rem;
2656
    margin-bottom: 1rem;
2657
}
2657
}
2658
2658
2659
#openid_connect {
2660
    background-color: #fff;
2661
    border: 1px solid #AAA;
2662
    box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2);
2663
    margin: .5em 0;
2664
2665
    i {
2666
        color: #b53329;
2667
        margin: 0 .5em;
2668
    }
2669
}
2670
2659
@import "responsive";
2671
@import "responsive";
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +5 lines)
Lines 99-105 Link Here
99
                                    [%# CAS authentication is too complicated for modal window %]
99
                                    [%# CAS authentication is too complicated for modal window %]
100
                                        <a class="nav-link login-link" href="/cgi-bin/koha/opac-user.pl"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>
100
                                        <a class="nav-link login-link" href="/cgi-bin/koha/opac-user.pl"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>
101
                                [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
101
                                [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
102
                                    <a class="nav-link login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>
102
                                    <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="nav-link login-link loginModal-trigger"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>
103
                                [% ELSE %]
103
                                [% ELSE %]
104
                                    <a href="/cgi-bin/koha/opac-user.pl" class="nav-link login-link loginModal-trigger"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>
104
                                    <a href="/cgi-bin/koha/opac-user.pl" class="nav-link login-link loginModal-trigger"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>
105
                                [% END %]
105
                                [% END %]
Lines 371-376 Link Here
371
                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
371
                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
372
                    <input type="hidden" name="has-search-query" id="has-search-query" value="" />
372
                    <input type="hidden" name="has-search-query" id="has-search-query" value="" />
373
                    <div class="modal-body">
373
                    <div class="modal-body">
374
                        [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
375
                            <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa fa-google" aria-hidden="true"></i> Log in with Google</a>
376
                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
377
                        [% END # /IF GoogleOpenIDConnect %]
374
                        [% IF ( shibbolethAuthentication ) %]
378
                        [% IF ( shibbolethAuthentication ) %]
375
                            [% IF ( invalidShibLogin ) %]
379
                            [% IF ( invalidShibLogin ) %]
376
                                <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
380
                                <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-1 / +1 lines)
Lines 162-168 Link Here
162
                                    <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p>
162
                                    <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p>
163
                                    <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>
163
                                    <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>
164
                                [% END %]
164
                                [% END %]
165
                                <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-primary" id="openid_connect">Log in with Google</a>
165
                                <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa fa-google" aria-hidden="true"></i> Log in with Google</a>
166
                                <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
166
                                <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
167
                            [% END # /IF GoogleOpenIDConnect %]
167
                            [% END # /IF GoogleOpenIDConnect %]
168
                        [% END # /UNLESS OPACShibOnly %]
168
                        [% END # /UNLESS OPACShibOnly %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +4 lines)
Lines 183-188 Link Here
183
                                    <input type="hidden" name="koha_login_context" value="opac" />
183
                                    <input type="hidden" name="koha_login_context" value="opac" />
184
                                    <fieldset class="brief">
184
                                    <fieldset class="brief">
185
                                        <legend>Log in to your account:</legend>
185
                                        <legend>Log in to your account:</legend>
186
                                        [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
187
                                            <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa fa-google" aria-hidden="true"></i> Log in with Google</a>
188
                                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
189
                                        [% END # /IF GoogleOpenIDConnect %]
186
                                        <label for="userid">Login:</label>
190
                                        <label for="userid">Login:</label>
187
                                        <input class="form-control" type="text" id="userid" name="userid" />
191
                                        <input class="form-control" type="text" id="userid" name="userid" />
188
                                        <label for="password">Password:</label>
192
                                        <label for="password">Password:</label>
189
- 

Return to bug 29006