From 12b9f96b4003ec384e1583e4d6d53fcb8d5f960c Mon Sep 17 00:00:00 2001
From: nfoy <nfoy@purdue.edu>
Date: Sun, 27 Apr 2014 20:51:49 -0400
Subject: More tournament index stuff.

---
 app/views/common/_show_tournament.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/views/common')

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>
-- 
cgit v1.2.3-2-g168b


From 0f6489cdfcc1c75500a66bc906a13b98629e0617 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Sun, 27 Apr 2014 21:01:25 -0400
Subject: fixed username for alerts and made tournament listings btter

---
 app/views/common/_show_tournament.html.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/views/common')

diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
index a1d01d2..151e5d2 100644
--- a/app/views/common/_show_tournament.html.erb
+++ b/app/views/common/_show_tournament.html.erb
@@ -25,9 +25,11 @@
 		<% if signed_in? %>
 			<% if !target.players.include?(current_user) %>
 			<%= form_tag(tournament_path(target), method: "put") do %>
-				<input type="hidden" name="update_action" value="join">
-				<%= submit_tag("Join")%>
-				<% end %>
+				<p>
+					<input type="hidden" name="update_action" value="join">
+					<%= submit_tag("Join")%>
+					<% end %>
+				</p>
 			<% else %>
 			<p style="margin-top:10px;"> You've signed up for this tournament! 	</p>
 			<% end %>
-- 
cgit v1.2.3-2-g168b