diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-03 16:25:14 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-03 16:25:14 -0400 |
commit | 9236bc8f79bf18f7aa9802090c53536fe20108bb (patch) | |
tree | 92cb8a4f73ebb074ca00e0b14af13486d4763c68 /app/views | |
parent | b62c07359a9cbc7bad93c375c50d266a40dfe539 (diff) | |
parent | 5169363d6698fb87372efcb7ace552b89953584e (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/users/_form.html.erb | 8 | ||||
-rw-r--r-- | app/views/users/edit.html.erb | 2 | ||||
-rw-r--r-- | app/views/users/show.html.erb | 2 |
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 %> |