diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
| commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
| tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /app/views/users/index.html.erb | |
| parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
| parent | aca85cf084702c29014a17eafb090421061fae8b (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/views/users/index.html.erb')
| -rw-r--r-- | app/views/users/index.html.erb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8b9056b..d7b46da 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,10 +1,13 @@ <h1>Listing users</h1> -<table> +<table class="table table-hover"> <thead> <tr> + <th>Username</th> <th>Name</th> - <th>Pw hash</th> + <th>Email</th> + <th>User name</th> + <th></th> <th></th> <th></th> <th></th> @@ -14,8 +17,10 @@ <tbody> <% @users.each do |user| %> <tr> + <td><%= link_to("#{user.user_name}", user, nil) %></td> <td><%= user.name %></td> - <td><%= user.pw_hash %></td> + <td> ******* </td> + <td><%= user.user_name %></td> <td><%= link_to 'Show', user %></td> <td><%= link_to 'Edit', edit_user_path(user) %></td> <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td> |