summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authornfoy <nfoy@purdue.edu>2014-04-27 20:51:49 -0400
committernfoy <nfoy@purdue.edu>2014-04-27 20:51:49 -0400
commit12b9f96b4003ec384e1583e4d6d53fcb8d5f960c (patch)
tree26bca6ff6aeabf98197451454e57010c09bca8f0 /app/views
parent95542d38ddae5700e7fa35c166260a51ce17e46a (diff)
More tournament index stuff.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/common/_show_tournament.html.erb6
-rw-r--r--app/views/users/index.html.erb2
-rw-r--r--app/views/users/show.html.erb2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
index 280d59d..a1d01d2 100644
--- a/app/views/common/_show_tournament.html.erb
+++ b/app/views/common/_show_tournament.html.erb
@@ -1,6 +1,6 @@
<div class="row tournament-listing">
<div class="col-md-2 col-sm-3 col-xs-6">
- <%= image_tag(target.game.name.downcase.tr(" ", "_") + ".png", class: "t-image") %>
+ <%= image_tag(target.game.name.downcase.tr(" ", "_").tr(",", "") + ".png", class: "t-image") %>
<p class="t-game"> <%= Game.find(target.game_id).name %></p>
</div>
<div class="col-md-8 col-sm-7 col-xs-6">
@@ -8,8 +8,8 @@
<%= link_to(target) do %><h3><%= target.name %></h3><% end %>
<div class="row" style="margin-left:2%;">
<div class="col-md-4 host">
- Hosted by: <%= target.hosts.first.name %>
- <%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=45&d=identicon', class: "t-image") %>
+ <%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=45&d=identicon') %>
+ <%= target.hosts.first.name %>'s tournament
</div>
<div class="col-md-4 things">
<p> Players per team: <%= target.min_players_per_team %></p>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 89e369a..e4251cd 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -16,7 +16,7 @@
<tbody>
<% @users.each do |user| %>
<tr>
- <td><%= link_to("#{user.user_name}", user, nil) %></td>
+ <td><%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(user.email) + '?s=30&d=identicon') %> <%= link_to("#{user.user_name}", user, nil) %></td>
<td><%= user.name %></td>
<td> ******* </td>
<td><%= user.user_name %></td>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b408589..b247b7d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -54,4 +54,4 @@
</div>
<%= link_to 'Edit', edit_user_path(@user) %> |
-<%= link_to 'Users', users_path %>
+<%= link_to 'All Users', users_path %>