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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-59 / +61 lines)
Lines 1-4 Link Here
1
[% USE raw %]
1
[% USE raw %] 
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
Lines 61-91 Link Here
61
<p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl | $raw %]">click here</a> to login.</p>
61
<p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl | $raw %]">click here</a> to login.</p>
62
[% END %]
62
[% END %]
63
63
64
<!-- login prompt time-->
64
[% UNLESS Koha.Preference('staffShibOnly') %]
65
<form action="[% script_name | html %]" method="post" name="loginform" id="loginform">
65
    <!-- login prompt time-->
66
    <input type="hidden" name="koha_login_context" value="intranet" />
66
    <form action="[% script_name | html %]" method="post" name="loginform" id="loginform">
67
[% FOREACH INPUT IN INPUTS %]
67
        <input type="hidden" name="koha_login_context" value="intranet" />
68
    <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
68
    [% FOREACH INPUT IN INPUTS %]
69
[% END %]
69
        <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
70
<p><label for="userid">Username:</label>
70
    [% END %]
71
<input type="text" name="userid" id="userid" class="input focus" value="[% userid | html %]" size="20" tabindex="1" />
71
    <p><label for="userid">Username:</label>
72
</p>
72
    <input type="text" name="userid" id="userid" class="input focus" value="[% userid | html %]" size="20" tabindex="1" />
73
<p><label for="password">Password:</label>
73
    </p>
74
<input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" />
74
    <p><label for="password">Password:</label>
75
</p>
75
    <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" />
76
77
[% UNLESS IndependentBranches %]
78
    <p>
79
        <label for="branch">Library:</label>
80
        <select name="branch" id="branch" class="input" tabindex="3">
81
            <option value="">My library</option>
82
            [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
83
                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
84
            [% END %]
85
        </select>
86
    </p>
76
    </p>
87
77
88
    [% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
78
    [% UNLESS IndependentBranches %]
79
        <p>
80
            <label for="branch">Library:</label>
81
            <select name="branch" id="branch" class="input" tabindex="3">
82
                <option value="">My library</option>
83
                [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
84
                    <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
85
                 [% END %]
86
            </select>
87
        </p>
88
89
        [% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
89
        <p>
90
        <p>
90
            <label for="desk">Desk:</label>
91
            <label for="desk">Desk:</label>
91
            <select name="desk_id" id="desk_id" class="input" tabindex="3">
92
            <select name="desk_id" id="desk_id" class="input" tabindex="3">
Lines 95-145 Link Here
95
                    [% END %]
96
                    [% END %]
96
            </select>
97
            </select>
97
        </p>
98
        </p>
98
    [% END %]
99
        [% END %]
99
100
    [% IF Koha.Preference('UseCashRegisters') && Registers.all().size %]
101
    <p>
102
        <label for="register_id">Cash register:</label>
103
        <select name="register_id" id="register_id" class="input" tabindex="4">
104
            <option id="noregister" value="" selected="selected">Library default</option>
105
            [% PROCESS options_for_registers registers => Registers.all() %]
106
        </select>
107
    </p>
108
    [% END %]
109
100
110
</fieldset>
101
        [% IF Koha.Preference('UseCashRegisters') && Registers.all().size %]
111
[% END %]
102
        <p>
112
103
            <label for="register_id">Cash register:</label>
113
<!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
104
            <select name="register_id" id="register_id" class="input" tabindex="4">
114
105
                <option id="noregister" value="" selected="selected">Library default</option>
115
<p class="submit"><input id="submit-button" type="submit" value="Login" tabindex="4" /></p>
106
                [% PROCESS options_for_registers registers => Registers.all() %]
116
</form>
107
            </select>
117
[% IF ( casAuthentication ) %]
108
        </p>
118
<h4>Cas login</h4>
109
        [% END %]
119
120
[% IF ( invalidCasLogin ) %]
121
<!-- This is what is displayed if cas login has failed -->
122
<p>Sorry, the CAS login failed.</p>
123
[% END %]
124
110
125
[% IF ( casServerUrl ) %]
111
    [% END %]
126
    <p><a href="[% casServerUrl | $raw %]">If you have a CAS account, please click here to login</a>.<p>
127
[% END %]
128
112
129
[% IF ( casServersLoop ) %]
113
    <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
130
    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
114
131
<ul>
115
    <p class="submit"><input id="submit-button" type="submit" value="Login" tabindex="4" /></p>
132
    [% FOREACH casServer IN casServersLoop %]
116
    </form>
133
        <li><a href="[% casServer.value | $raw %]">[% casServer.name | html %]</a></li>
117
118
    [% IF ( casAuthentication ) %]
119
        <h4>Cas login</h4>
120
    
121
        [% IF ( invalidCasLogin ) %]
122
        <!-- This is what is displayed if cas login has failed -->
123
        <p>Sorry, the CAS login failed.</p>
124
        [% END %]
125
    
126
        [% IF ( casServerUrl ) %]
127
            <p><a href="[% casServerUrl | $raw %]">If you have a CAS account, please click here to login</a>.<p>
128
        [% END %]
129
    
130
        [% IF ( casServersLoop ) %]
131
            <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
132
        <ul>
133
            [% FOREACH casServer IN casServersLoop %]
134
                <li><a href="[% casServer.value | $raw %]">[% casServer.name | html %]</a></li>
135
            [% END %]
136
        [% END %]
134
    [% END %]
137
    [% END %]
135
[% END %]
138
[% END %]
136
[% END %]
137
139
138
[% IF ( nopermission ) %]
140
[% IF ( nopermission ) %]
139
    <p><a href="javascript:window.history.back()">[Previous page]</a>
141
    <p><a href="javascript:window.history.back()">[Previous page]</a>
140
    <a href="/">[Main page]</a></p>
142
    <a href="/">[Main page]</a></p>
141
[% END %]
143
[% END %]
142
144
 
143
145
144
<!--<ul> -->
146
<!--<ul> -->
145
<!--	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password lost and found">Lost your password?</a></li> -->
147
<!--	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password lost and found">Lost your password?</a></li> -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-24 / +30 lines)
Lines 379-411 Link Here
379
                            [% ELSE %]
379
                            [% ELSE %]
380
                                <h3>Shibboleth login</h3>
380
                                <h3>Shibboleth login</h3>
381
                                <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
381
                                <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
382
                                <h3>Local Login</h3>
382
                                [% UNLESS Koha.Preference('opacShibOnly') %]
383
                                    <h3>Local Login</h3>
384
                                [% END %]
383
                            [% END %]
385
                            [% END %]
384
                        [% END %]
386
                        [% END %]
385
                        <input type="hidden" name="koha_login_context" value="opac" />
387
                        [% UNLESS Koha.Preference('opacShibOnly') %]
386
                        <fieldset class="brief">
388
                            <input type="hidden" name="koha_login_context" value="opac" />
387
                            <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
389
                            <fieldset class="brief">
388
                            <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
390
                                <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
389
                            [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
391
                                <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
390
                                <div id="nologininstructions-modal" class="nologininstructions">
392
                                [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
391
                                    [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
393
                                    <div id="nologininstructions-modal" class="nologininstructions">
392
                                </div>
394
                                        [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
393
                            [% END %]
395
                                    </div>
394
                            [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
396
                                [% END %]
395
                                <div id="forgotpassword-modal" class="forgotpassword">
397
                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
396
                                    <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
398
                                    <div id="forgotpassword-modal" class="forgotpassword">
397
                                </div>
399
                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
398
                            [% END %]
400
                                    </div>
399
                            [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
401
                                [% END %]
400
                                <div id="patronregistration-modal" class="patronregistration">
402
                                [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
401
                                    <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
403
                                    <div id="patronregistration-modal" class="patronregistration">
402
                                </div>
404
                                        <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
403
                            [% END %]
405
                                    </div>
404
                        </fieldset>
406
                                [% END %]
405
                    </div>
407
                            </fieldset>
406
                    <div class="modal-footer">
408
                        [% END %]
407
                        <input type="submit" class="btn btn-primary" value="Log in" />
408
                    </div>
409
                    </div>
410
                    [% UNLESS Koha.Preference('opacShibOnly') %]
411
                        <div class="modal-footer">
412
                            <input type="submit" class="btn btn-primary" value="Log in" />
413
                        </div>
414
                    [% END %]
409
                </form> <!-- /#auth -->
415
                </form> <!-- /#auth -->
410
            </div> <!-- /.modal-content -->
416
            </div> <!-- /.modal-content -->
411
        </div> <!-- /.modal-dialog -->
417
        </div> <!-- /.modal-dialog -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-109 / +109 lines)
Lines 80-95 Link Here
80
                                    <div class="alert alert-info">
80
                                    <div class="alert alert-info">
81
                                        <p>Sorry, your Shibboleth identity does not match a valid library identity.</p>
81
                                        <p>Sorry, your Shibboleth identity does not match a valid library identity.</p>
82
                                        [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
82
                                        [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
83
                                        [% IF ( casAuthentication ) %]
83
                                            [% IF ( casAuthentication ) %]
84
                                            [% IF ( invalidCasLogin ) %]
84
                                                [% IF ( invalidCasLogin ) %]
85
                                                <!-- This is what is displayed if cas login has failed -->
85
                                                    <!-- This is what is displayed if cas login has failed -->
86
                                                <p>Sorry, the CAS login also failed. If you have a local login you may use that below.</p>
86
                                                    <p>Sorry, the CAS login also failed. If you have a local login you may use that below.</p>
87
                                                [% ELSE %]
88
                                                    <p>If you have a CAS account, you may use that below.</p>
89
                                                [% END %]
87
                                            [% ELSE %]
90
                                            [% ELSE %]
88
                                                <p>If you have a CAS account, you may use that below.</p>
91
                                                <p>If you have a local account, you may use that below.</p>
89
                                            [% END %]
92
                                            [% END %]
90
                                        [% ELSE %]
91
                                            <p>If you have a local account, you may use that below.</p>
92
                                        [% END %]
93
                                        [% END %]
93
                                        [% END %]
94
                                    </div>
94
                                    </div>
95
                                [% ELSE %]
95
                                [% ELSE %]
Lines 97-220 Link Here
97
                                    <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account.</a></p>
97
                                    <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account.</a></p>
98
                                [% END # /IF invalidShibLogin %]
98
                                [% END # /IF invalidShibLogin %]
99
                                [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
99
                                [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
100
                                [% IF ( casAuthentication ) %]
100
                                    [% IF ( casAuthentication ) %]
101
                                    <h3>CAS login</h3>
101
                                        <h3>CAS login</h3>
102
                                    <p>If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.</p>
102
                                        <p>If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.</p>
103
                                [% ELSE %]
103
                                    [% ELSE %]
104
                                    <h3>Local login</h3>
104
                                        <h3>Local login</h3>
105
                                    <p>If you do not have a Shibboleth account, but you do have a local login, then you may login below.</p>
105
                                        <p>If you do not have a Shibboleth account, but you do have a local login, then you may login below.</p>
106
                                [% END %]
106
                                    [% END %]
107
                                [% END %]
107
                                [% END %]
108
                            [% END # /IF shibbolethAuthentication %]
108
                            [% END # /IF shibbolethAuthentication %]
109
109
110
                        [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
110
                        [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
111
                        [% IF ( casAuthentication ) %]
111
                            [% IF ( casAuthentication ) %]
112
                            [% IF ( shibbolethAuthentication ) %]
112
                                [% IF ( shibbolethAuthentication ) %]
113
                                [% IF ( casServerUrl ) %]
113
                                    [% IF ( casServerUrl ) %]
114
                                    <p><a href="[% casServerUrl | $raw %]">Log in.</a><p>
114
                                        <p><a href="[% casServerUrl | $raw %]">Log in.</a><p>
115
                                [% END %]
115
                                    [% END %]
116
117
                                    [% IF ( casServersLoop ) %]
118
                                        <p>Please choose against which one you would like to authenticate: </p>
119
                                        <ul>
120
                                            [% FOREACH casServer IN casServersLoop %]
121
                                                <li><a href="[% casServer.value | $raw %]">[% casServer.name | html %]</a></li>
122
                                            [% END %]
123
                                        </ul>
124
                                    [% END %]
125
                                [% ELSE %]
126
                                    <h3>CAS login</h3>
116
127
117
                                [% IF ( casServersLoop ) %]
128
                                    [% IF ( invalidCasLogin ) %]
118
                                    <p>Please choose against which one you would like to authenticate: </p>
129
                                        <!-- This is what is displayed if cas login has failed -->
119
                                    <ul>
130
                                        <p>Sorry, the CAS login failed.</p>
120
                                        [% FOREACH casServer IN casServersLoop %]
131
                                    [% END %]
121
                                            <li><a href="[% casServer.value | $raw %]">[% casServer.name | html %]</a></li>
122
                                        [% END %]
123
                                    </ul>
124
                                [% END %]
125
                            [% ELSE %]
126
                                <h3>CAS login</h3>
127
132
128
                                [% IF ( invalidCasLogin ) %]
133
                                    [% IF ( casServerUrl ) %]
129
                                    <!-- This is what is displayed if cas login has failed -->
134
                                       <p><a href="[% casServerUrl | $raw %]">Log in using a CAS account.</a><p>
130
                                    <p>Sorry, the CAS login failed.</p>
135
                                    [% END %]
131
                                [% END %]
132
136
133
                                [% IF ( casServerUrl ) %]
137
                                    [% IF ( casServersLoop ) %]
134
                                   <p><a href="[% casServerUrl | $raw %]">Log in using a CAS account.</a><p>
138
                                        <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
135
                                [% END %]
139
                                        <ul>
140
                                            [% FOREACH casServer IN casServersLoop %]
141
                                            <li><a href="[% casServer.value | $raw %]">[% casServer.name | html %]</a></li>
142
                                            [% END %]
143
                                        </ul>
144
                                    [% END %]
145
                                [% END # /IF shibbolethAuthentication %]
136
146
137
                                [% IF ( casServersLoop ) %]
147
                                [% IF ( shibbolethAuthentication ) %]
138
                                    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
148
                                    <p>Nothing</p>
139
                                    <ul>
149
                                [% ELSE %]
140
                                        [% FOREACH casServer IN casServersLoop %]
150
                                    <h3>Local login</h3>
141
                                        <li><a href="[% casServer.value | $raw %]">[% casServer.name | html %]</a></li>
151
                                    <p>If you do not have a CAS account, but do have a local account, you can still log in: </p>
142
                                        [% END %]
143
                                    </ul>
144
                                [% END %]
152
                                [% END %]
145
                            [% END # /IF shibbolethAuthentication %]
146
153
147
                            [% IF ( shibbolethAuthentication ) %]
154
                            [% END # / IF casAuthentication %]
148
                                <p>Nothing</p>
149
                            [% ELSE %]
150
                                <h3>Local login</h3>
151
                                <p>If you do not have a CAS account, but do have a local account, you can still log in: </p>
152
                            [% END %]
153
155
154
                        [% END # / IF casAuthentication %]
156
                            [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
155
157
                                [% IF ( invalidGoogleOpenIDConnectLogin ) %]
156
                        [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
158
                                    <h3>Google login</h3>
157
                            [% IF ( invalidGoogleOpenIDConnectLogin ) %]
159
                                    <p>Sorry, your Google login failed. <span class="error">[% invalidGoogleOpenIDConnectLogin | html %]</span></p>
158
                                <h3>Google login</h3>
160
                                    <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p>
159
                                <p>Sorry, your Google login failed. <span class="error">[% invalidGoogleOpenIDConnectLogin | html %]</span></p>
161
                                    <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>
160
                                <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p>
162
                                [% END %]
161
                                <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
                                <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-primary" id="openid_connect">Log in with Google</a>
162
                            [% END %]
164
                                <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
163
                            <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-primary" id="openid_connect">Log in with Google</a>
165
                            [% END # /IF GoogleOpenIDConnect %]
164
                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
165
                        [% END # /IF GoogleOpenIDConnect %]
166
                        [% END # /UNLESS OPACShibOnly %]
166
                        [% END # /UNLESS OPACShibOnly %]
167
167
168
                        [% IF !Koha.Preference('OPACShibOnly') or SCO_login or SCI_login %]
168
                        [% IF !Koha.Preference('OPACShibOnly') or SCO_login or SCI_login %]
169
                        [% IF SCO_login %]
169
                            [% IF SCO_login %]
170
                            <form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post" autocomplete="off">
170
                                <form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post" autocomplete="off">
171
                        [% ELSIF SCI_login %]
171
                            [% ELSIF SCI_login %]
172
                            <form action="/cgi-bin/koha/sci/sci-main.pl" name="auth" id="auth" method="post" autocomplete="off">
172
                                <form action="/cgi-bin/koha/sci/sci-main.pl" name="auth" id="auth" method="post" autocomplete="off">
173
                        [% ELSE %]
173
                            [% ELSE %]
174
                            <form action="[% script_name | html %]" name="auth" id="auth" method="post" autocomplete="off">
174
                                <form action="[% script_name | html %]" name="auth" id="auth" method="post" autocomplete="off">
175
                        [% END %]
175
                            [% END %]
176
                            <input type="hidden" name="koha_login_context" value="opac" />
176
                                <input type="hidden" name="koha_login_context" value="opac" />
177
177
178
                            <fieldset class="brief">
178
                                <fieldset class="brief">
179
                                [% FOREACH INPUT IN INPUTS %]
179
                                    [% FOREACH INPUT IN INPUTS %]
180
                                    [% NEXT IF INPUT.name == 'logout.x' %]
180
                                        [% NEXT IF INPUT.name == 'logout.x' %]
181
                                    <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
181
                                        <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
182
                                [% END %]
182
                                    [% END %]
183
                                <div class="form-group">
183
                                    <div class="form-group">
184
                                    <label for="userid">Login</label>
184
                                        <label for="userid">Login</label>
185
                                    <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
185
                                        <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
186
                                </div>
186
                                    </div>
187
                                <div class="form-group">
187
                                    <div class="form-group">
188
                                    <label for="password">Password</label>
188
                                        <label for="password">Password</label>
189
                                    <input class="form-control" type="password"  size="25" id="password"  name="password" />
189
                                        <input class="form-control" type="password"  size="25" id="password"  name="password" />
190
                                </div>
190
                                    </div>
191
                                <fieldset class="action">
191
                                    <fieldset class="action">
192
                                    <input type="submit" value="Log in" class="btn btn-primary" />
192
                                        <input type="submit" value="Log in" class="btn btn-primary" />
193
                                    </fieldset>
193
                                </fieldset>
194
                                </fieldset>
194
                            </fieldset>
195
195
196
                            [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
196
                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
197
                                <div id="forgotpassword">
197
                                    <div id="forgotpassword">
198
                                    <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
198
                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
199
                                </div>
199
                                    </div>
200
                            [% END %]
201
                            <div id="nologininstructions">
202
                                [% IF Koha.Preference('OpacLoginInstructions') %]
203
                                    [% Koha.Preference('OpacLoginInstructions') | $raw %]
204
                                [% ELSE %]
205
                                    <h3>Don't have a password yet?</h3>
206
                                    <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
207
                                    <h3>Don't have a library card?</h3>
208
                                    <p>If you don't have a library card, stop by your local library to sign up.</p>
209
                                [% END # / IF Koha.Preference('OpacLoginInstructions') %]
210
211
                                [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
212
                                    <span id="registrationinstructions">
213
                                        <a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a>
214
                                    </span>
215
                                [% END %]
200
                                [% END %]
216
                            </div>
201
                                <div id="nologininstructions">
217
                        </form>
202
                                    [% IF Koha.Preference('OpacLoginInstructions') %]
203
                                        [% Koha.Preference('OpacLoginInstructions') | $raw %]
204
                                    [% ELSE %]
205
                                        <h3>Don't have a password yet?</h3>
206
                                        <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
207
                                        <h3>Don't have a library card?</h3>
208
                                        <p>If you don't have a library card, stop by your local library to sign up.</p>
209
                                    [% END # / IF Koha.Preference('OpacLoginInstructions') %]
210
211
                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
212
                                        <span id="registrationinstructions">
213
                                            <a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a>
214
                                        </span>
215
                                    [% END %]
216
                                </div>
217
                            </form>
218
                        [% END # / IF !OPACShibOnly or SCO_login or SCI_login %]
218
                        [% END # / IF !OPACShibOnly or SCO_login or SCI_login %]
219
                    [% END # / IF loginprompt %]
219
                    [% END # / IF loginprompt %]
220
220
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-2 / +1 lines)
Lines 181-187 Link Here
181
            <div class="col-12 col-lg-3 order-md-2">
181
            <div class="col-12 col-lg-3 order-md-2">
182
                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
182
                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
183
                    [% UNLESS ( loggedinusername ) %]
183
                    [% UNLESS ( loggedinusername ) %]
184
                        [% UNLESS ( casAuthentication || shibbolethAuthentication ) %]
184
                        [% UNLESS ( casAuthentication || shibbolethAuthentication || Koha.Preference('opacShibOnly') ) %]
185
                            <div id="login">
185
                            <div id="login">
186
                                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
186
                                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
187
                                    <input type="hidden" name="koha_login_context" value="opac" />
187
                                    <input type="hidden" name="koha_login_context" value="opac" />
188
- 

Return to bug 18506