gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20240503

Browse source
This commit is contained in:
KMY 2024-05-03 11:17:22 +09:00
commit 80789a603a
193 changed files with 1871 additions and 1061 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/admin/rules/_form.html.haml Normal file
View file

@ -0,0 +1,7 @@
.fields-group
= form.input :text,
wrapper: :with_block_label
.fields-group
= form.input :hint,
wrapper: :with_block_label

10
app/views/admin/rules/edit.html.haml
View file

@ -1,14 +1,10 @@
- content_for :page_title do
= t('admin.rules.edit')
= simple_form_for @rule, url: admin_rule_path(@rule) do |f|
= simple_form_for @rule, url: admin_rule_path(@rule) do |form|
= render 'shared/error_messages', object: @rule
.fields-group
= f.input :text, wrapper: :with_block_label
.fields-group
= f.input :hint, wrapper: :with_block_label
= render form
.actions
= f.button :button, t('generic.save_changes'), type: :submit
= form.button :button, t('generic.save_changes'), type: :submit

10
app/views/admin/rules/index.html.haml
View file

@ -6,17 +6,13 @@
%hr.spacer/
- if can? :create, :rule
= simple_form_for @rule, url: admin_rules_path do |f|
= simple_form_for @rule, url: admin_rules_path do |form|
= render 'shared/error_messages', object: @rule
.fields-group
= f.input :text, wrapper: :with_block_label
.fields-group
= f.input :hint, wrapper: :with_block_label
= render form
.actions
= f.button :button, t('admin.rules.add_new'), type: :submit
= form.button :button, t('admin.rules.add_new'), type: :submit
%hr.spacer/

7
app/views/admin/warning_presets/_form.html.haml Normal file
View file

@ -0,0 +1,7 @@
.fields-group
= form.input :title,
wrapper: :with_block_label
.fields-group
= form.input :text,
wrapper: :with_block_label

10
app/views/admin/warning_presets/edit.html.haml
View file

@ -1,14 +1,10 @@
- content_for :page_title do
= t('admin.warning_presets.edit_preset')
= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |form|
= render 'shared/error_messages', object: @warning_preset
.fields-group
= f.input :title, wrapper: :with_block_label
.fields-group
= f.input :text, wrapper: :with_block_label
= render form
.actions
= f.button :button, t('generic.save_changes'), type: :submit
= form.button :button, t('generic.save_changes'), type: :submit

10
app/views/admin/warning_presets/index.html.haml
View file

@ -2,17 +2,13 @@
= t('admin.warning_presets.title')
- if can? :create, :account_warning_preset
= simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
= simple_form_for @warning_preset, url: admin_warning_presets_path do |form|
= render 'shared/error_messages', object: @warning_preset
.fields-group
= f.input :title, wrapper: :with_block_label
.fields-group
= f.input :text, wrapper: :with_block_label
= render form
.actions
= f.button :button, t('admin.warning_presets.add_new'), type: :submit
= form.button :button, t('admin.warning_presets.add_new'), type: :submit
%hr.spacer/

2
app/views/admin/webhooks/edit.html.haml
View file

@ -2,6 +2,6 @@
= t('admin.webhooks.edit')
= simple_form_for @webhook, url: admin_webhook_path(@webhook) do |form|
= render partial: 'form', object: form
= render form
.actions
= form.button :button, t('generic.save_changes'), type: :submit

2
app/views/admin/webhooks/new.html.haml
View file

@ -2,6 +2,6 @@
= t('admin.webhooks.new')
= simple_form_for @webhook, url: admin_webhooks_path do |form|
= render partial: 'form', object: form
= render form
.actions
= form.button :button, t('admin.webhooks.add_new'), type: :submit

2
app/views/filters/_filter_fields.html.haml
View file

@ -6,7 +6,7 @@
wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
= f.input :expires_in,
collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week, 2.weeks, 1.month, 3.months].map(&:to_i),
collection: CustomFilter::EXPIRATION_DURATIONS.map(&:to_i),
include_blank: I18n.t('invites.expires_in_prompt'),
label_method: ->(i) { I18n.t("invites.expires_in.#{i}") },
wrapper: :with_label