diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
commit | e4ae559d8189519586e044238196ee45b2a10c6b (patch) | |
tree | 3d4977292aa234ea93ce604095f13d50484250a1 /app/views/users/index.html.erb | |
parent | 2f450dd30bb210fdc4cb8899c72e6da945a163ba (diff) | |
parent | da95cb4f0f48731c2713c61f17b522b048647fd1 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/layouts/application.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 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index c128661..d7b46da 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -3,10 +3,13 @@ <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> </tr> </thead> @@ -14,8 +17,11 @@ <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><%= 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> </tr> |