From 2ce4fb27fa7ea7b5e7001ec7a436e4cc217274b7 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 8 Sep 2010 20:39:05 -0700
Subject: [PATCH] MS; removing some dumb user stuff

---
 app/controllers/users_controller.rb     |  3 +--
 app/views/layouts/application.html.haml |  2 +-
 app/views/users/new.html.haml           | 13 -------------
 app/views/users/show.html.haml          | 11 -----------
 public/stylesheets/application.css      |  1 +
 5 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 app/views/users/new.html.haml
 delete mode 100644 app/views/users/show.html.haml

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9964778fb..904598dfb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,7 +7,6 @@ class UsersController < ApplicationController
   def show
     @user         = User.find_by_id params[:id]
     @user_profile = @user.person.profile
-
     respond_with @user
   end
 
@@ -21,6 +20,6 @@ class UsersController < ApplicationController
   def update
     @user = User.find_by_id params[:id]
     @user.update_profile params[:user]
-    respond_with @user
+    respond_with(@user, :location => root_url)
   end
 end 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 63ef4736a..4368d05eb 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -50,7 +50,7 @@
               = owner_image_tag 
               = link_to current_user.real_name, current_user.person
             %li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
-            %li.settings= link_to "settings", edit_user_path(current_user)
+            %li.settings= link_to "edit profile", edit_user_path(current_user)
             %li.logout= link_to "logout", destroy_user_session_path
 
         = render "shared/group_nav"
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
deleted file mode 100644
index 84b971b6e..000000000
--- a/app/views/users/new.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-- title "New User"
-
-= form_for @user do |f|
-  = f.error_messages
-  %p
-    = f.label :password
-    %br
-    = f.password_field :password
-  %p
-    = f.submit
-
-
-%p= link_to "Back to List", users_path
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
deleted file mode 100644
index b678b4377..000000000
--- a/app/views/users/show.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-.span-20.last
-  %h1= "#{@user.real_name}"
-- if @user_profile
-  %p
-    %b url 
-  %p
-    = @user.url
-  %p
-    %b Serialized Key
-  %p
-    = @user.serialized_key
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 65f622321..f516bbaab 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -96,6 +96,7 @@ header {
     position: relative;
     display: inline;
     float: right;
+    z-index: 3;
     padding-right: 10px; }
     header #session_action a.new_requests {
       color: #df0101; }