forked from External/greenlight
Fix "for" attribute for label elements (#1488)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
This commit is contained in:
parent
db518c3620
commit
ed7bec04b0
|
@ -34,7 +34,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 <%="form-disable" if edit_disabled %>">
|
<div class="col-lg-9 <%="form-disable" if edit_disabled %>">
|
||||||
<%= form_with model: @selected_role, url: admin_update_role_path(@selected_role.id), method: :post do |f| %>
|
<%= form_with model: @selected_role, url: admin_update_role_path(@selected_role.id), method: :post do |f| %>
|
||||||
<%= f.label t('administrator.roles.name'), class: "form-label" %>
|
<%= f.label :name, t('administrator.roles.name'), class: "form-label" %>
|
||||||
<%= f.text_field :name, class: 'form-control mb-3', value: translated_role_name(@selected_role), readonly: edit_disabled || @selected_role.name == "user" || @selected_role.name == "admin", required: true %>
|
<%= f.text_field :name, class: 'form-control mb-3', value: translated_role_name(@selected_role), readonly: edit_disabled || @selected_role.name == "user" || @selected_role.name == "admin", required: true %>
|
||||||
|
|
||||||
<%= f.hidden_field :colour, id: "role-colour", value: role_colour(@selected_role) %>
|
<%= f.hidden_field :colour, id: "role-colour", value: role_colour(@selected_role) %>
|
||||||
|
|
|
@ -25,11 +25,11 @@
|
||||||
|
|
||||||
<%= hidden_field_tag :email, @user.email %>
|
<%= hidden_field_tag :email, @user.email %>
|
||||||
|
|
||||||
<%= f.label t('reset_password.password'), class: "form-label" %>
|
<%= f.label :password, t('reset_password.password'), class: "form-label" %>
|
||||||
<%= f.password_field :password, class: 'form-control' %>
|
<%= f.password_field :password, class: 'form-control' %>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<%= f.label t('reset_password.confirm'), class: "form-label" %>
|
<%= f.label :password_confirmation, t('reset_password.confirm'), class: "form-label" %>
|
||||||
<%= f.password_field :password_confirmation, class: 'form-control' %>
|
<%= f.password_field :password_confirmation, class: 'form-control' %>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body background">
|
<div class="card-body background">
|
||||||
<%= form_for(:password_reset, url: password_resets_path) do |f| %>
|
<%= form_for(:password_reset, url: password_resets_path) do |f| %>
|
||||||
<%= f.label t("forgot_password.email"), class: "form-label" %>
|
<%= f.label :email, t("forgot_password.email"), class: "form-label" %>
|
||||||
<%= f.email_field :email, class: "form-control" %>
|
<%= f.email_field :email, class: "form-control" %>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
|
@ -40,22 +40,22 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= form_for @user, url: create_user_path, method: :post do |f| %>
|
<%= form_for @user, url: create_user_path, method: :post do |f| %>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<%= f.label t("settings.account.fullname"), class: "form-label" %>
|
<%= f.label :name, t("settings.account.fullname"), class: "form-label" %>
|
||||||
<%= f.text_field :name, class: "form-control #{form_is_invalid?(@user, :name)}", placeholder: t("settings.account.fullname") %>
|
<%= f.text_field :name, class: "form-control #{form_is_invalid?(@user, :name)}", placeholder: t("settings.account.fullname") %>
|
||||||
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:name).first %></div>
|
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:name).first %></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<%= f.label t("email"), class: "form-label" %>
|
<%= f.label :email, t("email"), class: "form-label" %>
|
||||||
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: t("email") %>
|
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: t("email") %>
|
||||||
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:email).first %></div>
|
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:email).first %></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<%= f.label t("password"), class: "form-label" %>
|
<%= f.label :password, t("password"), class: "form-label" %>
|
||||||
<%= f.password_field :password, class: "form-control #{form_is_invalid?(@user, :password)}", placeholder: t("password") %>
|
<%= f.password_field :password, class: "form-control #{form_is_invalid?(@user, :password)}", placeholder: t("password") %>
|
||||||
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password).first %></div>
|
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password).first %></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<%= f.label t("signup.password_confirm"), class: "form-label" %>
|
<%= f.label :password_confirmation, t("signup.password_confirm"), class: "form-label" %>
|
||||||
<%= f.password_field :password_confirmation, class: "form-control #{form_is_invalid?(@user, :password_confirmation)}", placeholder: t("signup.password_confirm") %>
|
<%= f.password_field :password_confirmation, class: "form-control #{form_is_invalid?(@user, :password_confirmation)}", placeholder: t("signup.password_confirm") %>
|
||||||
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password_confirmation).first %></div>
|
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password_confirmation).first %></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,28 +18,27 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
<%= f.label t("settings.account.fullname"), class: "form-label" %>
|
<%= f.label :name, t("settings.account.fullname"), class: "form-label" %>
|
||||||
<div class="input-icon">
|
<div class="input-icon">
|
||||||
<%= f.text_field :name, class: "form-control #{form_is_invalid?(@user, :name)}", placeholder: t("settings.account.fullname") %>
|
<%= f.text_field :name, class: "form-control #{form_is_invalid?(@user, :name)}", placeholder: t("settings.account.fullname") %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
<%= f.label t("email"), class: "form-label" %>
|
<%= f.label :email, t("email"), class: "form-label" %>
|
||||||
<div class="input-icon">
|
<div class="input-icon">
|
||||||
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: t("email"), readonly: !@user.greenlight_account? %>
|
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: t("email"), readonly: !@user.greenlight_account? %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<%= f.label t("settings.account.provider"), class: "form-label" %>
|
<%= f.label :provider, t("settings.account.provider"), class: "form-label" %>
|
||||||
<%= f.text_field :provider, class: "form-control", readonly: "" %>
|
<%= f.text_field :provider, class: "form-control", readonly: "" %>
|
||||||
<br>
|
<br>
|
||||||
<%= f.label t("settings.account.language"), class: "form-label" %>
|
<%= f.label :language, t("settings.account.language"), class: "form-label" %>
|
||||||
<%= f.select :language, language_options, {}, { class: "form-control custom-select" } %>
|
<%= f.select :language, language_options, {}, { class: "form-control custom-select" } %>
|
||||||
|
|
||||||
<%= f.label t("settings.account.roles"), class: "form-label mt-5" %>
|
<%= f.label :roles, t("settings.account.roles"), class: "form-label mt-5" %>
|
||||||
|
|
||||||
<% if current_user.role.get_permission("can_manage_users") %>
|
<% if current_user.role.get_permission("can_manage_users") %>
|
||||||
<select id="role-dropdown" class="selectpicker show-tick" >
|
<select id="role-dropdown" class="selectpicker show-tick" >
|
||||||
<% role_options.each do |role| %>
|
<% role_options.each do |role| %>
|
||||||
|
@ -53,7 +52,8 @@
|
||||||
<%= translated_role_name(@user.role) %>
|
<%= translated_role_name(@user.role) %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= f.label t("settings.account.image"), class: "form-label mt-5" %>
|
|
||||||
|
<%= f.label :image, t("settings.account.image"), class: "form-label mt-5" %>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-2">
|
<div class="col-2">
|
||||||
<% if @user.image.blank? %>
|
<% if @user.image.blank? %>
|
||||||
|
|
Loading…
Reference in New Issue