summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authornfoy <nfoy@purdue.edu>2014-04-01 18:45:00 -0400
committernfoy <nfoy@purdue.edu>2014-04-01 18:45:00 -0400
commitf08191c3966851b19edc949d7819cc58190037d7 (patch)
tree16cbd10b1c72f7a5549ec7b3c2dc581aec02b6a0 /app/views/users
parentac77cea14d5708f47df42774b0b281391b2e3c89 (diff)
Edit Users now works. Added delayed_job gem.
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/_form.html.erb8
-rw-r--r--app/views/users/edit.html.erb2
-rw-r--r--app/views/users/show.html.erb2
3 files changed, 10 insertions, 2 deletions
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 %>