diff options
| author | Starfall <us@starfall.systems> | 2021-03-04 23:55:42 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-03-04 23:55:42 -0600 |
| commit | fe6381b9acc28cd610b032160de2952e1fdefc86 (patch) | |
| tree | ad1ba10427d5d792d3ba797479528f01e51404a5 /app/views | |
| parent | 033b1b5b900babc9b068ddad0ae644c5f15e9ffe (diff) | |
| parent | f4abf8e7829c6a5b952dea6fb9ad01b6b3601f95 (diff) | |
Merge remote-tracking branch 'glitchsoc/main' into main
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/about/more.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/account_actions/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 45675224b..1cf194522 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -42,7 +42,7 @@ .column-3 = render 'application/flashes' - - if @contents.blank? && (!display_blocks? || @blocks&.empty?) + - if @contents.blank? && @rules.empty? && (!display_blocks? || @blocks&.empty?) = nothing_here - else .box-widget diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml index aa88b1448..ca4f9663f 100644 --- a/app/views/admin/account_actions/new.html.haml +++ b/app/views/admin/account_actions/new.html.haml @@ -5,7 +5,7 @@ = f.input :report_id, as: :hidden .fields-group - = f.input :type, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { I18n.t("simple_form.labels.admin_account_action.types.#{type}")}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct) + = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { safe_join([I18n.t("simple_form.labels.admin_account_action.types.#{type}"), content_tag(:span, I18n.t("simple_form.hints.admin_account_action.types.#{type}"), class: 'hint')])}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct) - if @account.local? %hr.spacer/ |