From df1cda1faab97f4c424efdcf8b6822f98b73adb8 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Sun, 27 Apr 2014 20:47:31 -0400
Subject: Made some CSS changes all over the website. Added an alert icon.still
 need ajax to work with it

---
 app/assets/stylesheets/custom.css.scss      | 15 ++++++-
 app/assets/stylesheets/scaffolds.css.scss   |  4 +-
 app/assets/stylesheets/tournaments.css.scss |  1 +
 app/views/layouts/application.html.erb      |  7 +++-
 app/views/servers/_form.html.erb            | 17 ++++----
 app/views/tournaments/_form.html.erb        | 64 +++++++++++++++++------------
 app/views/tournaments/standings.html.erb    | 20 ++++++++-
 7 files changed, 87 insertions(+), 41 deletions(-)

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 6e54043..9e9e63a 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -24,6 +24,17 @@ header > nav {
 	}
 }
 
+.btn-custom-orange { 
+	color: white;
+	background-color: rgb(255, 69, 0);
+	border-color: rgb(255, 69, 0);
+}
+.btn-custom-foxtrot { 
+	color: white;
+ 	background-color: hsl(0, 69%, 22%) !important;
+}
+
+
 
 a, input[type="submit"] {
 	@extend .btn;
@@ -31,7 +42,9 @@ a, input[type="submit"] {
 	&.signup { @extend .btn-success; }
 	&.signin { @extend .btn-warning; }
 	&.signout { @extend .btn-danger; }
-	&.server { @extend .btn-danger; }
+	&.server { @extend .btn-warning; }
+	&.create-alert {@extend .btn-custom-orange;}
+	&.alerts { @extend .navbar-right; @extend .glyphicon; @extend .glyphicon-exclamation-sign; @extend .btn-custom-foxtrot;}
 	font-weight: bold !important;
 }
 
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index eb1f751..3c485b5 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -62,8 +62,8 @@ pre {
 a {
 	color: $link-yellow;
   	&:hover {
-      color: #FFEF00;
-      text-decoration: none;
+      color: white;
+
   }
 }
 
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index cc55253..42afd38 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -30,6 +30,7 @@ span.default-explanation {
 
 }
 
+
 #tournament-users{
 	
 	li {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cf55c18..9eea734 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,13 +28,16 @@
 		<% if signed_in? %>
 			<%= link_to current_user.user_name, current_user, :class => "user" %>
 			<%= link_to "Messages", pms_path, :class => "signup" %>
-			<%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %>
 			<% if current_user.can? :edit_server %>
 				<%= link_to "Server settings", edit_server_path, :class => "server" %>
 			<% end %>
 			<% if current_user.can? :create_alert %>
-				<%= link_to "Create Alert", new_alert_path, :class => "signin" %>
+				<%= link_to "Create Alert", new_alert_path, :class => "create-alert" %>
 			<% end %>
+			<%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %>
+			<%= link_to "", alerts_path, :class => "alerts"%>
+
+
 		<% else %>
 			<%= link_to "Log in", new_session_path, :class => "signin" %>
 			<%= link_to "Sign up", new_user_path, :class => "signup" %>
diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
index 1afde11..8853a80 100644
--- a/app/views/servers/_form.html.erb
+++ b/app/views/servers/_form.html.erb
@@ -1,18 +1,19 @@
 <%= form_for(@server) do |f| %>
   <%= render "common/error_messages", :target => @server %>
 
-  <fieldset>
-    <legend>Default permissions for new users</legend>
-    <ul>
+  <fieldset style="color: rgb(221, 145, 37)">
+    <legend style="color: rgb(221, 145, 37); border-color: rgb(221, 145, 37)">Default permissions for new users</legend>
+    <ul >
       <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %>
       <% @server.default_user_abilities.keys.each do |ability| %>
-      <li><label><%= a.check_box(ability) %> <%= ability.to_s.humanize %></label></li>
+      <li ><label><%= a.check_box(ability) %> <%= ability.to_s.humanize %></label></li>
       <% end %>
     <% end %>
     </ul>
   </fieldset>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
+  <p>
+    <div class="actions">
+      <%= f.submit %>
+    </div>
+  </p>
 <% end %>
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index cb4c175..2212515 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -3,7 +3,7 @@
              method: (@tournament.game.nil? ? "get" : "post")) do |f| %>
 	<%= render "common/error_messages", :target => @tournament %>
 
-	<fieldset><legend>Attributes</legend>
+	<fieldset><legend style="color:rgb(221, 145, 37)">Attributes</legend>
 	<p>
 		<%= f.label :game_id, "Select a game type" %>
 		<%= f.select(:game_id, Game.all.map{|game| [game.name, game.id]}) %>
@@ -18,23 +18,33 @@
 		<%= f.label :name %>
 		<%= f.text_field :name %>
 	</p>
-	
-	<table><tbody>
-		<tr>
-			<td></td>
-			<th>Minimum</th>
-			<th>Maximum</th></tr>
-		<tr>
-			<th>Players per team</th>
-			<td><%= f.text_field(:min_players_per_team, type: :number, min: 1) %></td>
-			<td><%= f.text_field(:max_players_per_team, type: :number, min: 1) %></td>
-		</tr>
-		<tr>
-			<th>Teams per match</th>
-			<td><%= f.text_field(:min_teams_per_match, type: :number, min: 1) %></td>
-			<td><%= f.text_field(:max_teams_per_match, type: :number, min: 1) %></td>
-		</tr>
-	</tbody></table>
+	<div>
+		<p>
+			<table><tbody>
+				<tr> 
+					<td></td>
+					<th style="padding:5px">Minimum</th>
+					<th style="padding:5px">Maximum</th></tr>
+				<tr>
+					<th>Players per team: </th>
+					<td style="padding:5px"><%= f.text_field(:min_players_per_team, type: :number, min: 1) %></td>
+					<td style="padding:5px"><%= f.text_field(:max_players_per_team, type: :number, min: 1) %></td>
+				</tr>
+			</tbody></table>
+		</p>
+	</div>
+
+	<div id="teams-table">
+		<p>
+			<table><tbody>
+				<tr>
+					<th>Teams per match: </th>
+					<td style="padding:5px"><%= f.text_field(:min_teams_per_match, type: :number, min: 1) %></td>
+					<td style="padding:5px"><%= f.text_field(:max_teams_per_match, type: :number, min: 1) %></td>
+				</tr>
+			</tbody></table>
+		</P>
+	</div>
 
 	<p>
 		<%= f.label :scoring_method %>
@@ -48,7 +58,7 @@
 
 	</fieldset>
 
-	<fieldset><legend>Settings</legend>
+	<fieldset><legend style="color:rgb(221, 145, 37)">Settings</legend>
 	<%= f.fields_for :settings do |setting_fields| %>
 		<% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %><p>
 			<% name = setting.name.parameterize.underscore %>
@@ -81,17 +91,19 @@
 	<% end %>
 	</fieldset>
 
-	<%= f.fields_for :stages do |stages_fields| %><fieldset><legend>Stages</legend>
+	<%= f.fields_for :stages do |stages_fields| %><fieldset><legend style="color:rgb(221, 145, 37)">Stages</legend>
 		<label for="num_stages">Number of tournament stages</label>
 		<input type="number" name="num_stages" min="1" value="<%= params[:num_stages] ? params[:num_stages].to_i : 1 %>">
 		<%# submit_tag("Set Stages", :class => "btn") %>
 		<% for i in 1..(params[:num_stages].to_i) do %>
-			<%= stages_fields.fields_for i.to_s do |stage_fields| %><fieldset><legend>Stage <%= i %></legend>
-				<%= stage_fields.label :scheduling_method %>
-				<%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %>
-				<%= stage_fields.label :seeding_method %>
-				<%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %>
-			</fieldset><% end %>
+			<p>
+				<%= stages_fields.fields_for i.to_s do |stage_fields| %><fieldset><legend style="color:rgb(221, 145, 37)">Stage <%= i %></legend>
+					<%= stage_fields.label :scheduling_method %>
+					<%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %>
+					<%= stage_fields.label :seeding_method %>
+					<%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %>
+				</fieldset><% end %>
+			</p>
 		<% end %>
 	</fieldset><% end %>
 
diff --git a/app/views/tournaments/standings.html.erb b/app/views/tournaments/standings.html.erb
index 28d3c22..b8739de 100644
--- a/app/views/tournaments/standings.html.erb
+++ b/app/views/tournaments/standings.html.erb
@@ -1,4 +1,7 @@
-<% playerscores = @tournament.players.collect {|player| player => tournament.statistics.getStatistic(player.matches.last, player, :score) } %>
+<% playerscores = @tournament.players.collect {|player| player => @tournament.statistics.getStatistic(player.matches.last, player, :score) } %>
+<% teams = tournament_stage.matches.collect 
+{ |match| match.teams.collect { |team| team.id => team.players.collect 
+{ |player| player.user_name => @tournament.statistics.getStatistic(player.matches.last, player, :score } } } %>
 
 <table>
 	<tr>
@@ -9,4 +12,17 @@
 			<% place += 1%>
 		<% end %>
 	</tr>
-</table>
\ No newline at end of file
+</table>
+
+<% teams.each do |team| %>
+	<table>
+		<tr>
+			<td>Standings:</td>
+			<% place = 0 %>
+			<% team.values.sort {|player1, player2| playerscores[player1] <=> playerscores[player2] }.each |player| %>
+				<td><%= place.to_s + ":" %> <%= player.user_name %></td>
+				<% place += 1%>
+			<% end %>
+		</tr>
+	</table>
+<% end %>
\ No newline at end of file
-- 
cgit v1.2.3


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/assets/images/hearthstone.png          | Bin 0 -> 10229 bytes
 app/assets/images/rock_paper_scissors.png  | Bin 0 -> 4951 bytes
 app/assets/images/rock_paper_scissors.svg  | 108 +++++++++++++++++++++++++++++
 app/views/common/_show_tournament.html.erb |   6 +-
 app/views/users/index.html.erb             |   2 +-
 app/views/users/show.html.erb              |   2 +-
 6 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/images/hearthstone.png
 create mode 100644 app/assets/images/rock_paper_scissors.png
 create mode 100644 app/assets/images/rock_paper_scissors.svg

diff --git a/app/assets/images/hearthstone.png b/app/assets/images/hearthstone.png
new file mode 100644
index 0000000..15d20b4
Binary files /dev/null and b/app/assets/images/hearthstone.png differ
diff --git a/app/assets/images/rock_paper_scissors.png b/app/assets/images/rock_paper_scissors.png
new file mode 100644
index 0000000..294916c
Binary files /dev/null and b/app/assets/images/rock_paper_scissors.png differ
diff --git a/app/assets/images/rock_paper_scissors.svg b/app/assets/images/rock_paper_scissors.svg
new file mode 100644
index 0000000..67bb6bd
--- /dev/null
+++ b/app/assets/images/rock_paper_scissors.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg" id="svg2" viewBox="0 0 691.81 691.81" version="1.1">
+  <title id="title4919">Rock Scissors Paper</title>
+  <defs id="defs4">
+    <marker id="Arrow2Mend" refY="0" refX="0" overflow="visible" orient="auto">
+      <path id="path4038" stroke-linejoin="round" d="m8.7186 4.0337-10.926-4.0177 10.926-4.0177c-1.7455 2.3721-1.7354 5.6175-6e-7 8.0354z" fill-rule="evenodd" transform="scale(-.6)" stroke-width=".625"/>
+    </marker>
+  </defs>
+  <rect x="0" y="0" width="691.81" height="691.81" style="fill: #AAAAAA" />
+  <g id="layer1" transform="translate(-42.612 -137.16)">
+    <g id="g4875" transform="matrix(.77244 0 0 .77244 192.28 -14.824)">
+      <g id="g2906" transform="matrix(-.84212 .17678 .17678 .84212 677.84 268.6)">
+        <path id="path3" d="m259.08 17.719c-4.01-0.256-2.042 5.467-6.258 5.006-2.182-2.162-1.385-7.737 1.251-8.761 0.281 0.971 0.035 2.469 1.252 2.503 0.28-0.97 0.034-2.468 1.251-2.503 0.299 1.786 2.062 2.111 2.504 3.755z"/>
+        <path id="path5" d="m173.97 17.719c-1.584 1.436-9.868 2.515-11.265 0 4.306 0.479 7.803-6.286 11.265-2.503-1.511 0.264-0.771 1.389 0 2.503z"/>
+        <path id="path7" d="m240.3 20.221c-1.901 1.276-8.113-1.155-10.014-3.754 5.03-0.44 9.158 0.02 10.014 3.754z"/>
+        <path id="path9" d="m290.36 57.769c1.164-2.922 4.529-10.066 0-5.006-1.437-2.351-0.207-10.399 5.006-10.013 0.505 7.179 0.247 13.597-5.006 15.019z"/>
+        <path id="path11" d="m112.88 15.406h-18.773c-0.743-0.873 29.706-4.351 18.773 0z"/>
+        <path id="path13" d="m369.21 86.556c-0.326-1.948-2.745-0.868-3.754 0 3.313-2.11 1.396-9.449 3.754-12.516 1.525 1.894 2.458 10.78 0 12.516z"/>
+        <path id="path15" d="m295.37 89.058c1.109-4.731 0.937-10.745 3.756-13.767-0.142 5.699-0.024 11.657-3.756 13.767z"/>
+        <path id="path17" d="m191.49 85.303c-7.078-0.848-17.994 2.142-21.276-2.503 9.66 0.83 16.427-3.137 21.276 2.503z"/>
+        <path id="path19" d="m334.17 125.35c-1.795-1.543-2.371-4.304-2.503-7.51 2.142-1.195 2.521-4.152 5.006-5.005-1.2 3.807 2.68 12.692-2.503 12.515z"/>
+        <path id="path21" d="m289.11 124.1c0.39-3.784-1.39-9.734 2.503-10.013-1.03 3.141 2.434 10.775-2.503 10.013z"/>
+        <path id="path23" d="m188.99 126.61c-4.574 0.851-9.1 1.746-15.019 1.251 1.243-3.813 9.789-6.836 13.769-3.754-7.763 0.486 0.084 0.641 1.25 2.503z"/>
+        <path id="path25" d="m200.25 169.16c-0.073-5.496 0.504-10.345 2.503-13.768-1.261 4.163 2.766 13.615-2.503 13.768z"/>
+        <path id="path27" d="m158.95 46.505c5.797 0.809 10.295-4.935 15.019 0-5.767-1.534-11.103 3.833-15.019 0z"/>
+        <path id="path29" d="m46.229 20.57c8.204 0.277 14.635-1.219 21.277-2.503-2.471 4.077-20.887 4.58-21.277 2.503z"/>
+        <path id="path31" d="m281.6 126.61c1.312-2.515 0.599-13.491 2.503-11.265 0.411 4.236-0.976 13.112-2.503 11.265z"/>
+        <path id="path33" d="m285.36 129.11c0.745-6.283 0.367-10.093 1.252-13.768 2.044 2.957 2.173 12.365-1.252 13.768z"/>
+        <path id="path35" d="m367.96 126.6c-5.002 1.868-15.024 1.868-20.025 0-1.197-7.076 1.841-16.464 0-20.024-46.83 1.298-86.581 1.938-135.17 1.251 20.958-7.99 48.129-3.82 75.094-5.007 43.017-1.89 87.378 1.49 122.65-7.509 4.33-5.413 3.127-19.587-2.503-22.527 2.882 6.014 0.101 13.255-2.503 17.521-8.105 0.18-16.143 0.289-21.276-2.502 0.216-7.711-1.787-17.64 5.006-18.773-31.898 1.353-56.328-3.795-86.357-1.252 0.331 5.869 3.998 16.742-2.503 18.773 1.253-5.3 2.223-13.686 0-18.773-29.323-3.635-65.038-0.877-91.364-7.51 62.248-1.654 128.88 7.685 183.98 1.252-0.668-4.338 1.859-11.87-2.503-12.516 0.728 4.898-1.077 7.267-2.503 10.013-8.161-0.962-16.246 1.611-21.275 0 0.783-3.804-1.603-10.78 1.252-12.516-5.466 15.413 17.483 12.443 20.023 5.006-6.653-8.223-20.667-9.609-32.541-11.264-47.229-6.583-111.25 0.445-155.19-10.013 36.4 2.273 86.049 1.268 121.4 2.503 7.167 0.251 22.518 6.253 21.276-7.509-3.388 4.539-11.951 3.901-20.025 3.754-2.494-1.276 2.634-8.914-1.251-11.264-51.09-5.314-113.91-14.316-167.7-11.256-41.5 2.359-82.498-0.122-117.64 5.006-12.469 1.817-24.626 7.461-36.298 5.006 22.245-7.795 47.513-9.995 75.093-11.263 32.795-1.507 69.275-6.218 101.38-5.007 6.743 0.256 13.555 3.074 20.025 3.756 52.454 5.521 106.54 1.751 148.94 17.521 3.519 3.539 1.673 11.946 2.503 15.02 22.246 3.101 56.888-0.582 48.811 28.785 5.949-0.524 9.027 1.819 13.769 2.503 4.653 6.229 8.617 18.292 5.005 28.787-7.016 9.671-28.406 4.97-41.302 8.762 7.52 10.533 1.729 26.649-6.257 32.54-31.736 6.23-69.292 6.638-106.38 7.51 5.988 5.631 10.071 17.214 6.259 28.786-27.447 16.401-68.675 7.55-100.12 12.516-15.694 2.479-21.298 6.535-33.792 7.51-54.56 4.252-64.943-32.562-103.88-47.561-5.108-1.966-11.236-2.437-16.271-3.754-3.554-0.933-13.292 0.196-13.767-7.51 0.09-5.264 13.964 2.216 15.02 0-1.541-2.722-13.286-6.875-7.511-8.762 35.521 12.869 61.882 56.016 106.38 61.327 22.711 2.71 44.086-4.475 67.584-6.259 25.915-1.966 51.778 2.017 75.094-6.258-5.259-2.249-14.193-0.824-20.024-2.503-0.108-7.2-0.271-14.455 1.252-20.025 6.923-2.259 13.888 0.48 21.276 1.252 3.234 5.568 2.444 14.378 3.754 18.773 17.154-49.229-104.77-10.208-123.9-36.295 32.543 9.766 100.99 5.861 148.94 3.754 34.288-1.507 102.81 3.411 81.353-31.289 2.749 4.647 1.047 13.937-1.256 17.522zm-41.3-108.88c-1.144 2.194-0.43 6.245-2.503 7.51 4.209 1.758 10.931 2.934 15.021 1.251 1.364-8.457-6.901-7.285-12.518-8.761zm60.076 55.068v13.768c4.332 1.925 11.41 1.106 17.522 1.252 8.308-11.294-5.278-20.534-17.522-15.02zm-35.044 37.548c-2.397 3.025-0.789 10.057-1.251 15.019h13.768c9.719-7.536-0.683-22.006-12.517-15.019zm-111.39 45.057c-1.666 3.758-1.273 9.576-1.252 15.021 7.063-0.39 11.13 2.219 18.773 1.251 2.625-3.851 1.255-12.357-1.252-15.021-6.133 0.292-9.475-2.205-16.269-1.251z"/>
+      </g>
+      <g id="g2982" transform="matrix(-.33587 -.48446 .48446 -.33587 255.64 813.8)" fill-rule="evenodd">
+        <path id="path3-4" d="m0 129.73c5.056 1.287 3.347 9.338 10.379 8.649 2.95-0.709-0.364-2.23 0-5.189 4.51 2.985 8.768 6.223 8.649 13.838-6.934-2.29-11.824-6.629-19.028-8.649v-8.649z"/>
+        <path id="path5-0" d="m19.028 131.46c3.663 16.518 24.55 15.811 34.596 25.947-11.769-1.308-20.868-9.217-29.407-8.649 0.714-8.21-5.903-9.088-5.189-17.298z"/>
+        <path id="path7-9" d="m247.36 153.95c9.951-0.126 16.131 18.447 20.758 29.405-8.991-7.729-11.192-22.252-20.758-29.405z"/>
+        <path id="path9-4" d="m385.74 205.84c4.146 3.703-5.014 8.726-10.379 8.649 1.757-4.586 7.999-4.686 10.379-8.649z"/>
+        <path id="path11-8" d="m321.74 243.9c4.889 3.89-2.845 9.726-3.46 13.838-4.889-3.89 2.842-9.726 3.46-13.838z"/>
+        <path id="path13-8" d="m0 153.95c10.402 3.682 40.146 8.392 53.624 13.838 40.282 16.275 58.092 66.777 124.55 51.894-6.811-5.875-15.101-10.27-22.488-15.567 13.222 1.081 20.92 12.012 34.596 17.297 7.584 2.931 18.474 2.089 27.677 6.92 11.564 6.071 21.198 19.362 32.866 27.677 24.197 17.243 40.023 31.271 64.002 6.919-3.854 7.102-9.293 12.617-19.027 13.838 18.444 3.007 35.974-11.953 36.325-25.946 0.427-16.97-25.394-39.572-36.325-57.084-19.65-31.474-23.18-54.689-36.326-79.57 5.988-3.042 6.72 13.99 13.838 15.568 7.606-5.078 5.466-19.906 15.568-22.487-1.614 8.764-4.848 15.91-6.918 24.217 5.624 3.309 9.881 3.427 13.838 1.73 6.081-24.971 9.578-51.964 32.865-55.354-13.657 11.844-36.839 46.024-15.568 65.732 14.236-11.135 18.784-31.958 34.597-41.515 3.048 6.002-1.768 7.836 8.648 5.189-5.946 5.585-16.236 6.826-20.757 13.838 2.43 2.873 9.672-4.067 17.297-1.73-15.773 4.983-27.891 13.624-31.135 31.137 1.87 12.262 21.477 13.787 25.946 32.865 1.311 5.597-2.26 12.064-1.729 17.299 2.02 19.947 29.403 38.392 39.785 15.568 2.611 5.559-0.23 6.872 5.189 6.919 8.24-0.327 15.966-9.178 17.298-20.758 5.03-43.67-5.31-129.17-20.76-152.23-5.61-8.383-16.99-15.295-29.4-17.293-58.25-9.38-117.67 20.656-172.98 20.757-68.45 0.125-126.98-38.346-185.09-48.435v-5.189c28.95 8.619 55.573 15.987 83.03 24.217 25.389 7.61 52.703 19.662 83.03 22.488 34.634 3.226 63.573-4.378 93.409-10.379 44.027-8.854 116.44-25.423 136.65 13.838 10.15 19.708 10.938 52.111 13.839 74.381 3.635 27.895 10.597 61.064 5.189 83.03-1.816 7.374-10.973 14.042-17.298 25.946-5.971 11.24-8.695 21.203-15.568 25.947-4.525 3.125-12.553 0.71-20.757 5.189-8.051 4.396-10.497 15.109-22.488 19.028-8.403 2.746-20.753 1.121-31.136 3.459-12.255 2.761-19.113 9.001-27.677 8.649-13.187-0.541-39.07-11.738-53.624-22.488-7.122-5.26-9.862-15.02-17.298-20.757-27.34-21.11-82.78-17.64-112.42-31.14-22.143-10.08-32.794-35.57-50.167-43.24-13.597-6.01-35.367-5.07-46.703-8.65v-15.57zm364.99 102.06c3.907-6.804 8.095-2.571 12.109-8.649 2.249 4.296-5.075 7.179 0 8.649 4.095-6.283 10.517-10.24 12.108-19.028-11.298-0.811-22.458-1.761-32.867-3.46-2.915 8.062-3.552 24.269 8.65 22.488z"/>
+        <path id="path15-2" d="m219.68 140.11c1.396-5.323 10.558 10.831 10.379 1.729 6.086 5.444 12.56 10.504 13.838 20.758-9.095-6.473-15.122-16.014-24.217-22.487z"/>
+        <path id="path17-4" d="m164.33 162.6c1.46-2.458 8.919 3.65 10.379 6.919 2.568-0.755-0.683-2.213 0-5.189 7.596 6.242 14.36 13.316 22.487 19.027-10.021-0.957-25.064-11.824-32.866-20.757z"/>
+        <path id="path19-5" d="m207.58 138.38c-6.535-3.267-16.759-2.845-19.027-10.379 7.358-3.752 17.359 2.874 19.027 10.379z"/>
+      </g>
+      <g id="g3028" transform="matrix(.94236 .33461 -.33461 .94236 -172.81 169.56)" fill-rule="evenodd">
+        <path id="path3-1" d="m361.4 18.798c0.183 3.935-2.72 8.736 0.351 11.859 0.581-1.918 2.404-2.862 1.882-1.278 3.681-0.369-0.205-4.866 1.708-7.206-2.92-0.673-1.599-2.539-3.941-3.375z"/>
+        <path id="path5-7" d="m323.56 19.741c-1.958 1.333-1.575 8.389 0.848 10.972 2.115-4.334-1.078-7.171-0.848-10.972z"/>
+        <path id="path7-1" d="m373.98 89.99c-3.714 1.095-4.415 7.683-4.585 10.26 3.952-1.163 2.957-7.273 4.585-10.26z"/>
+        <path id="path9-1" d="m321.97 72.5c-2.411 1.459-2.76 8.722-4.691 12.531 4.131-1.946 5.219-9.416 4.691-12.531z"/>
+        <path id="path11-5" d="m270.18 127.44c-4.752 9.811-19.64 1.719-24.672-8 5.153-4.7 10.842-7.498 16.442-10.608 2.885 6.549 11.457 11.943 8.23 18.608zm-21.122-6.01c4.796 2.948 9.505 7.987 15.086 8.457 11.746-11.772-8.793-23.322-15.086-8.457z"/>
+        <path id="path13-2" d="m253.65 111.17c-2.67-1.188-6.125 1.818-5.647 3.832 2.115-0.45 3.98-1.786 5.647-3.832z"/>
+        <path id="path15-7" d="m2.984 27.804c19.307-0.023 39.398-2.352 60.289-3.524 19.921-1.12 40.249-0.095 60.179-1.253 17.961-1.042 38.129-5.02 57.842-9.561 20.324-4.681 39.488-12.878 57.559-13.218 13.051-0.246 29.157 4.603 43.064 4.315 9.181-0.19 19.653-2.939 30.252-4.035 21.304-2.203 44.943 3.055 65.787 5.389 12.365 1.385 29.646 4.323 29.889 13.256 0.524 19.289-27.008 14.056-36.328 16.955-13.509 1.351-27.446-2.572-41.397-1.047-7.37 0.806-14.535 4.626-21.66 5.351-9.644 0.983-20.19-3.831-27.589 5.527 42.685 20.521 87.223 26.455 127.48 49.3 5.767 34.513-41.071 12.854-62.277 7.074-26.268-7.161-48.3-16.484-64.968-13.095-0.35 10.063 16.708 15.225 17.493 24.967-10.56 23.538-31.963 8.575-42.513 32.15-10.699-0.138-23.185 6.185-32.632 6.199-7.419 0.01-15.125-4.914-25.168-7.113-23.599-5.165-59.929-1.638-81.196-7.028-22.981-5.826-35.052-17.105-52.047-7.019-1.775-0.994-3.549-1.988-5.325-2.983 8.888-5.595 19.42-5.348 29.083-8.189 0.795-1.107-2.106-4.701 1.102-4.046-0.22 1.557 0.171 2.94 1.171 4.154 0.967-2.802-1.314-8.549 1.813-9.479 0.1 3.21-0.55 6.631 1.843 9.196 21.318-4.805 47.895-5.07 65.761-13.287-18.073 0.189-38.065 2.406-58.541-14.155 28.437 15.536 61.903 14.136 83.4-1.064-5.337-3.071-11.74-3.682-13.7-8.847 1.478 0.828 2.957 1.657 4.436 2.487-1.045-6.191-9.188-14.342-6.843-18.997-0.98 21.186 32.324 21.716 50.648 36.556 3.521 2.852 4.986 8.622 8.552 11.79 12.459 11.079 38.325 27.914 43.629 11.63 1.475-4.527-5.874-17.871-9.398-22.763-6.85-9.518-17.31-22.53-25.97-28.56-15.51-10.8-35.67-11.84-39.22-27.814 5.059 3.557 6.6 8.104 13.593 11.116 3.937-3.393-0.896-8.159 2.702-8.98 0.786 2.865 0.175 8.934 4.612 8.417 3.356-4.005 6.206-9.805 10.124-11.819-2.581 5.461-8.058 11.736-6.682 16.081 14.856 5.141 28.032 15.589 34.783 25.328 31.917-10.33 73.244 4.919 112.58 17.624 10.837 3.501 33.131 11.804 36.853 0.833 2.115-6.233-8.018-11.988-14.763-15.274-34.38-16.744-79.11-26.327-115.55-41.446-1.908-0.621-8.7 3.843-6.816-0.324 10.694-11.2 25.805-10.954 39.771-12.692 5.622-0.7 11.034-2.603 17.008-3.294 26.229-3.041 50.338 4.846 68.879-2.207 6.501-2.474 12.802-8.383 8.456-15.085-33.85-7.884-68.86-11.57-103.92-8.105-18.22 1.801-33.92 0.942-50.98-0.589-32.88-2.953-66.64 12.387-96.51 18.207-16.4 3.195-32.97 1.52-50.21 2.181-33.113 1.266-69.593 3.773-101.4 6.13 0.995-1.775 1.99-3.55 2.984-5.324zm261.6 63.842c0.395 11.847 9.998 21.099 12.129 32.457 6.438 0.748 12.617 0.576 16.336-8.335-5.655-8.494-16.405-22.274-28.465-24.122zm-43.467 23.451c-2.333-0.235 0.908 10.869 4.329 4.76-2.22-1.369-3.948-2.875-4.329-4.76zm34.5 21.673c-11.813-7.808-30.909-17.961-31.703-3.777-8.923-9.287-27.699-17.935-34.863-4.381 7.407-3.651 15.946-0.771 21.513 7.394-0.996 1.774-1.99 3.55-2.985 5.324 4.788 2.848 9.016 3.707 13.418 5.189 8.938-5.838 28.133 3.156 34.62-9.749zm-64.013-4.395c4.305 3.021 6.208 6.721 12.316 9.237 0.995-1.775 1.99-3.551 2.984-5.325-2.4-4.755-11.471-9.038-15.3-3.912z"/>
+        <path id="path17-6" d="m320.29 21.408c-1.362-2.508-1.234 5.898-0.82 7.705 3.498-0.554 0.371-5.536 0.82-7.705z"/>
+        <path id="path19-1" d="m239.77 96.394c-2.115 0.449-3.981 1.787-5.646 3.832-0.551-3.857 6.066-4.896 7.354-11.038-5.153 2.885-9.686 10.019-12.503 13.983 3.877-1.264 7.735-2.605 10.795-6.777z"/>
+        <path id="path21-4" d="m61.931 91.17c1.902 1.954 2.553 4.263 1.951 6.924-16.353-0.565-31.533 3.027-47.544 3.672 15.331 5.78 32.779-3.897 50.486 1.477-0.191-3.683-1.925-6.93-2.231-10.58 1.717-3.636 5.314-0.588 7.032-4.223-20.932-0.899-40.87 1.712-60.396 5.797 14.697 1.758 33.589-4.559 50.702-3.067z"/>
+      </g>
+      <path id="path3234" marker-end="url(#Arrow2Mend)" d="m192.86 538.08-65.72-114.29" stroke="#000" stroke-width="4" fill="none"/>
+      <path id="path3234-2" marker-end="url(#Arrow2Mend)" d="m193.47 352.93 130.62 17.825" stroke="#000" stroke-width="4" fill="none"/>
+      <path id="path3234-8" marker-end="url(#Arrow2Mend)" d="m416.72 467.9-105.26 79.37" stroke="#000" stroke-width="4" fill="none"/>
+    </g>
+  </g>
+  <metadata>
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>Rock Scissors Paper</dc:title>
+        <dc:date>2010-05-31T17:54:35</dc:date>
+        <dc:description>Rock Scissors Paper hand game depiction. Rock, scissors, and paper by Francesco 'Architetto' Rollandin from openclipart.org</dc:description>
+        <dc:source>http://openclipart.org/detail/63805/rock-scissors-paper-by-mazeo</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>mazeo</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>clip art</rdf:li>
+            <rdf:li>clipart</rdf:li>
+            <rdf:li>fingers</rdf:li>
+            <rdf:li>fist</rdf:li>
+            <rdf:li>hand</rdf:li>
+            <rdf:li>hands</rdf:li>
+            <rdf:li>paper</rdf:li>
+            <rdf:li>paper rock scissors</rdf:li>
+            <rdf:li>paper scissors rock</rdf:li>
+            <rdf:li>remix</rdf:li>
+            <rdf:li>rock</rdf:li>
+            <rdf:li>rock paper scissors</rdf:li>
+            <rdf:li>rock scissors paper</rdf:li>
+            <rdf:li>scissor</rdf:li>
+            <rdf:li>scissors</rdf:li>
+            <rdf:li>scissors paper rock</rdf:li>
+            <rdf:li>scissors rock paper</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
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 %>
-- 
cgit v1.2.3