MS; removing some dumb user stuff
This commit is contained in:
parent
2a9e988b1f
commit
2ce4fb27fa
5 changed files with 3 additions and 27 deletions
|
|
@ -7,7 +7,6 @@ class UsersController < ApplicationController
|
||||||
def show
|
def show
|
||||||
@user = User.find_by_id params[:id]
|
@user = User.find_by_id params[:id]
|
||||||
@user_profile = @user.person.profile
|
@user_profile = @user.person.profile
|
||||||
|
|
||||||
respond_with @user
|
respond_with @user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -21,6 +20,6 @@ class UsersController < ApplicationController
|
||||||
def update
|
def update
|
||||||
@user = User.find_by_id params[:id]
|
@user = User.find_by_id params[:id]
|
||||||
@user.update_profile params[:user]
|
@user.update_profile params[:user]
|
||||||
respond_with @user
|
respond_with(@user, :location => root_url)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
= owner_image_tag
|
= owner_image_tag
|
||||||
= link_to current_user.real_name, current_user.person
|
= link_to current_user.real_name, current_user.person
|
||||||
%li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
|
%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
|
%li.logout= link_to "logout", destroy_user_session_path
|
||||||
|
|
||||||
= render "shared/group_nav"
|
= render "shared/group_nav"
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -96,6 +96,7 @@ header {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: inline;
|
display: inline;
|
||||||
float: right;
|
float: right;
|
||||||
|
z-index: 3;
|
||||||
padding-right: 10px; }
|
padding-right: 10px; }
|
||||||
header #session_action a.new_requests {
|
header #session_action a.new_requests {
|
||||||
color: #df0101; }
|
color: #df0101; }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue