2019-06-07 10:39:24 +09:00
|
|
|
- content_for :page_title do
|
|
|
|
|
= t('settings.appearance')
|
|
|
|
|
|
2020-03-09 00:04:03 +09:00
|
|
|
- content_for :heading_actions do
|
|
|
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
|
|
|
|
|
|
|
|
|
|
= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
|
2019-06-07 10:39:24 +09:00
|
|
|
.fields-row
|
|
|
|
|
.fields-group.fields-row__column.fields-row__column-6
|
2022-02-09 12:15:38 +09:00
|
|
|
= f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
|
2019-06-07 10:39:24 +09:00
|
|
|
|
|
|
|
|
.fields-group.fields-row__column.fields-row__column-6
|
2023-06-10 10:29:37 +09:00
|
|
|
= f.input :time_zone, wrapper: :with_label, collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] }, hint: false
|
|
|
|
|
|
2020-01-01 06:15:05 +09:00
|
|
|
- unless I18n.locale == :en
|
2020-04-28 17:16:55 +09:00
|
|
|
.flash-message.translation-prompt
|
2023-03-16 04:07:43 +09:00
|
|
|
#{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: '_blank', rel: 'noopener')}
|
2022-12-22 07:49:08 +09:00
|
|
|
= link_to t('appearance.localization.glitch_guide_link'), target: '_blank', rel: 'noopener noreferrer' do
|
|
|
|
|
= t('appearance.localization.glitch_guide_link_text')
|
2020-01-01 06:15:05 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
= f.simple_fields_for :settings, current_user.settings do |ff|
|
|
|
|
|
%h4= t 'appearance.advanced_web_interface'
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
%p.hint= t 'appearance.advanced_web_interface_hint'
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.advanced_layout', wrapper: :with_label, hint: false, label: I18n.t('simple_form.labels.defaults.setting_advanced_layout')
|
|
|
|
|
%h4= t 'appearance.animations_and_accessibility'
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.use_pending_items', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_use_pending_items'), hint: I18n.t('simple_form.hints.defaults.setting_use_pending_items')
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.auto_play', wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_auto_play_gif')
|
|
|
|
|
= ff.input :'web.reduce_motion', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_reduce_motion')
|
|
|
|
|
= ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping')
|
|
|
|
|
= ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
|
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-04-01 04:30:27 +09:00
|
|
|
= ff.input :'web.use_system_emoji_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_emoji_font'), glitch_only: true
|
2019-07-16 13:30:47 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
%h4= t 'appearance.toot_layout'
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.crop_images', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_crop_images')
|
2019-10-25 05:51:41 +09:00
|
|
|
|
2022-11-30 23:59:37 +09:00
|
|
|
.fields-group.fields-row__column.fields-row__column-6
|
|
|
|
|
= f.input :setting_visible_reactions, wrapper: :with_label, input_html: { type: 'number', data: { default: '6' } }, hint: false
|
|
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
%h4= t 'appearance.discovery'
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_trends')
|
2019-08-07 00:57:52 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
%h4= t 'appearance.confirmation_dialogs'
|
2019-08-07 00:57:52 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.unfollow_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_unfollow_modal')
|
|
|
|
|
= ff.input :'web.reblog_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_boost_modal')
|
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-04-01 04:30:27 +09:00
|
|
|
= ff.input :'web.favourite_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_favourite_modal'), glitch_only: true
|
2023-03-30 21:44:00 +09:00
|
|
|
= ff.input :'web.delete_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_delete_modal')
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
%h4= t 'appearance.sensitive_content'
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.display_media', collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label, label: I18n.t('simple_form.labels.defaults.setting_display_media')
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.use_blurhash', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_use_blurhash'), hint: I18n.t('simple_form.hints.defaults.setting_use_blurhash')
|
2019-06-07 10:39:24 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'web.expand_content_warnings', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_expand_spoilers')
|
2019-06-07 10:39:24 +09:00
|
|
|
|
|
|
|
|
.actions
|
|
|
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|
