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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+36 lines)
Lines 1810-1815 nav { Link Here
1810
}
1810
}
1811
1811
1812
#loginModal {
1812
#loginModal {
1813
    #local_login, #external_login {
1814
        border: 1px solid #dbdbdb;
1815
        padding: 7px;
1816
    }
1817
1818
	#external_login {
1819
		box-shadow: 0 0 0 1px #dbdbdb;
1820
		padding: 7px;
1821
	}
1822
1823
	#external_login_button {
1824
		border: 1px solid #dbdbdb;
1825
		padding: 2px 10px 2px 10px;
1826
		color: #000;
1827
		border-radius: 4px;
1828
	}
1829
1830
	#external_login {
1831
		box-shadow: 0 0 0 1px #dbdbdb;
1832
		padding: 1em;
1833
	}
1834
1835
	#external_login a:hover {
1836
		text-decoration: none;
1837
	}
1838
1839
	#external_login_button:hover {
1840
		text-decoration: none;
1841
		background-color: #f0f0f0; 
1842
	}
1843
1844
	#external_login_name {
1845
		padding-left: 1em;
1846
	}
1847
1813
    input {
1848
    input {
1814
        box-sizing: border-box;
1849
        box-sizing: border-box;
1815
        display: block;
1850
        display: block;
Lines 1822-1827 nav { Link Here
1822
            font-size: 100%;
1857
            font-size: 100%;
1823
            padding: .5em;
1858
            padding: .5em;
1824
            transition: background-color .5s ease;
1859
            transition: background-color .5s ease;
1860
            margin-top: 1em;
1825
1861
1826
            &:hover {
1862
            &:hover {
1827
                background: #77b50f none;
1863
                background: #77b50f none;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-37 / +39 lines)
Lines 367-412 Link Here
367
                        <span aria-hidden="true">&times;</span>
367
                        <span aria-hidden="true">&times;</span>
368
                    </button>
368
                    </button>
369
                </div>
369
                </div>
370
                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
370
                <div class="modal-body">
371
                    <input type="hidden" name="has-search-query" id="has-search-query" value="" />
371
                    <div id="local_login">
372
                    <div class="modal-body">
372
                        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
373
                        [% IF ( shibbolethAuthentication ) %]
373
                        <input type="hidden" name="has-search-query" id="has-search-query" value="" />
374
                        <input type="hidden" name="koha_login_context" value="opac" />
375
                            <fieldset class="brief">
376
                                <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
377
                                <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
378
                            </fieldset>
379
                            <input type="submit" class="btn btn-primary" value="Log in" />
380
                        </form> <!-- /#auth -->
381
                    </div>
382
                    [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
383
                        <div id="nologininstructions-modal" class="nologininstructions">
384
                            [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
385
                        </div>
386
                    [% END %]
387
                    [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
388
                        <div id="forgotpassword-modal" class="forgotpassword">
389
                            <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
390
                        </div>
391
                    [% END %]
392
                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
393
                        <div id="patronregistration-modal" class="patronregistration">
394
                            <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
395
                        </div>
396
                    [% END %]
397
                    [% IF ( shibbolethAuthentication ) %]
398
                        <div id="external_login">
374
                            [% IF ( invalidShibLogin ) %]
399
                            [% IF ( invalidShibLogin ) %]
375
                                <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
400
                                <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
376
                                <div class="alert alert-info">
401
                                    <div class="alert alert-info">
377
                                    <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
402
                                        <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
378
                                </div>
403
                                    </div>
379
                            [% ELSE %]
404
                            [% ELSE %]
380
                                <h3>Shibboleth login</h3>
405
                                <h3>Sign in using:</h3>
381
                                <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | $raw %]">click here to login</a>.</p>
406
                                <a href="[% shibbolethLoginUrl | $raw %]">
382
                                <h3>Local Login</h3>
407
                                    <div id="external_login_button"><i id="external_login_icon" class="fa fa-user-circle-o" aria-hidden="true"></i><span id="external_login_name"> Shibboleth</span></div>
383
                            [% END %]
408
                                </a>
384
                        [% END %]
385
                        <input type="hidden" name="koha_login_context" value="opac" />
386
                        <fieldset class="brief">
387
                            <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
388
                            <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
389
                            [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
390
                                <div id="nologininstructions-modal" class="nologininstructions">
391
                                    [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
392
                                </div>
393
                            [% END %]
394
                            [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
395
                                <div id="forgotpassword-modal" class="forgotpassword">
396
                                    <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
397
                                </div>
398
                            [% END %]
399
                            [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
400
                                <div id="patronregistration-modal" class="patronregistration">
401
                                    <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
402
                                </div>
403
                            [% END %]
409
                            [% END %]
404
                        </fieldset>
410
                        </div>
405
                    </div>
411
                    [% END %]
406
                    <div class="modal-footer">
412
                </div>
407
                        <input type="submit" class="btn btn-primary" value="Log in" />
408
                    </div>
409
                </form> <!-- /#auth -->
410
            </div> <!-- /.modal-content -->
413
            </div> <!-- /.modal-content -->
411
        </div> <!-- /.modal-dialog -->
414
        </div> <!-- /.modal-dialog -->
412
    </div>  <!-- /#modalAuth  -->
415
    </div>  <!-- /#modalAuth  -->
413
- 

Return to bug 25405