2016-10-14 02:28:49 +02:00
|
|
|
- content_for :page_title do
|
2016-11-15 23:02:57 +01:00
|
|
|
= t('settings.preferences')
|
2016-10-14 02:28:49 +02:00
|
|
|
|
2020-03-08 16:04:03 +01:00
|
|
|
- content_for :heading_actions do
|
|
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
|
|
|
|
|
|
|
|
= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } do |f|
|
2016-10-18 16:37:15 +02:00
|
|
|
= render 'shared/error_messages', object: current_user
|
|
|
|
|
2023-03-30 14:44:00 +02:00
|
|
|
= f.simple_fields_for :settings, current_user.settings do |ff|
|
|
|
|
.fields-group
|
|
|
|
= ff.input :noindex, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_noindex'), hint: I18n.t('simple_form.hints.defaults.setting_noindex')
|
2019-02-02 19:18:15 +01:00
|
|
|
|
2019-06-10 18:30:41 +02:00
|
|
|
.fields-group
|
2023-03-30 14:44:00 +02:00
|
|
|
= ff.input :aggregate_reblogs, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_aggregate_reblogs'), hint: I18n.t('simple_form.hints.defaults.setting_aggregate_reblogs')
|
2019-06-10 18:30:41 +02:00
|
|
|
|
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-03-31 21:30:27 +02:00
|
|
|
- unless Setting.hide_followers_count
|
|
|
|
.fields-group
|
|
|
|
= ff.input :hide_followers_count, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_hide_followers_count'), glitch_only: true
|
2017-10-01 10:52:39 +02:00
|
|
|
|
2023-03-30 14:44:00 +02:00
|
|
|
%h4= t 'preferences.posting_defaults'
|
2019-06-07 03:39:24 +02:00
|
|
|
|
2023-03-30 14:44:00 +02:00
|
|
|
.fields-row
|
|
|
|
.fields-group.fields-row__column.fields-row__column-6
|
|
|
|
= ff.input :default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_privacy')
|
2017-10-01 10:52:39 +02:00
|
|
|
|
2023-03-30 14:44:00 +02:00
|
|
|
.fields-group.fields-row__column.fields-row__column-6
|
|
|
|
= ff.input :default_language, collection: [nil] + filterable_languages, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) }, required: false, include_blank: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_language')
|
2019-05-25 21:27:00 +02:00
|
|
|
|
2023-03-30 14:44:00 +02:00
|
|
|
.fields-group
|
|
|
|
= ff.input :default_sensitive, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive')
|
2019-05-25 21:27:00 +02:00
|
|
|
|
2023-03-30 14:44:00 +02:00
|
|
|
.fields-group
|
|
|
|
= ff.input :show_application, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_show_application'), hint: I18n.t('simple_form.hints.defaults.setting_show_application')
|
2017-04-11 16:10:16 +02:00
|
|
|
|
2019-06-10 18:30:41 +02:00
|
|
|
.fields-group
|
2022-11-12 10:09:27 +01:00
|
|
|
= f.input :setting_default_content_type, collection: ['text/plain', 'text/markdown', 'text/html'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', glitch_only: true
|
2019-06-10 18:30:41 +02:00
|
|
|
|
2019-06-07 03:39:24 +02:00
|
|
|
%h4= t 'preferences.public_timelines'
|
2018-12-09 13:03:01 +01:00
|
|
|
|
2017-04-17 12:14:03 +02:00
|
|
|
.fields-group
|
2022-02-09 04:15:38 +01:00
|
|
|
= f.input :chosen_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
|
2017-04-17 12:14:03 +02:00
|
|
|
|
2016-10-14 02:28:49 +02:00
|
|
|
.actions
|
2016-11-15 23:02:57 +01:00
|
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|