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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-5 / +7 lines)
Lines 385-395 Link Here
385
                        [% UNLESS Koha.Preference('opacShibOnly') %]
385
                        [% UNLESS Koha.Preference('opacShibOnly') %]
386
                            <input type="hidden" name="koha_login_context" value="opac" />
386
                            <input type="hidden" name="koha_login_context" value="opac" />
387
                            <fieldset class="brief">
387
                            <fieldset class="brief">
388
                                <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" autocomplete="off" />
388
                                <div class="local-login">
389
                                <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
389
                                    <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" autocomplete="off" />
390
                                <fieldset class="action">
390
                                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
391
                                    <input type="submit" class="btn btn-primary" value="Log in" />
391
                                    <fieldset class="action">
392
                                </fieldset>
392
                                        <input type="submit" class="btn btn-primary" value="Log in" />
393
                                    </fieldset>
394
                                </div>
393
                                [% IF OpacLoginInstructions %]
395
                                [% IF OpacLoginInstructions %]
394
                                    <div id="nologininstructions-modal" class="nologininstructions">
396
                                    <div id="nologininstructions-modal" class="nologininstructions">
395
                                        [% PROCESS koha_news_block news => OpacLoginInstructions %]
397
                                        [% PROCESS koha_news_block news => OpacLoginInstructions %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-16 / +18 lines)
Lines 190-212 Link Here
190
                            [% END %]
190
                            [% END %]
191
                                <input type="hidden" name="koha_login_context" value="opac" />
191
                                <input type="hidden" name="koha_login_context" value="opac" />
192
192
193
                                <fieldset class="brief">
193
                                <div class="local-login">
194
                                    [% FOREACH INPUT IN INPUTS %]
194
                                    <fieldset class="brief">
195
                                        [% NEXT IF INPUT.name == 'logout.x' %]
195
                                        [% FOREACH INPUT IN INPUTS %]
196
                                        <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
196
                                            [% NEXT IF INPUT.name == 'logout.x' %]
197
                                    [% END %]
197
                                            <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
198
                                    <div class="form-group">
198
                                        [% END %]
199
                                        <label for="userid">Login:</label>
199
                                        <div class="form-group">
200
                                        <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
200
                                            <label for="userid">Login:</label>
201
                                    </div>
201
                                            <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
202
                                    <div class="form-group">
202
                                        </div>
203
                                        <label for="password">Password:</label>
203
                                        <div class="form-group">
204
                                        <input class="form-control" type="password"  size="25" id="password"  name="password" />
204
                                            <label for="password">Password:</label>
205
                                    </div>
205
                                            <input class="form-control" type="password"  size="25" id="password"  name="password" />
206
                                    <fieldset class="action">
206
                                        </div>
207
                                        <input type="submit" value="Log in" class="btn btn-primary" />
207
                                        <fieldset class="action">
208
                                            <input type="submit" value="Log in" class="btn btn-primary" />
209
                                        </fieldset>
208
                                    </fieldset>
210
                                    </fieldset>
209
                                </fieldset>
211
                                </div>
210
212
211
                                <div id="nologininstructions">
213
                                <div id="nologininstructions">
212
                                    [% IF OpacLoginInstructions %]
214
                                    [% IF OpacLoginInstructions %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-8 / +9 lines)
Lines 189-201 Link Here
189
                                            <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>
189
                                            <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>
190
                                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
190
                                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
191
                                        [% END # /IF GoogleOpenIDConnect %]
191
                                        [% END # /IF GoogleOpenIDConnect %]
192
                                        <label for="userid">Login:</label>
192
                                        <div class="local-login">
193
                                        <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
193
                                            <label for="userid">Login:</label>
194
                                        <label for="password">Password:</label>
194
                                            <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
195
                                        <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
195
                                            <label for="password">Password:</label>
196
                                        <fieldset class="action">
196
                                            <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
197
                                            <input type="submit" value="Log in" class="btn btn-primary" />
197
                                            <fieldset class="action">
198
                                        </fieldset>
198
                                                <input type="submit" value="Log in" class="btn btn-primary" />
199
                                            </fieldset>
200
                                        </div>
199
                                        [% IF ( OpacLoginInstructions ) %]
201
                                        [% IF ( OpacLoginInstructions ) %]
200
                                            <div id="nologininstructions-main" class="nologininstructions">
202
                                            <div id="nologininstructions-main" class="nologininstructions">
201
                                                [% PROCESS koha_news_block news => OpacLoginInstructions %]
203
                                                [% PROCESS koha_news_block news => OpacLoginInstructions %]
202
- 

Return to bug 31064