diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-13 01:09:02 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-13 01:09:02 +0000 |
| commit | 7c96ee7815c216d6ac3b748d7dd6959376d3914e (patch) | |
| tree | fd36bade02afa1536198e7f3beafb208973b68c5 /app/views/settings | |
| parent | f9275cb762a311cbf298b3929552a153703c0726 (diff) | |
| parent | 70d346ea951ebfa002225759310d72882a435a5c (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index bb267db8a..751a6e50b 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -44,7 +44,8 @@ .fields-group = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label - = f.input :setting_display_sensitive_media, as: :boolean, wrapper: :with_label + = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_display_media_#{item}"), content_tag(:span, t("simple_form.hints.defaults.setting_display_media_#{item}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label |