From 1e4dcfd9f3bea518d1170926b816e25c21193901 Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Mon, 3 Sep 2012 21:56:37 -0700
Subject: [PATCH] Finished adding user profile stuff

---
 app/views/devise/registrations/edit.html.erb | 5 +++++
 app/views/devise/registrations/new.html.erb  | 5 +++++
 app/views/layouts/application.html.erb       | 2 ++
 app/views/users/show.html.erb                | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index ebca9ed..fbbc622 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -3,6 +3,11 @@
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
 
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 9703db3..df3407c 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -3,6 +3,11 @@
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d0c6835..6636e19 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,6 +10,8 @@
   <div id="header">
     <a href="/users">Users</a>
     <a href="/door_logs">Logs</a>
+    <%= link_to 'Profile', edit_user_registration_path if user_signed_in? %>
+    <%= link_to 'Sign out', destroy_user_session_path, :method => :delete if user_signed_in? %>
   </div>
   <p class="notice"><%= notice %></p>
   <p class="alert"><%= alert %></p>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f082052..d220451 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -19,6 +19,6 @@
   <%= @user.card_permissions %>
 </p>
 
-<%= link_to 'Upload to Door', upload_path(user) %>
+<%= link_to 'Upload to Door', upload_path(@user) %>
 <%= link_to 'Edit', edit_user_path(@user) %> |
 <%= link_to 'Back', users_path %>