Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from Repo master to my master. #3

Merged
Karavel merged 1 commits from fixin.me/fixin.me:master into master 2024-05-18 09:32:12 +02:00
Conversation 0 Commits 1 Files Changed 2 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/users/registrations/edit.html.erb
View File

@ -1,15 +1,15 @@
<% content_for :navigation, flush: true do %> <% content_for :navigation, flush: true do %>
<div class="left"> <%= image_link_to t(:back), 'arrow-left-bold-outline',
<%= image_link_to t(:back), 'arrow-left-bold-outline', request.referer.present? ? :back : root_path %>
request.referer.present? ? :back : root_url %>
</div>
<div class="right">
<%= image_button_to t(".delete"), "account-remove-outline", user_registration_path,
method: :delete, onclick: {confirm: t(".confirm_delete")} %>
</div>
<% end %> <% end %>
<%= labelled_form_for resource, url: registration_path(resource), html: {method: :patch} do |f| %> <div class="rightside buttongrid">
<%= image_button_to t(".delete"), "account-remove-outline", user_registration_path,
method: :delete, form_class: 'tools', onclick: {confirm: t(".confirm_delete")} %>
</div>
<%= labelled_form_for resource, url: registration_path(resource),
html: {method: :patch, class: 'main'} do |f| %>
<%= f.email_field :email, size: 30, autofocus: true, autocomplete: "off" %> <%= f.email_field :email, size: 30, autofocus: true, autocomplete: "off" %>
<% if f.object.pending_reconfirmation? %> <% if f.object.pending_reconfirmation? %>
<%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1, <%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1,
@ -21,7 +21,7 @@
<%= f.password_field :password, label: t(".new_password"), size: 30, <%= f.password_field :password, label: t(".new_password"), size: 30,
minlength: @minimum_password_length, autocomplete: "new-password", minlength: @minimum_password_length, autocomplete: "new-password",
hint: t(".blank_password_hint", hint: t(".blank_password_hint_html",
subhint: t("users.minimum_password_length", count: @minimum_password_length)) %> subhint: t("users.minimum_password_length", count: @minimum_password_length)) %>
<%= f.password_field :password_confirmation, label: t(".password_confirmation"), <%= f.password_field :password_confirmation, label: t(".password_confirmation"),
size: 30, minlength: @minimum_password_length, autocomplete: "off" %> size: 30, minlength: @minimum_password_length, autocomplete: "off" %>

2
config/locales/en.yml
View File

@ -85,7 +85,7 @@ en:
unconfirmed_email_hint: (since %{timestamp}) unconfirmed_email_hint: (since %{timestamp})
new_password: New password new_password: New password
password_confirmation: Retype new password password_confirmation: Retype new password
blank_password_hint: leave blank to keep unchanged<br>%{subhint} blank_password_hint_html: leave blank to keep unchanged<br>%{subhint}
update: Update profile update: Update profile
sessions: sessions:
new: new: