changed account and profile partials to better reflect styling changes

app/views/users/_account.haml

@@ -3,39 +3,40 @@
 -#   the COPYRIGHT file.
 
 
-%h2 Account
+%h3
+  Your Account
+  .description
+    Connect Diaspora to publish to other applications, export your data, or close your account.
 
-= link_to "invite friends", new_user_invitation_path(current_user)
+= form_for @user do |user|
+  %h4
+    Change Password
+    = user.error_messages
 
-%br
-%br
-%br
-
-%h3 Change Password
-= form_for @user do |f|
-  = f.error_messages
-
-  %p
-    = f.label :password, "New Password"
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    = f.password_field :password_confirmation
+    = user.password_field :password, :placeholder => "New password"
+    = user.password_field :password_confirmation, :placeholder => "Password confirmation"
 
   .submit_block
     = link_to "Cancel", edit_user_path(current_user)
     or
-    = f.submit 'Change password'
+    = user.submit 'Change password'
 
-%h3 Export Data
-= link_to "download my xml", users_export_path, :class => "button"
-= link_to "download my photos", users_export_photos_path, :class => "button"
+%h4
+  Export Data
+  %br
+  %br
+  = link_to "Download my account", users_export_path, :class => "button"
+  = link_to "Download my photos", users_export_photos_path, :class => "button"
 
 %br
 %br
 %br
 
-%h3 Close Account
-= link_to "Close Account", current_user,
-            :confirm => "Are you sure?", :method => :delete,
-            :class => "button"
+%h4
+  Close Account
+  .description
+    Closing your account will delete all of your posts, friends, and settings.  You will be removed from this server.
+  %br
+  = link_to "Close Account", current_user,
+              :confirm => "Are you sure?", :method => :delete,
+              :class => "button"

app/views/users/_profile.haml

@@ -3,56 +3,56 @@
 -#   the COPYRIGHT file.
 
 
-%h2 Profile
-= form_for @user do |f|
-  = f.error_messages
-
-  = f.fields_for :profile do |p|
-
-    %h3="#{t('.picture')}"
-    %div#image_picker
-      = p.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
-
-      - unless @photos.nil? || @photos.empty?
-        - for photo in @photos
-          - if @profile.image_url && @profile.image_url.include?(photo.url(:thumb_medium))
-            %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
-              = check_box_tag 'checked_photo', true, true
-              = link_to image_tag(photo.url(:thumb_medium)), "#"
-          - else
-            %div.small_photo{:id => photo.url(:thumb_medium)}
-              = check_box_tag 'checked_photo'
-              = link_to image_tag(photo.url(:thumb_medium)), "#"
-
-      - else
-        =t('.you_dont_have_any_photos')
-        = link_to t('.albums'), albums_path(:aspect => 'all')
-        =t('.page_to_upload_some')
-
-    =will_paginate @photos
-
-    %br
-
-    %h3="#{t('.info')}"
-
-    %p
-      %b
-        ="#{t('.diaspora_username')}:"
-        = @user.diaspora_handle
-
-    %p
-      = p.label :first_name
-      = p.text_field :first_name, :value => @profile.first_name
-    %p
-      = p.label :last_name
-      = p.text_field :last_name, :value => @profile.last_name
+= form_for @user do |user|
+  %h3
+    Your Profile
+    .description
+      This info will be available to whomever you connect with on Diaspora.
+
+  = user.error_messages
+
+  = user.fields_for :profile do |profile|
+    %h4
+      Your name
+      = profile.text_field :first_name, :value => @profile.first_name, :placeholder => "First name"
+      = profile.text_field :last_name, :value => @profile.last_name, :placeholder => "Last name"
+
+    %h4
+      Your birthday
+      %br
+      = select_date
+
+    %h4
+      Your bio
+      = text_area_tag :bio, nil, :placeholder => "Fill me out"
+
+    %h4
+      Your photo
+      %div#image_picker
+        = profile.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
+
+        - unless @photos.nil? || @photos.empty?
+          - for photo in @photos
+            - if @profile.image_url && @profile.image_url.include?(photo.url(:thumb_medium))
+              %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
+                = check_box_tag 'checked_photo', true, true
+                = link_to image_tag(photo.url(:thumb_medium)), "#"
+            - else
+              %div.small_photo{:id => photo.url(:thumb_medium)}
+                = check_box_tag 'checked_photo'
+                = link_to image_tag(photo.url(:thumb_medium)), "#"
+
+        - else
+          =t('.you_dont_have_any_photos')
+          = link_to t('.albums'), albums_path(:aspect => 'all')
+          =t('.page_to_upload_some')
+
+      =will_paginate @photos
+
+
+
 
   .submit_block
     = link_to t('.cancel'), edit_user_path(current_user)
     = t('.or')
-    = f.submit t('.update_profile')
-
-#content_bottom
-  .back
-    = link_to "⇧ #{t('.home')}", root_path
-
+    = user.submit t('.update_profile')

public/stylesheets/sass/application.sass

@@ -393,10 +393,6 @@ li.message
 
 form
   :position relative
-  :font
-    :size 120%
-  :margin 1em
-    :left 0em
 
 #user_name
   :margin
@@ -615,8 +611,6 @@ textarea
 .submit_block
   :text
     :align right
-  :font
-    :size 12px
 
 form p
   :position relative
@@ -694,6 +688,8 @@ label
       :display inline
 
 #image_picker
+  :margin
+    :top 5px
   .small_photo
     :height 100px
     :position relative
@@ -1134,16 +1130,14 @@ ul#settings_nav
       :size 80px
     :display inline-block
 
-h1,h2,h3
+h1,h2,h3,h4
   .description
     :font
       :size 70%
       :weight 100
     :color #ccc
-    :margin
-      :top 5px
     
-h2,h3
+h2,h3,h4
   .description
     :font
       :size 80%