Skip to content

Commit 2b31811

Browse files
joemullmauromsl
authored andcommitted
fix #4962 Move login page notice to own box
1 parent 52a2040 commit 2b31811

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

src/static/admin/css/admin.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,8 @@ ul.menu {
967967

968968
.small-form {
969969
display: grid;
970-
grid-template-columns: min(calc(100vw - (2 * var(--small-inline-margin))), 24rem);
970+
column-gap: 2rem;
971+
grid-template-columns: repeat(auto-fit, min(calc(100vw - (2 * var(--small-inline-margin))), 24rem));
971972
justify-content: center;
972973
}
973974

src/templates/admin/core/accounts/login.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@
1414
</div>
1515
{% endblock %}
1616

17+
{% block aside %}
18+
{% if journal_settings.general.display_login_page_notice %}
19+
<div class="padding-block-1">
20+
<div class="card padding-block-2 padding-inline-2">
21+
{{ journal_settings.general.login_page_notice|safe }}
22+
</div>
23+
</div>
24+
{% endif %}
25+
{% endblock aside %}
26+
1727
{% block form_content %}
1828
{% include "admin/elements/forms/messages_in_callout.html" with form=form %}
1929
{% if settings.ENABLE_ORCID %}
@@ -35,9 +45,6 @@
3545
</a>
3646
</div>
3747
{% endif %}
38-
{% if journal_settings.general.display_login_page_notice %}
39-
{{ journal_settings.general.login_page_notice|safe }}
40-
{% endif %}
4148
{% include "admin/elements/forms/field.html" with field=form.user_name %}
4249
{% include "admin/elements/forms/field.html" with field=form.user_pass %}
4350
{{ form.captcha }}

src/templates/admin/core/small_form.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
{% block body %}
1717
<div class="small-form">
18+
{% block aside %}
19+
{% endblock aside %}
1820
<div class="padding-block-1">
1921
<form method="POST">
2022
{% csrf_token %}

0 commit comments

Comments
 (0)