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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (+18 lines)
Lines 2-7 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE Categories %]
4
[% USE Categories %]
5
[% USE AuthClient %]
5
[% USE AdditionalContents %]
6
[% USE AdditionalContents %]
6
[% PROCESS 'html_helpers.inc' %]
7
[% PROCESS 'html_helpers.inc' %]
7
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
8
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
Lines 384-389 Link Here
384
                            [% END %]
385
                            [% END %]
385
                        [% END %]
386
                        [% END %]
386
                        [% UNLESS Koha.Preference('opacShibOnly') %]
387
                        [% UNLESS Koha.Preference('opacShibOnly') %]
388
                            [% SET auth_providers = AuthClient.get_providers('opac') %]
389
                            [% IF ( ! auth_providers.empty ) %]
390
                                [% FOREACH provider IN auth_providers %]
391
                                    <p class="clearfix">
392
                                        <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
393
                                            [% IF provider.icon_url %]
394
                                            <img src="[% provider.icon_url | url %]" />
395
                                            [% ELSE %]
396
                                            <i class="fa fa-user" aria-hidden="true"></i>
397
                                            [% END %]
398
                                            Log in with [% provider.description | html %]
399
                                        </a>
400
                                    </p>
401
                                [% END %]
402
                                <hr/>
403
                                <p>If you do not have an external account, but do have a local account, you can still log in: </p>
404
                            [% END # /IF  auth_providers.size %]
387
                            <input type="hidden" name="koha_login_context" value="opac" />
405
                            <input type="hidden" name="koha_login_context" value="opac" />
388
                            <fieldset class="brief">
406
                            <fieldset class="brief">
389
                                <div class="local-login">
407
                                <div class="local-login">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (+26 lines)
Lines 2-7 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Categories %]
3
[% USE Categories %]
4
[% USE AdditionalContents %]
4
[% USE AdditionalContents %]
5
[% USE AuthClient %]
5
[% PROCESS 'html_helpers.inc' %]
6
[% PROCESS 'html_helpers.inc' %]
6
[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode || default_branch ) %]
7
[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode || default_branch ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
Lines 76-81 Link Here
76
                                </div>
77
                                </div>
77
                            [% END %]
78
                            [% END %]
78
79
80
                            [% IF auth_error %]
81
                                <div class="alert alert-info">
82
                                    <p>There was an error authenticating to external identity provider</p>
83
                                    <p>[% auth_error | html %]</p>
84
                                </div>
85
                            [% END %]
86
79
                            [% IF ( shibbolethAuthentication ) %]
87
                            [% IF ( shibbolethAuthentication ) %]
80
                                [% IF ( invalidShibLogin ) %]
88
                                [% IF ( invalidShibLogin ) %]
81
                                    <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
89
                                    <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
Lines 155-160 Link Here
155
163
156
                            [% END # / IF casAuthentication %]
164
                            [% END # / IF casAuthentication %]
157
165
166
                            [% SET auth_providers = AuthClient.get_providers('opac') %]
167
                            [% IF ( ! auth_providers.empty ) %]
168
                                [% FOREACH provider IN auth_providers %]
169
                                    <p class="clearfix">
170
                                        <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
171
                                            [% IF provider.icon_url %]
172
                                                <img src="[% provider.icon_url | url %]" style="max-height: 20px; max-width: 20px;"/>
173
                                            [% ELSE %]
174
                                            <i class="fa fa-user" aria-hidden="true"></i>
175
                                            [% END %]
176
                                            Log in with [% provider.description | html %]
177
                                        </a>
178
                                    </p>
179
                                [% END %]
180
                                <hr/>
181
                                <p>If you do not have an external account, but do have a local account, you can still log in: </p>
182
                            [% END # /IF  auth_providers %]
183
158
                            [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
184
                            [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
159
                                [% IF ( invalidGoogleOpenIDConnectLogin ) %]
185
                                [% IF ( invalidGoogleOpenIDConnectLogin ) %]
160
                                    <h2>Google login</h2>
186
                                    <h2>Google login</h2>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +18 lines)
Lines 5-10 Link Here
5
[% USE Categories %]
5
[% USE Categories %]
6
[% USE Price %]
6
[% USE Price %]
7
[% USE AdditionalContents %]
7
[% USE AdditionalContents %]
8
[% USE AuthClient %]
8
[% PROCESS 'i18n.inc' %]
9
[% PROCESS 'i18n.inc' %]
9
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
10
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
10
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
11
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
Lines 191-196 Link Here
191
                                            <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>
192
                                            <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>
192
                                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
193
                                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
193
                                        [% END # /IF GoogleOpenIDConnect %]
194
                                        [% END # /IF GoogleOpenIDConnect %]
195
                                        [% SET auth_providers = AuthClient.get_providers('opac') %]
196
                                        [% IF ( ! auth_providers.empty ) %]
197
                                            [% FOREACH provider IN auth_providers %]
198
                                                <p class="clearfix">
199
                                                    <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
200
                                                        [% IF provider.icon_url %]
201
                                                        <img src="[% provider.icon_url | url %]"  style="max-height: 20px; max-width: 20px;"/>
202
                                                        [% ELSE %]
203
                                                        <i class="fa fa-user" aria-hidden="true"></i>
204
                                                        [% END %]
205
                                                        Log in with [% provider.description | html %]
206
                                                    </a>
207
                                                </p>
208
                                            [% END %]
209
                                            <hr/>
210
                                            <p>If you do not have an external account, but do have a local account, you can still log in: </p>
211
                                        [% END # /IF  auth_providers.size %]
194
                                        <div class="local-login">
212
                                        <div class="local-login">
195
                                            <label for="userid">Login:</label>
213
                                            <label for="userid">Login:</label>
196
                                            <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
214
                                            <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
197
- 

Return to bug 31378