Merge remote-tracking branch 'parent/main' into upstream-20241001
This commit is contained in:
commit
133a263f79
222 changed files with 1834 additions and 720 deletions
|
@ -25,7 +25,7 @@
|
|||
.fields-group
|
||||
= f.input :site_short_description,
|
||||
as: :text,
|
||||
input_html: { rows: 2, maxlength: 200 },
|
||||
input_html: { rows: 2, maxlength: Form::AdminSettings::DESCRIPTION_LIMIT },
|
||||
wrapper: :with_block_label
|
||||
|
||||
.fields-row
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
.batch-table
|
||||
.batch-table__body
|
||||
- if @tags.empty?
|
||||
= nothing_here 'nothing-here--under-tabs'
|
||||
= nothing_here 'nothing-here--under-tabs nothing-here--no-toolbar'
|
||||
- else
|
||||
= render partial: 'tag', collection: @tags
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@
|
|||
as: :check_boxes,
|
||||
collection_wrapper_tag: 'ul',
|
||||
item_wrapper_tag: 'li',
|
||||
disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
|
||||
disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) },
|
||||
label_method: ->(event) { tag.samp(event) }
|
||||
|
||||
.fields-group
|
||||
= form.input :template,
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
= f.simple_fields_for :account do |ff|
|
||||
= ff.input :username,
|
||||
append: "@#{site_hostname}",
|
||||
input_html: { 'aria-label': t('simple_form.labels.defaults.username'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 },
|
||||
input_html: { 'aria-label': t('simple_form.labels.defaults.username'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: Account::USERNAME_LENGTH_LIMIT },
|
||||
label: false,
|
||||
required: true,
|
||||
wrapper: :with_label
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
= simple_form_for(@appeal, url: disputes_strike_appeal_path(@strike)) do |f|
|
||||
.fields-group
|
||||
= f.input :text, wrapper: :with_label, input_html: { maxlength: 500 }
|
||||
= f.input :text, wrapper: :with_label, input_html: { maxlength: Appeal::TEXT_LENGTH_LIMIT }
|
||||
|
||||
.actions
|
||||
= f.button :button, t('disputes.strikes.appeals.submit'), type: :submit
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
.fields-row
|
||||
.fields-row__column.fields-row__column-6
|
||||
.fields-group
|
||||
= f.input :display_name, wrapper: :with_block_label, input_html: { maxlength: 30, data: { default: @account.username } }
|
||||
= f.input :display_name, wrapper: :with_block_label, input_html: { maxlength: Account::DISPLAY_NAME_LENGTH_LIMIT, data: { default: @account.username } }
|
||||
|
||||
.fields-group
|
||||
= f.input :note, wrapper: :with_block_label, input_html: { maxlength: 500, rows: 8 }
|
||||
= f.input :note, wrapper: :with_block_label, input_html: { maxlength: Account::NOTE_LENGTH_LIMIT, rows: 8 }
|
||||
|
||||
= f.simple_fields_for :settings, current_user.settings do |ff|
|
||||
.fields-group
|
||||
|
@ -34,8 +34,8 @@
|
|||
|
||||
= f.simple_fields_for :fields do |fields_f|
|
||||
.row
|
||||
= fields_f.input :name, placeholder: fields_f.index.zero? ? t("simple_form.labels.account.fields.examples.name_#{fields_f.index + 1}") : t('simple_form.labels.account.fields.name'), input_html: { maxlength: 255 }
|
||||
= fields_f.input :value, placeholder: fields_f.index.zero? ? t("simple_form.labels.account.fields.examples.value_#{fields_f.index + 1}") : t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }
|
||||
= fields_f.input :name, placeholder: fields_f.index.zero? ? t("simple_form.labels.account.fields.examples.name_#{fields_f.index + 1}") : t('simple_form.labels.account.fields.name'), input_html: { maxlength: Account::Field::MAX_CHARACTERS_LOCAL }
|
||||
= fields_f.input :value, placeholder: fields_f.index.zero? ? t("simple_form.labels.account.fields.examples.value_#{fields_f.index + 1}") : t('simple_form.labels.account.fields.value'), input_html: { maxlength: Account::Field::MAX_CHARACTERS_LOCAL }
|
||||
|
||||
.fields-row
|
||||
.fields-row__column.fields-row__column-6
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
%td
|
||||
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
|
||||
%tr
|
||||
%td.email-header-card-banner-td{ height: 140, background: full_asset_url(instance_presenter.thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png')) }
|
||||
%td.email-header-card-banner-td{ background: full_asset_url(instance_presenter.thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png')) }
|
||||
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
|
||||
%tr
|
||||
%td.email-header-card-body-td
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue