maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[15-minute fix] Update password reset wording (#14125)

Browse source 
* Update password reset wording

* Update app/views/users/_account_set_password.html.erb

Co-authored-by: Ridhwana <Ridhwana.Khan16@gmail.com>

Co-authored-by: Ridhwana <Ridhwana.Khan16@gmail.com>
This commit is contained in:
Michael Kohl 2021-07-05 09:33:51 +07:00 • committed by GitHub
parent 5fcb5cd2d9
commit 96cf8f90e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/views/users/_account_set_password.html.erb
View file

@ -1,27 +1,29 @@
<div class="crayons-card crayons-card--content-rows">
<header>
<h2 class="crayons-subtitle-1">
Set new password
</h2>
<p class="color-base-70">
As an alternative to signing in via linked social accounts, you may create a password.
If you signed up with a social media account, please <a href="<%= new_user_password_path %>">reset the password</a> for your primary email address (<%= current_user.email %>) first.
</p>
</header>
<%= form_with(url: user_update_password_path, data: { testid: "update-password-form" }) do |f| %>
<div class="crayons-field mb-4">
<%= f.label :current_password, class: "crayons-field__label" %>
<%= f.password_field :current_password, class: "crayons-textfield", autocomplete: "off", required: true %>
</div>
<div class="crayons-field mb-4">
<%= f.label :password, class: "crayons-field__label" %>
<%= f.password_field :password, class: "crayons-textfield", autocomplete: "off", required: true %>
</div>
<div class="crayons-field mb-4">
<%= f.label :password_confirmation, "Confirm new password", class: "crayons-field__label" %>
<%= f.password_field :password_confirmation, autocomplete: "off", class: "crayons-textfield", required: true %>
</div>
<button class="crayons-btn crayon-btn--secondary" type="submit">Set New Password</button>
<% end %>
<div class="crayons-card crayons-card--content-rows">
<header>
<h2 class="crayons-subtitle-1">
Set new password
</h2>
<p class="color-base-70">
If your account was created using social account authentication, you may prefer to add an email
log in. If you signed up with a social media account, <a href="<%= new_user_password_path %>">
please reset the password</a> for your primary email address (<%= current_user.email %>) in
order to enable this. Please note that email login is in addition to social login rather than
a replacement for it, so your authenticated social account will continue to be linked to your
account.
</header>
<%= form_with(url: user_update_password_path, data: { testid: "update-password-form" }) do |f| %>
<div class="crayons-field mb-4">
<%= f.label :current_password, class: "crayons-field__label" %>
<%= f.password_field :current_password, class: "crayons-textfield", autocomplete: "off", required: true %>
</div>
<div class="crayons-field mb-4">
<%= f.label :password, class: "crayons-field__label" %>
<%= f.password_field :password, class: "crayons-textfield", autocomplete: "off", required: true %>
</div>
<div class="crayons-field mb-4">
<%= f.label :password_confirmation, "Confirm new password", class: "crayons-field__label" %>
<%= f.password_field :password_confirmation, autocomplete: "off", class: "crayons-textfield", required: true %>
</div>
<button class="crayons-btn crayon-btn--secondary" type="submit">Set New Password</button>
<% end %>
</div>