From 7a6d95f70ccb12d61355ecd677eff40dd13260b7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Oct 2016 02:28:49 +0200
Subject: E-mail preferences page

---
 app/views/settings/preferences/show.html.haml | 22 ++++++++++++++++++++++
 app/views/settings/profiles/show.html.haml    | 19 +++++++++++++++++++
 app/views/settings/shared/_links.html.haml    |  7 +++++++
 app/views/settings/show.html.haml             | 17 -----------------
 4 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 app/views/settings/preferences/show.html.haml
 create mode 100644 app/views/settings/profiles/show.html.haml
 create mode 100644 app/views/settings/shared/_links.html.haml
 delete mode 100644 app/views/settings/show.html.haml

(limited to 'app/views/settings')

diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
new file mode 100644
index 000000000..9c73d07c5
--- /dev/null
+++ b/app/views/settings/preferences/show.html.haml
@@ -0,0 +1,22 @@
+- content_for :page_title do
+  Preferences
+
+= form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
+  = f.fields_for :notification_emails, current_user.settings(:notification_emails) do |ff|
+    .boolean-field
+      = ff.check_box :follow
+      = ff.label :follow, 'Send e-mail when someone follows you'
+    .boolean-field
+      = ff.check_box :reblog
+      = ff.label :reblog, 'Send e-mail when someone reblogs your status'
+    .boolean-field
+      = ff.check_box :favourite
+      = ff.label :favourite, 'Send e-mail when someone favourites your status'
+    .boolean-field
+      = ff.check_box :mention
+      = ff.label :mention, 'Send e-mail when someone mentions you'
+
+  .actions
+    = f.button 'Save changes', type: :submit
+
+.form-footer= render "settings/shared/links"
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
new file mode 100644
index 000000000..2ff91beff
--- /dev/null
+++ b/app/views/settings/profiles/show.html.haml
@@ -0,0 +1,19 @@
+- content_for :page_title do
+  Edit profile
+
+= form_for @account, url: settings_profile_path, html: { method: :put } do |f|
+  .field
+    = f.text_field :display_name, placeholder: 'Display name'
+  .field
+    = f.text_area :note, placeholder: 'Bio'
+  .file-field
+    = f.label :avatar
+    = f.file_field :avatar
+  .file-field
+    = f.label :header
+    = f.file_field :header
+
+  .actions
+    = f.button 'Save changes', type: :submit
+
+.form-footer= render "settings/shared/links"
diff --git a/app/views/settings/shared/_links.html.haml b/app/views/settings/shared/_links.html.haml
new file mode 100644
index 000000000..520300416
--- /dev/null
+++ b/app/views/settings/shared/_links.html.haml
@@ -0,0 +1,7 @@
+%ul.no-list
+  - if controller_name != 'profiles'
+    %li= link_to "Edit profile", settings_profile_path
+  - if controller_name != 'preferences'
+    %li= link_to "Preferences", settings_preferences_path
+  - if controller_name != 'registrations'
+    %li= link_to "Change password", edit_user_registration_path
diff --git a/app/views/settings/show.html.haml b/app/views/settings/show.html.haml
deleted file mode 100644
index fe4d37b55..000000000
--- a/app/views/settings/show.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- content_for :page_title do
-  Edit profile
-
-= form_for @account, url: settings_path, html: { method: :put } do |f|
-  .field
-    = f.text_field :display_name, placeholder: 'Display name'
-  .field
-    = f.text_area :note, placeholder: 'Bio'
-  .file-field
-    = f.label :avatar
-    = f.file_field :avatar
-  .file-field
-    = f.label :header
-    = f.file_field :header
-
-  .actions
-    = f.button 'Save changes', type: :submit 
-- 
cgit