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-20240422

Browse source
This commit is contained in:
KMY 2024-04-22 08:58:37 +09:00
commit 44f4a93430
100 changed files with 770 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/views/admin/announcements/_form.html.haml Normal file
View file

@ -0,0 +1,28 @@
.fields-group
= form.input :starts_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= form.input :ends_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
.fields-group
= form.input :all_day,
as: :boolean,
wrapper: :with_label
.fields-group
= form.input :text,
wrapper: :with_block_label
- unless form.object.published?
.fields-group
= form.input :scheduled_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label

35
app/views/admin/announcements/edit.html.haml
View file

@ -1,37 +1,12 @@
- content_for :page_title do
= t('.title')
= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |form|
= render 'shared/error_messages', object: @announcement
.fields-group
= f.input :starts_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= f.input :ends_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
.fields-group
= f.input :all_day,
as: :boolean,
wrapper: :with_label
.fields-group
= f.input :text,
wrapper: :with_block_label
- unless @announcement.published?
.fields-group
= f.input :scheduled_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
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

36
app/views/admin/announcements/new.html.haml
View file

@ -1,38 +1,12 @@
- content_for :page_title do
= t('.title')
= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |form|
= render 'shared/error_messages', object: @announcement
.fields-group
= f.input :starts_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= f.input :ends_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
.fields-group
= f.input :all_day,
as: :boolean,
wrapper: :with_label
.fields-group
= f.input :text,
wrapper: :with_block_label
.fields-group
= f.input :scheduled_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= render form
.actions
= f.button :button,
t('.create'),
type: :submit
= form.button :button,
t('.create'),
type: :submit

4
app/views/settings/imports/index.html.haml
View file

@ -49,7 +49,7 @@
%tr
%td= t("imports.types.#{import.type}")
%td
- if import.unconfirmed?
- if import.state_unconfirmed?
= link_to t("imports.states.#{import.state}"), settings_import_path(import)
- else
= t("imports.states.#{import.state}")
@ -59,7 +59,7 @@
%td
- num_failed = import.processed_items - import.imported_items
- if num_failed.positive?
- if import.finished?
- if import.state_finished?
= link_to num_failed, failures_settings_import_path(import, format: 'csv')
- else
= num_failed