Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Separate notifications preferences from general preferences (#4447)

Browse source 
* Separate notifications preferences from general preferences

* Refine settings/notifications/show

* remove preferences.notifications
This commit is contained in:
Yamagishi Kazutoshi 2017-10-04 17:22:52 +09:00 • committed by Eugen Rochko
parent 0e1b0f2747
commit 178f718a9b
14 changed files with 117 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/views/settings/notifications/show.html.haml Normal file
View file

@ -0,0 +1,25 @@
- content_for :page_title do
= t('settings.notifications')
= simple_form_for current_user, url: settings_notifications_path, html: { method: :put } do |f|
= render 'shared/error_messages', object: current_user
.fields-group
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
= ff.input :follow, as: :boolean, wrapper: :with_label
= ff.input :follow_request, as: :boolean, wrapper: :with_label
= ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, as: :boolean, wrapper: :with_label
.fields-group
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
= ff.input :digest, as: :boolean, wrapper: :with_label
.fields-group
= f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff|
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label
= ff.input :must_be_following, as: :boolean, wrapper: :with_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit

19
app/views/settings/preferences/show.html.haml
View file

@ -18,25 +18,6 @@
= f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
%h4= t 'preferences.notifications'
.fields-group
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
= ff.input :follow, as: :boolean, wrapper: :with_label
= ff.input :follow_request, as: :boolean, wrapper: :with_label
= ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, as: :boolean, wrapper: :with_label
.fields-group
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
= ff.input :digest, as: :boolean, wrapper: :with_label
.fields-group
= f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff|
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label
= ff.input :must_be_following, as: :boolean, wrapper: :with_label
%h4= t 'preferences.other'
.fields-group