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/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 +++++++++-
 4 files changed, 70 insertions(+), 38 deletions(-)

(limited to 'app/views')

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-2-g168b


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 +++---
 app/views/users/index.html.erb             | 2 +-
 app/views/users/show.html.erb              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/views')

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-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/alerts/index.html.erb            | 2 +-
 app/views/common/_show_tournament.html.erb | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb
index 1d441a2..c978bea 100644
--- a/app/views/alerts/index.html.erb
+++ b/app/views/alerts/index.html.erb
@@ -15,7 +15,7 @@
     <% if !@alerts.nil? %>
       <% @alerts.each do |alert| %>
         <tr>
-          <td><%= alert.author %></td>
+          <td><%= alert.author.user_name %></td>
           <td><%= alert.message %></td>
           <td><%= link_to 'Show', alert %></td>
           <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
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