Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 29458: Reorder login elements

Browse source 
Make masthead.inc modal and opac-auth follow the order of the login
elements on the homepage.

Test plan:
Enable prefs for reset password and self registration.
Fill additional contents for login instructions.
Logout on OPAC.
Click Login from your account on top bar.
Click Login button on the home page (right side, in the middle).
Verify that these two forms correspond with the home page login.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Bug 29458: (follow-up) Remove FIXME

With some help of Owen Leonard:
<oleonard> Regarding the <br/>, you can wrap the submit button in <fieldset class="action"></fieldset> instead.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Marcel de Rooy 2021-11-11 13:45:25 +00:00 committed by Fridolin Somers
parent e238644f75
commit a37b824d85
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
View file

@ -394,6 +394,9 @@
<fieldset class="brief">
<label for="muserid">Login:</label><input type="text" id="muserid" name="userid" autocomplete="off" />
<label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
<fieldset class="action">
<input type="submit" class="btn btn-primary" value="Log in" />
</fieldset>
[% IF OpacLoginInstructions %]
<div id="nologininstructions-modal" class="nologininstructions">
[% PROCESS koha_news_block news => OpacLoginInstructions %]
@ -412,11 +415,6 @@
</fieldset>
[% END %]
</div>
[% UNLESS Koha.Preference('opacShibOnly') %]
<div class="modal-footer">
<input type="submit" class="btn btn-primary" value="Log in" />
</div>
[% END %]
</form> <!-- /#auth -->
</div> <!-- /.modal-content -->
</div> <!-- /.modal-dialog -->

21
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
View file

@ -195,11 +195,6 @@
</fieldset>
</fieldset>
[% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
<div id="forgotpassword">
<a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
</div>
[% END %]
<div id="nologininstructions">
[% IF OpacLoginInstructions %]
[% PROCESS koha_news_block news => OpacLoginInstructions %]
@ -209,13 +204,19 @@
<h2>Don't have a library card?</h2>
<p>If you don't have a library card, stop by your local library to sign up.</p>
[% END # / IF OpacLoginInstructions %]
[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
<span id="registrationinstructions">
</div>
[% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
<div id="forgotpassword">
<a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
</div>
[% END %]
[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
<div id="registrationinstructions">
<span>
<a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a>
</span>
[% END %]
</div>
</div>
[% END %]
</form>
[% END # / IF !OPACShibOnly or SCO_login or SCI_login %]
[% END # / IF loginprompt %]