From f08191c3966851b19edc949d7819cc58190037d7 Mon Sep 17 00:00:00 2001
From: nfoy <nfoy@purdue.edu>
Date: Tue, 1 Apr 2014 18:45:00 -0400
Subject: Edit Users now works. Added delayed_job gem.

---
 Gemfile                        | 3 +++
 Gemfile.lock                   | 3 +++
 app/views/users/_form.html.erb | 8 ++++++++
 app/views/users/edit.html.erb  | 2 +-
 app/views/users/show.html.erb  | 2 +-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index fbf6232..688063a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,6 +41,9 @@ gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
+# Asynchronously handle longer or delayed tasks
+gem 'delayed_job'
+
 group :doc do
 	# bundle exec rake doc:rails generates the API under doc/api.
 	gem 'sdoc', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7899a93..83f5525 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
     erubis (2.7.0)
     execjs (2.0.2)
     hike (1.2.3)
@@ -119,6 +121,7 @@ DEPENDENCIES
   bcrypt-ruby (= 3.1.2)
   bootstrap-sass
   coffee-rails (~> 4.0.0)
+  delayed_job
   jbuilder (~> 1.2)
   jquery-rails
   rails (= 4.0.2)
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 4d28738..ae63f06 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -23,6 +23,14 @@
     <%= f.label :user_name %><br>
     <%= f.text_field :user_name %>
   </div>
+  <p>
+    <%= f.label(:password, "New Password (or use old)") %><br>
+    <%= f.password_field :password %>
+  </p>
+  <div>
+    <%= f.label(:password_confirmation, "Confirm Password") %><br>
+    <%= f.password_field :password_confirmation %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 99bd4cc..52f32a2 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -3,4 +3,4 @@
 <%= render 'form' %>
 
 <%= link_to 'Show', @user %> |
-<%= link_to 'Back', users_path %>
+<%= link_to 'Users', users_path %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index dafa73e..7bda009 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -18,4 +18,4 @@
 </p>
 
 <%= link_to 'Edit', edit_user_path(@user) %> |
-<%= link_to 'Back', users_path %>
+<%= link_to 'Users', users_path %>
-- 
cgit v1.2.3