Skip to content

Commit 618be1f

Browse files
authored
Move 'show password' widget on Login UI (#18661)
* Move 'show password' widget on Login UI * Update translations * Lint it!
1 parent 044b98b commit 618be1f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

warehouse/locale/messages.pot

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ msgid "Sponsors"
11401140
msgstr ""
11411141

11421142
#: warehouse/templates/accounts/login.html:7
1143-
#: warehouse/templates/accounts/login.html:80 warehouse/templates/base.html:44
1143+
#: warehouse/templates/accounts/login.html:87 warehouse/templates/base.html:44
11441144
#: warehouse/templates/base.html:78
11451145
msgid "Log in"
11461146
msgstr ""
@@ -1603,18 +1603,18 @@ msgstr ""
16031603
msgid "(required)"
16041604
msgstr ""
16051605

1606-
#: warehouse/templates/accounts/login.html:62
1606+
#: warehouse/templates/accounts/login.html:69
16071607
#: warehouse/templates/re-auth.html:55
16081608
msgid "Your password"
16091609
msgstr ""
16101610

1611-
#: warehouse/templates/accounts/login.html:88
1611+
#: warehouse/templates/accounts/login.html:66
16121612
#: warehouse/templates/manage/manage_base.html:457
16131613
#: warehouse/templates/re-auth.html:82
16141614
msgid "Show password"
16151615
msgstr ""
16161616

1617-
#: warehouse/templates/accounts/login.html:92
1617+
#: warehouse/templates/accounts/login.html:91
16181618
#: warehouse/templates/re-auth.html:86
16191619
msgid "Forgot password?"
16201620
msgstr ""

warehouse/templates/accounts/login.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,20 @@ <h1 class="page-title">{% trans title=title %}Log in to {{ title }}{% endtrans %
5151
</div>
5252
</div>
5353
<div data-controller="password" class="form-group">
54-
<div>
54+
<div class="split-layout">
5555
<label for="password" class="form-group__label">
5656
{% trans %}Password{% endtrans %}
5757
{% if form.password.flags.required %}
5858
<span class="form-group__required">{% trans %}(required){% endtrans %}</span>
5959
{% endif %}
6060
</label>
61+
<label for="show-password">
62+
<input data-action="change->password#togglePasswords"
63+
data-password-target="showPassword"
64+
id="show-password"
65+
type="checkbox">
66+
&nbsp;{% trans %}Show password{% endtrans %}
67+
</label>
6168
</div>
6269
{{ form.password(placeholder=gettext("Your password") ,
6370
required="required",
@@ -80,17 +87,10 @@ <h1 class="page-title">{% trans title=title %}Log in to {{ title }}{% endtrans %
8087
value="{% trans %}Log in{% endtrans %}"
8188
class="button button--primary">
8289
</div>
83-
<label for="show-password">
84-
<input data-action="change->password#togglePasswords"
85-
data-password-target="showPassword"
86-
id="show-password"
87-
type="checkbox">
88-
&nbsp;{% trans %}Show password{% endtrans %}
89-
</label>
90+
<span>
91+
<a href="{{ request.route_url('accounts.request-password-reset') }}">{% trans %}Forgot password?{% endtrans %}</a>
92+
</span>
9093
</div>
91-
<span>
92-
<a href="{{ request.route_url('accounts.request-password-reset') }}">{% trans %}Forgot password?{% endtrans %}</a>
93-
</span>
9494
</div>
9595
</div>
9696
</form>

0 commit comments

Comments
 (0)