From 8d3605084034563e91705e531a2a313308e20a44 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 2 Nov 2014 20:52:19 +0100
Subject: [PATCH] settings pages

---
 app/views/devise/registrations/edit.html.haml | 36 ++++++++++---------
 app/views/user/_account.html.haml             | 23 ++++++++++++
 app/views/user/_settings_tabs.html.haml       |  4 +++
 app/views/user/edit.html.haml                 |  6 ++--
 4 files changed, 51 insertions(+), 18 deletions(-)
 create mode 100644 app/views/user/_account.html.haml
 create mode 100644 app/views/user/_settings_tabs.html.haml

diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
index 5bf72700..fa3dbfe7 100644
--- a/app/views/devise/registrations/edit.html.haml
+++ b/app/views/devise/registrations/edit.html.haml
@@ -1,22 +1,26 @@
-.container
-  %h1 Edit #{resource_name.to_s.humanize}
-  = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
-    = devise_error_messages!
+- case resource_name
+  - when :user
+    = render 'user/account'
+  - else
+    .container
+      %h1 Edit #{resource_name.to_s.humanize}
+      = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+        = devise_error_messages!
 
-    = f.text_field :screen_name, autofocus: true, label: "User name"
+        = f.text_field :screen_name, autofocus: true, label: "User name"
 
-    = f.email_field :email, label: "Email address"
-    - if devise_mapping.confirmable? && resource.pending_reconfirmation?
-      %div
-        Currently waiting confirmation for: #{resource.unconfirmed_email}
+        = f.email_field :email, label: "Email address"
+        - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+          %div
+            Currently waiting confirmation for: #{resource.unconfirmed_email}
 
-    = f.password_field :password, autocomplete: "off", label: "Password", help: "Leave this blank if you don't want to change it"
-    = f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password"
+        = f.password_field :password, autocomplete: "off", label: "Password", help: "Leave this blank if you don't want to change it"
+        = f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password"
 
-    = f.password_field :current_password, autocomplete: "off", label: "Current password", help: "We need your current password to confirm your changes"
+        = f.password_field :current_password, autocomplete: "off", label: "Current password", help: "We need your current password to confirm your changes"
 
-    = f.submit "Update"
-  %p
-    =button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger btn-sm"
+        = f.submit "Update"
+      %p
+        =button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger btn-sm"
 
-  = link_to "Back", :back
\ No newline at end of file
+      = link_to "Back", :back
\ No newline at end of file
diff --git a/app/views/user/_account.html.haml b/app/views/user/_account.html.haml
new file mode 100644
index 00000000..e1f28dbf
--- /dev/null
+++ b/app/views/user/_account.html.haml
@@ -0,0 +1,23 @@
+.container.j2-page
+  = render 'user/settings_tabs'
+  .col-md-9.col-xs-12.col-sm-9
+    = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+      = devise_error_messages!
+
+      = f.text_field :screen_name, autofocus: true, label: "User name"
+
+      = f.email_field :email, label: "Email address"
+      - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+        %div
+          Currently waiting confirmation for: #{resource.unconfirmed_email}
+
+      = f.password_field :password, autocomplete: "off", label: "Password", help: "Leave this blank if you don't want to change it"
+      = f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password"
+
+      = f.password_field :current_password, autocomplete: "off", label: "Current password", help: "We need your current password to confirm your changes"
+
+      = f.submit "Update"
+    %p
+      =button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger btn-sm"
+
+    = link_to "Back", :back
\ No newline at end of file
diff --git a/app/views/user/_settings_tabs.html.haml b/app/views/user/_settings_tabs.html.haml
new file mode 100644
index 00000000..19f442ea
--- /dev/null
+++ b/app/views/user/_settings_tabs.html.haml
@@ -0,0 +1,4 @@
+.col-md-3.col-xs-12.col-sm-3
+  %ul.nav.nav-pills.nav-stacked
+    = nav_entry "Account", edit_user_registration_path
+    = nav_entry "Profile", edit_user_profile_path
\ No newline at end of file
diff --git a/app/views/user/edit.html.haml b/app/views/user/edit.html.haml
index 21cbe9f3..e57d1a48 100644
--- a/app/views/user/edit.html.haml
+++ b/app/views/user/edit.html.haml
@@ -1,2 +1,4 @@
-<h1>User#edit</h1>
-<p>Find me in app/views/user/edit.html.erb</p>
+.container.j2-page
+  = render 'settings_tabs'
+  .col-md-9.col-xs-12.col-sm-9
+    %i TODO
\ No newline at end of file