diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/sessions/new.html.erb | 4 | ||||
-rw-r--r-- | app/views/users/index.html.erb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index f942cf6..2e7a0d3 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,5 +1,7 @@ <h1>Sign in</h1> - +<% if @fail %> + <p class="error">Email and password combination not found</p> +<% end %> <div class="row"> <div class="span6 offset3"> <%= form_for(:session, url: sessions_path) do |f| %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index c128661..d92da4d 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -3,6 +3,7 @@ <table class="table table-hover"> <thead> <tr> + <th>Username</th> <th>Name</th> <th>Pw hash</th> <th></th> @@ -14,7 +15,8 @@ <tbody> <% @users.each do |user| %> <tr> - <td><%= link_to("#{user.name}", user, nil) %></td> + <td><%= link_to("#{user.user_name}", user, nil) %></td> + <td><%= user.name %></td> <td> ******* </td> <td><%= link_to 'Edit', edit_user_path(user) %></td> <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td> |