Attachment #143097 for bug #31378

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




[% USE Koha %]
[% USE Branches %]
[% USE Categories %]
[% USE AuthClient %]
[% USE AdditionalContents %]
[% PROCESS 'html_helpers.inc' %]
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]

                            [% END %]
                        [% END %]
                        [% UNLESS Koha.Preference('opacShibOnly') %]
                            [% SET auth_providers = AuthClient.get_providers('opac') %]
                            [% IF ( ! auth_providers.empty ) %]
                                [% FOREACH provider IN auth_providers %]
                                    <p class="clearfix">
                                        <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
                                            [% IF provider.icon_url %]
                                            <img src="[% provider.icon_url | url %]" />
                                            [% ELSE %]
                                            <i class="fa fa-user" aria-hidden="true"></i>
                                            [% END %]
                                            Log in with [% provider.description | html %]
                                        </a>
                                    </p>
                                [% END %]
                                <hr/>
                                <p>If you do not have an external account, but do have a local account, you can still log in: </p>
                            [% END # /IF  auth_providers.size %]
                            <input type="hidden" name="koha_login_context" value="opac" />
                            <fieldset class="brief">
                                <div class="local-login">

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (+26 lines)
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>




[% USE Categories %]
[% USE Price %]
[% USE AdditionalContents %]
[% USE AuthClient %]
[% PROCESS 'i18n.inc' %]
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]

                                            <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>
                                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
                                        [% END # /IF GoogleOpenIDConnect %]
                                        [% SET auth_providers = AuthClient.get_providers('opac') %]
                                        [% IF ( ! auth_providers.empty ) %]
                                            [% FOREACH provider IN auth_providers %]
                                                <p class="clearfix">
                                                    <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
                                                        [% IF provider.icon_url %]
                                                        <img src="[% provider.icon_url | url %]"  style="max-height: 20px; max-width: 20px;"/>
                                                        [% ELSE %]
                                                        <i class="fa fa-user" aria-hidden="true"></i>
                                                        [% END %]
                                                        Log in with [% provider.description | html %]
                                                    </a>
                                                </p>
                                            [% END %]
                                            <hr/>
                                            <p>If you do not have an external account, but do have a local account, you can still log in: </p>
                                        [% END # /IF  auth_providers.size %]
                                        <div class="local-login">
                                            <label for="userid">Login:</label>
                                            <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
- 

Return to bug 31378

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (+18 lines)
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 383-388 Link Here
383	[% END %]	384	[% END %]
384	[% END %]	385	[% END %]
385	[% UNLESS Koha.Preference('opacShibOnly') %]	386	[% UNLESS Koha.Preference('opacShibOnly') %]
		387	[% SET auth_providers = AuthClient.get_providers('opac') %]
		388	[% IF ( ! auth_providers.empty ) %]
		389	[% FOREACH provider IN auth_providers %]
		390	<p class="clearfix">
		391	<a href="[% provider.url \| url %]" class="btn btn-light col-md-12" id="provider_[% provider.code \| html %]">
		392	[% IF provider.icon_url %]
		393	<img src="[% provider.icon_url \| url %]" />
		394	[% ELSE %]
		395	<i class="fa fa-user" aria-hidden="true"></i>
		396	[% END %]
		397	Log in with [% provider.description \| html %]
		398	</a>
		399	</p>
		400	[% END %]
		401	<hr/>
		402	<p>If you do not have an external account, but do have a local account, you can still log in: </p>
		403	[% END # /IF auth_providers.size %]
386	<input type="hidden" name="koha_login_context" value="opac" />	404	<input type="hidden" name="koha_login_context" value="opac" />
387	<fieldset class="brief">	405	<fieldset class="brief">
388	<div class="local-login">	406	<div class="local-login">