Attachment #71532 for bug #20163

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




        </div>
        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
            <div class="modal-body">
                [% IF ( shibbolethAuthentication ) %]
                    [% IF ( invalidShibLogin ) %]
                        <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
                        <div class="alert alert-info">
                            <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
                        </div>
                    [% ELSE %]
                        <h4>Shibboleth login</h4>
                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl %]">click here to login</a>.</p>
                        <h4>Local Login</h4>
                    [% END %]
                [% END %]
                <input type="hidden" name="koha_login_context" value="opac" />
                <fieldset class="brief">
                    <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
                    [% IF Koha.Preference( 'NoLoginInstructions' ) %]
                        <div id="nologininstructions-modal" class="nologininstructions">
                            [% Koha.Preference( 'NoLoginInstructions' ) %]
                        </div>
                    [% END %]
            [% END %]
                    <input type="hidden" name="koha_login_context" value="opac" />
                    <fieldset class="brief">
                        <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
                        <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
                    [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
                        <div id="forgotpassword-modal" class="forgotpassword">
                            <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
                        </div>
                    [% END %]
                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
                        <div id="patronregistration-modal" class="patronregistration">
                            <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
                        </div>
                    [% END %]
                </fieldset>
                    </fieldset>
            </div>
            <div class="modal-footer">
                <input type="submit" class="btn btn-primary" value="Log in" />





        [% IF ( display_daily_quote && daily_quote ) %]
            <div id="daily-quote">
                <h3>Quote of the day</h3>
                <div>
                    <span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
                </div>

                                        <legend>Log in to your account:</legend>
                                        <label for="userid">Login:</label><input type="text" id="userid" name="userid" />
                                        <label for="password">Password:</label><input type="password" id="password" name="password" />
                                        <fieldset class="action">
                                            <input type="submit" value="Log in" class="btn" />
                                        </fieldset>
                                        [% IF Koha.Preference( 'NoLoginInstructions' ) %]
                                            <div id="nologininstructions-main" class="nologininstructions">
                                                [% Koha.Preference( 'NoLoginInstructions' ) %]
                                            </div>
                                        [% END %]
                                        [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
                                            <div id="forgotpassword-main" class="forgotpassword">
                                                <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
                                            </div>
                                        [% END %]
                                        [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
                                            <div id="patronregistration-main" class="patronregistration">
                                                <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
                                            </div>
                                        [% END %]
                                    </fieldset>
                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="patronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
                                    </fieldset>
                                [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
                                    <div id="forgotpassword">
                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
                                    </div>
                                [% END %]
                                [% IF Koha.Preference( 'NoLoginInstructions' ) %]
                                    <div id="nologininstructions-main">
                                        [% Koha.Preference( 'NoLoginInstructions' ) %]
                                    </div>
                                [% END %]
                                </form>
                            </div> <!-- /#login -->
                        [% END # /casAuthentication %]
- 

Return to bug 20163

Lines 307-340 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-20 / +24 lines)
307	</div>	307	</div>
308	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">	308	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
309	<div class="modal-body">	309	<div class="modal-body">
310	[% IF ( shibbolethAuthentication ) %]	310	[% IF ( shibbolethAuthentication ) %]
311	[% IF ( invalidShibLogin ) %]	311	[% IF ( invalidShibLogin ) %]
312	<!-- This is what is displayed if shibboleth login has failed to match a koha user -->	312	<!-- This is what is displayed if shibboleth login has failed to match a koha user -->
313	<div class="alert alert-info">	313	<div class="alert alert-info">
314	<p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>	314	<p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
315	</div>	315	</div>
316	[% ELSE %]	316	[% ELSE %]
317	<h4>Shibboleth Login</h4>	317	<h4>Shibboleth login</h4>
318	<p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl %]">click here to login</a>.</p>	318	<p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl %]">click here to login</a>.</p>
319	<h4>Local Login</h4>	319	<h4>Local Login</h4>
		320	[% END %]
		321	[% END %]
		322	<input type="hidden" name="koha_login_context" value="opac" />
		323	<fieldset class="brief">
		324	<label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
		325	<label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
		326	[% IF Koha.Preference( 'NoLoginInstructions' ) %]
		327	<div id="nologininstructions-modal" class="nologininstructions">
		328	[% Koha.Preference( 'NoLoginInstructions' ) %]
		329	</div>
320	[% END %]	330	[% END %]
321	[% END %]
322	<input type="hidden" name="koha_login_context" value="opac" />
323	<fieldset class="brief">
324	<label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
325	<label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
326	[% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]	331	[% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
327	<div id="forgotpassword-modal">	332	<div id="forgotpassword-modal" class="forgotpassword">
328	<a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>	333	<p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
329	</div>	334	</div>
330	[% END %]	335	[% END %]
331	[% IF Koha.Preference( 'NoLoginInstructions' ) %]	336	[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
332	<div id="nologininstructions-modal">	337	<div id="patronregistration-modal" class="patronregistration">
333	[% Koha.Preference( 'NoLoginInstructions' ) %]	338	<p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
334	</div>	339	</div>
335	[% END %]	340	[% END %]
336	[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="mpatronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]	341	</fieldset>
337	</fieldset>
338	</div>	342	</div>
339	<div class="modal-footer">	343	<div class="modal-footer">
340	<input type="submit" class="btn btn-primary" value="Log in" />	344	<input type="submit" class="btn btn-primary" value="Log in" />

Lines 94-100 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-16 / +19 lines)
94		94
95	[% IF ( display_daily_quote && daily_quote ) %]	95	[% IF ( display_daily_quote && daily_quote ) %]
96	<div id="daily-quote">	96	<div id="daily-quote">
97	<h3>Quote of the Day</h3>	97	<h3>Quote of the day</h3>
98	<div>	98	<div>
99	<span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>	99	<span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
100	</div>	100	</div>
Lines 116-136 Link Here
116	<legend>Log in to your account:</legend>	116	<legend>Log in to your account:</legend>
117	<label for="userid">Login:</label><input type="text" id="userid" name="userid" />	117	<label for="userid">Login:</label><input type="text" id="userid" name="userid" />
118	<label for="password">Password:</label><input type="password" id="password" name="password" />	118	<label for="password">Password:</label><input type="password" id="password" name="password" />
119	<fieldset class="action">	119	<fieldset class="action">
120	<input type="submit" value="Log in" class="btn" />	120	<input type="submit" value="Log in" class="btn" />
		121	</fieldset>
		122	[% IF Koha.Preference( 'NoLoginInstructions' ) %]
		123	<div id="nologininstructions-main" class="nologininstructions">
		124	[% Koha.Preference( 'NoLoginInstructions' ) %]
		125	</div>
		126	[% END %]
		127	[% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
		128	<div id="forgotpassword-main" class="forgotpassword">
		129	<p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
		130	</div>
		131	[% END %]
		132	[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
		133	<div id="patronregistration-main" class="patronregistration">
		134	<p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
		135	</div>
		136	[% END %]
121	</fieldset>	137	</fieldset>
122	[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="patronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
123	</fieldset>
124	[% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
125	<div id="forgotpassword">
126	<a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
127	</div>
128	[% END %]
129	[% IF Koha.Preference( 'NoLoginInstructions' ) %]
130	<div id="nologininstructions-main">
131	[% Koha.Preference( 'NoLoginInstructions' ) %]
132	</div>
133	[% END %]
134	</form>	138	</form>
135	</div> <!-- /#login -->	139	</div> <!-- /#login -->
136	[% END # /casAuthentication %]	140	[% END # /casAuthentication %]
137	-