diff options
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/accounts/index.html.haml | 24 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/settings/edit.html.haml | 84 | ||||
| -rw-r--r-- | app/views/admin/subscriptions/_subscription.html.haml | 8 |
4 files changed, 56 insertions, 64 deletions
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml index 6d2849c32..07c8d1632 100644 --- a/app/views/admin/accounts/index.html.haml +++ b/app/views/admin/accounts/index.html.haml @@ -6,14 +6,30 @@ %strong= t('admin.accounts.location.title') %ul %li= filter_link_to t('admin.accounts.location.all'), local: nil, remote: nil - %li= filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil - %li= filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil + %li + - if selected? local: '1', remote: nil + = filter_link_to t('admin.accounts.location.local'), {local: nil, remote: nil}, {local: '1', remote: nil} + - else + = filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil + %li + - if selected? remote: '1', local: nil + = filter_link_to t('admin.accounts.location.remote'), {remote: nil, local: nil}, {remote: '1', local: nil} + - else + = filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil .filter-subset %strong= t('admin.accounts.moderation.title') %ul %li= filter_link_to t('admin.accounts.moderation.all'), silenced: nil, suspended: nil - %li= filter_link_to t('admin.accounts.moderation.silenced'), silenced: '1' - %li= filter_link_to t('admin.accounts.moderation.suspended'), suspended: '1' + %li + - if selected? silenced: '1' + = filter_link_to t('admin.accounts.moderation.silenced'), {silenced: nil}, {silenced: '1'} + - else + = filter_link_to t('admin.accounts.moderation.silenced'), silenced: '1' + %li + - if selected? suspended: '1' + = filter_link_to t('admin.accounts.moderation.suspended'), {suspended: nil}, {suspended: '1'} + - else + = filter_link_to t('admin.accounts.moderation.suspended'), suspended: '1' .filter-subset %strong= t('admin.accounts.order.title') %ul diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index 965b71180..44486cb42 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -4,11 +4,11 @@ .report-accounts .report-accounts__item %strong= t('admin.reports.reported_account') - = render 'authorize_follows/card', account: @report.target_account + = render 'authorize_follows/card', account: @report.target_account, admin: true = render 'admin/accounts/card', account: @report.target_account .report-accounts__item %strong= t('admin.reports.reported_by') - = render 'authorize_follows/card', account: @report.account + = render 'authorize_follows/card', account: @report.account, admin: true = render 'admin/accounts/card', account: @report.account %p diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index edb69e360..9f8a6640b 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -1,58 +1,32 @@ - content_for :page_title do = t('admin.settings.title') -= form_tag(admin_settings_path, method: :put, class: 'simple_form', style: 'max-width: 100%') do - %table.table - %thead - %tr - %th{ width: '40%' } - = t('admin.settings.setting') - %th - %tbody - %tr - %td - %strong= t('admin.settings.contact_information.label') - %td= text_field_tag :site_contact_username, - @settings['site_contact_username'].value, - place_holder: t('admin.settings.contact_information.username') - %tr - %td - %strong= t('admin.accounts.email') - %td= text_field_tag :site_contact_email, - @settings['site_contact_email'].value, - place_holder: t('admin.settings.contact_information.email') - %tr - %td - %strong= t('admin.settings.site_title') - %td= text_field_tag :site_title, - @settings['site_title'].value - %tr - %td - %strong= t('admin.settings.site_description.title') - %p= t('admin.settings.site_description.desc_html') - %td= text_area_tag :site_description, - @settings['site_description'].value, - rows: 8 - %tr - %td - %strong= t('admin.settings.site_description_extended.title') - %p= t('admin.settings.site_description_extended.desc_html') - %td= text_area_tag :site_extended_description, - @settings['site_extended_description'].value, - rows: 8 - %tr - %td - %strong= t('admin.settings.registrations.open.title') - %td - = select_tag :open_registrations, - options_for_select({ t('admin.settings.registrations.open.disabled') => false, t('admin.settings.registrations.open.enabled') => true }, @settings['open_registrations'].value) - %tr - %td - %strong= t('admin.settings.registrations.closed_message.title') - %p= t('admin.settings.registrations.closed_message.desc_html') - %td= text_area_tag :closed_registrations_message, - @settings['closed_registrations_message'].value, - rows: 8 - - .simple_form.actions - = button_tag t('generic.save_changes'), type: :submit, class: :btn += simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f| + .fields-group + = f.input :site_title, placeholder: t('admin.settings.site_title') + = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 8 } + = f.input :site_contact_username, placeholder: t('admin.settings.contact_information.username') + = f.input :site_contact_email, placeholder: t('admin.settings.contact_information.email') + + %hr/ + + .fields-group + = f.input :timeline_preview, as: :boolean, wrapper: :with_label, label: t('admin.settings.timeline_preview.title'), hint: t('admin.settings.timeline_preview.desc_html') + + .fields-group + = f.input :open_registrations, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.open.title'), hint: t('admin.settings.registrations.open.desc_html') + + .fields-group + = f.input :open_deletion, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.deletion.title'), hint: t('admin.settings.registrations.deletion.desc_html') + + .fields-group + = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, label: t('admin.settings.registrations.closed_message.title'), hint: t('admin.settings.registrations.closed_message.desc_html'), input_html: { rows: 8 } + + %hr/ + + .fields-group + = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 } + = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 } + + .actions + = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/admin/subscriptions/_subscription.html.haml b/app/views/admin/subscriptions/_subscription.html.haml index 024788e13..1dec8e396 100644 --- a/app/views/admin/subscriptions/_subscription.html.haml +++ b/app/views/admin/subscriptions/_subscription.html.haml @@ -7,10 +7,12 @@ - if subscription.confirmed? %i.fa.fa-check %td{ style: "color: #{subscription.expired? ? 'red' : 'inherit'};" } - = precede subscription.expired? ? '-' : '' do - = time_ago_in_words(subscription.expires_at) + %time.time-ago{ datetime: subscription.expires_at.iso8601, title: l(subscription.expires_at) } + = precede subscription.expired? ? '-' : '' do + = time_ago_in_words(subscription.expires_at) %td - if subscription.last_successful_delivery_at? - = l subscription.last_successful_delivery_at + %time.formatted{ datetime: subscription.last_successful_delivery_at.iso8601, title: l(subscription.last_successful_delivery_at) } + = l subscription.last_successful_delivery_at - else %i.fa.fa-times |