Update Bootstrap from v4 to v5

This commit is contained in:
Sebastian Serth
2022-08-11 19:10:49 +02:00
parent 6803efc023
commit 8a055a0d68
84 changed files with 559 additions and 566 deletions

View File

@@ -1,15 +1,15 @@
= form_for(@user) do |f|
= render('shared/form_errors', object: @user)
.form-group
= f.label(:consumer_id)
.mb-3
= f.label(:consumer_id, class: 'form-label')
= f.collection_select(:consumer_id, Consumer.all.sort_by(&:name), :id, :name, {}, class: 'form-control')
.form-group
= f.label(:email)
.mb-3
= f.label(:email, class: 'form-label')
= f.email_field(:email, class: 'form-control', required: true)
.form-group
= f.label(:name)
.mb-3
= f.label(:name, class: 'form-label')
= f.text_field(:name, class: 'form-control', required: true)
.form-group
= f.label(:role)
.mb-3
= f.label(:role, class: 'form-label')
= f.select(:role, User::ROLES.map { |role| [t("users.roles.#{role}"), role] }, {selected: @user.role || 'teacher'}, class: 'form-control')
.actions = render('shared/submit_button', f: f, object: @user)

View File

@@ -2,11 +2,11 @@ h1 = t('.headline')
= form_for(@user, url: activate_internal_user_path) do |f|
= render('shared/form_errors', object: @user)
.form-group
= f.label(:password)
.mb-3
= f.label(:password, class: 'form-label')
= f.password_field(:password, class: 'form-control', required: true)
.form-group
= f.label(:password_confirmation)
.mb-3
= f.label(:password_confirmation, class: 'form-label')
= f.password_field(:password_confirmation, class: 'form-control', required: true)
= f.hidden_field(:activation_token)
.actions = submit_tag(t('.submit'), class: 'btn btn-primary')

View File

@@ -1,7 +1,7 @@
h1 = t('.headline')
= form_tag do
.form-group
.mb-3
= label_tag(:email, t('activerecord.attributes.internal_user.email'))
= email_field_tag(:email, params[:email], autofocus: true, class: 'form-control', required: true)
.actions = submit_tag(t('.submit'), class: 'btn btn-primary')

View File

@@ -1,16 +1,15 @@
h1 = InternalUser.model_name.human(count: 2)
= render(layout: 'shared/form_filters') do |f|
.row.px-3
.form-group
= f.label(:consumer_id_eq, t('activerecord.attributes.internal_user.consumer'), class: 'sr-only')
= f.collection_select(:consumer_id_eq, Consumer.with_internal_users, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.internal_user.consumer'))
.form-group
= f.label(:email_cont, t('activerecord.attributes.internal_user.email'), class: 'sr-only')
= f.search_field(:email_cont, class: 'form-control', placeholder: t('activerecord.attributes.internal_user.email'))
.form-group
= f.label(:role_eq, t('activerecord.attributes.internal_user.role'), class: 'sr-only')
= f.select(:role_eq, User::ROLES.map { |role| [t("users.roles.#{role}"), role] }, {}, class: 'form-control', prompt: t('activerecord.attributes.internal_user.role'))
.col-auto
= f.label(:consumer_id_eq, t('activerecord.attributes.internal_user.consumer'), class: 'visually-hidden form-label')
= f.collection_select(:consumer_id_eq, Consumer.with_internal_users, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.internal_user.consumer'))
.col-sm
= f.label(:email_cont, t('activerecord.attributes.internal_user.email'), class: 'visually-hidden form-label')
= f.search_field(:email_cont, class: 'form-control', placeholder: t('activerecord.attributes.internal_user.email'))
.col-auto
= f.label(:role_eq, t('activerecord.attributes.internal_user.role'), class: 'visually-hidden form-label')
= f.select(:role_eq, User::ROLES.map { |role| [t("users.roles.#{role}"), role] }, {}, class: 'form-control', prompt: t('activerecord.attributes.internal_user.role'))
.table-responsive
table.table.mt-4

View File

@@ -2,11 +2,11 @@ h1 = t('.headline')
= form_for(@user, url: reset_password_internal_user_path) do |f|
= render('shared/form_errors', object: @user)
.form-group
= f.label(:password)
.mb-3
= f.label(:password, class: 'form-label')
= f.password_field(:password, class: 'form-control', required: true)
.form-group
= f.label(:password_confirmation)
.mb-3
= f.label(:password_confirmation, class: 'form-label')
= f.password_field(:password_confirmation, class: 'form-control', required: true)
= f.hidden_field(:reset_password_token)
.actions = submit_tag(t('.submit'), class: 'btn btn-primary')