diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 4c49e38..476ea95 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -202,6 +202,12 @@ input[type=text]:read-only { fill: #009ade; } +.left{ + margin-right: auto; +} +.right{ + margin-left: auto; +} .leftside { grid-area: leftside; diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index d927d21..5f78ed1 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -8,11 +8,11 @@ method: :delete, onclick: {confirm: t(".confirm_delete")} %> <% end %> - -<%= labelled_form_for resource, url: registration_path(resource), html: {method: :patch} do |f| %> +
+ <%= labelled_form_for resource, url: registration_path(resource), html: {method: :patch} do |f| %> <%= f.email_field :email, size: 30, autofocus: true, autocomplete: "off" %> <% if f.object.pending_reconfirmation? %> - <%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1, + <%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1, hint: t(".unconfirmed_email_hint", timestamp: f.object.confirmation_sent_at.to_fs(:db_without_sec)) %> <% end %> @@ -20,11 +20,12 @@ <%= f.select :status, User.statuses, readonly: true %> <%= f.password_field :password, label: t(".new_password"), size: 30, - minlength: @minimum_password_length, autocomplete: "new-password", - hint: t(".blank_password_hint", - subhint: t("users.minimum_password_length", count: @minimum_password_length)) %> + minlength: @minimum_password_length, autocomplete: "new-password", + hint: t(".blank_password_hint").html_safe + ("
").html_safe + + t("users.minimum_password_length", count: @minimum_password_length) %> <%= 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" %> <%= f.submit t(".update") %> +
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 68b1520..779a682 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -85,7 +85,7 @@ en: unconfirmed_email_hint: (since %{timestamp}) new_password: New password password_confirmation: Retype new password - blank_password_hint: leave blank to keep unchanged
%{subhint} + blank_password_hint: leave blank to keep unchanged update: Update profile sessions: new: