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

Merge pull request 'issue4' (#2) from issue4 into master

Browse Source 
Reviewed-on: #2
This commit is contained in:
Karavel 2024-05-15 00:17:02 +02:00
commit de8f291cee
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/application.css
View File

@ -202,7 +202,6 @@ input[type=text]:read-only {
fill: #009ade; fill: #009ade;
} }
.leftside { .leftside {
grid-area: leftside; grid-area: leftside;
} }
@ -460,6 +459,9 @@ table.items select:focus-visible {
.extendedright { .extendedright {
margin-right: auto; margin-right: auto;
} }
.extendedleft {
margin-left: auto;
}
[disabled] { [disabled] {
border-color: var(--color-border-gray) !important; border-color: var(--color-border-gray) !important;
color: var(--color-border-gray) !important; color: var(--color-border-gray) !important;

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

@ -1,18 +1,18 @@
<div class="leftside">
<% 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_url %> 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 %>
</div>
<%= labelled_form_for resource, url: registration_path(resource), html: {method: :patch} do |f| %> <div class="rightside">
<%= image_button_to t(".delete"), "account-remove-outline", user_registration_path,
method: :delete, :class => "extendedleft", onclick: {confirm: t(".confirm_delete")} %>
</div>
<div class="main">
<%= labelled_form_for resource, url: registration_path(resource), html: {method: :patch} 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,
hint: t(".unconfirmed_email_hint", hint: t(".unconfirmed_email_hint",
timestamp: f.object.confirmation_sent_at.to_fs(:db_without_sec)) %> timestamp: f.object.confirmation_sent_at.to_fs(:db_without_sec)) %>
<% end %> <% end %>
@ -20,11 +20,12 @@
<%= f.select :status, User.statuses, readonly: true %> <%= f.select :status, User.statuses, readonly: true %>
<%= 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_safe + ("<br>").html_safe +
subhint: t("users.minimum_password_length", count: @minimum_password_length)) %> 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" %>
<%= f.submit t(".update") %> <%= f.submit t(".update") %>
</div>
<% end %> <% end %>

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: leave blank to keep unchanged
update: Update profile update: Update profile
sessions: sessions:
new: new: