From 9d2e1394bc09d4df3fce97d6151f5bfc3546fbe8 Mon Sep 17 00:00:00 2001
From: nfoy <nfoy@purdue.edu>
Date: Thu, 3 Apr 2014 16:48:58 -0400
Subject: Added Gravatar support for tournament's index view.

---
 app/views/tournaments/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 6a86955..e174de7 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -6,7 +6,7 @@
     <%# Each tournament has a div for its listing %>
     <% @tournaments.each do |t| %>
       <div class="row tournament-listing">
-          <div class="col-md-2 ">Gravatar of Host Goes Here</div>
+          <div class="col-md-2 "><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div>
           
 
           <div class="col-md-8">
-- 
cgit v1.2.3-2-g168b


From 6cc7eb9e419c219d82d318ebb1bab8a853f73da5 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Thu, 3 Apr 2014 16:49:09 -0400
Subject: footer clears on both sides, has top-margin of 10. Tournament show
 screen repetitive info fixed

---
 app/views/tournaments/show.html.erb | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'app/views')

diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index d246f7a..9939d02 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -40,35 +40,6 @@
   <%= @tournament.max_teams_per_match %>
 </p>
 
-<p>
-  <strong>Set rounds:</strong>
-  <%= @tournament.set_rounds %>
-</p>
-
-<p>
-  <strong>Min players per team:</strong>
-  <%= @tournament.min_players_per_team %>
-</p>
-
-<p>
-  <strong>Max players per team:</strong>
-  <%= @tournament.max_players_per_team %>
-</p>
-
-<p>
-  <strong>Min teams per match:</strong>
-  <%= @tournament.min_teams_per_match %>
-</p>
-
-<p>
-  <strong>Max teams per match:</strong>
-  <%= @tournament.max_teams_per_match %>
-</p>
-
-<p>
-  <strong>Set rounds:</strong>
-  <%= @tournament.set_rounds %>
-</p>
 
 <p>
   <strong>Randomized teams:</strong>
-- 
cgit v1.2.3-2-g168b


From 051e61877b4c77a17fd4fa68dfca4d5e74a687df Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Thu, 3 Apr 2014 17:17:12 -0400
Subject: fixed some of andrews weird stuff with starting a tournament

---
 app/views/matches/index.html.erb    | 4 ++--
 app/views/tournaments/show.html.erb | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/views')

diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 0f86da6..babf45e 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -1,6 +1,6 @@
 <h1><%= @tournament.name %> Matches</h1>
 
-<!--
+
 <table>
   <thead>
     <tr>
@@ -29,7 +29,7 @@
 </table>
 
 <br>
--->
+
 
 <SVG version="1.1"
    baseProfile="full"
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 9939d02..b654804 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -79,8 +79,8 @@
 <%# If user is the host, let them start the tournment %>
 <% if @tournament.hosts.include?(current_user) %>
   
-  <%= form_tag(tournaments_path.to_s + "/" + @tournament.id.to_s + "/edit", method: "get") do %>
-    <input type="hidden" name="close_action" value="close">
+  <%= form_tag(tournament_path(@tournament), method: "put") do %>
+    <input type="hidden" name="update_action" value="start">
     <% if @tournament.players.count >= @tournament.min_players_per_team * @tournament.min_teams_per_match  %> 
       <%= submit_tag("Start Tournament") %>
     <% else %>
@@ -117,8 +117,10 @@ function donehandle( tournament ) {
     //if there are enough players to start, enable the button, else disable it.
     $("input[value=\"Start Tournament\"]").prop('disabled', (pct_complete >= 1)? false : true);
 
+    if (tournament["status"] == 1)
+      window.location.reload(true);
   }
-  setTimeout(function(){$.ajax({url: "<%= url_for @tournament %>.json"}).done(donehandle)}, 3000);
+  setTimeout(function(){$.ajax({url: "<%= url_for @tournament %>.json"}).done(donehandle)}, 2000);
 }
 
 $.ajax({url: "<%= url_for @tournament %>.json"})
-- 
cgit v1.2.3-2-g168b


From 6289593da4b6ad30c893b61caf4ac142b590710a Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Thu, 3 Apr 2014 17:56:15 -0400
Subject: Captcha

---
 app/views/users/new.html.erb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/views')

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index c23f76d..5e369ac 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -23,6 +23,8 @@
     <%= f.password_field :password_confirmation %>
   </p>
   <p>
+	<%= show_simple_captcha %>
+
     <%= f.submit("Be a Leaguer", :class => "signup") %>
   </p>
 <% end %>
-- 
cgit v1.2.3-2-g168b


From effe4608e808a385bb912fccac26381d0bd0c95a Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Thu, 3 Apr 2014 18:03:25 -0400
Subject: matches table is back, and a lot of things are fixed

---
 app/views/matches/index.html.erb | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'app/views')

diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index babf45e..d4ddb0e 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -1,28 +1,23 @@
-<h1><%= @tournament.name %> Matches</h1>
+<h1><%= @tournament.name %> - Matches</h1>
 
 
-<table>
+<table class="table">
   <thead>
     <tr>
       <th>Status</th>
-      <th>Tournament</th>
       <th>Name</th>
       <th>Winner</th>
-      <th>Remote</th>
-      <th></th>
-      <th></th>
       <th></th>
     </tr>
   </thead>
 
-  <tbody>
+  <tbody class="table-hover">
     <% @tournament.matches.each do |match| %>
       <tr>
-        <td><%= match.tournament.id %></td>
         <td><%= match.status %></td>
-        <td><%= match.tournament %></td>
+        <td><%= match.id%></td>
         <td><%= match.name %></td>
-        <td><%= match.winner %></td>
+        <td><%= link_to "Show", tournament_match_path(@tournament, match) %>
       </tr>
     <% end %>
   </tbody>
@@ -37,7 +32,8 @@
    xmlns="http://www.w3.org/2000/svg">
 
    <% (1..@matches.count).each do |i| %>
-    <g class="svg-match" >
+    <g class="svg-match">
+      <rect rx="10"
       
     </g>
    <% end %>
-- 
cgit v1.2.3-2-g168b


From cb1e09a7ef061cd3c1ca7cf5793d09b2aacb1536 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Fri, 4 Apr 2014 18:35:40 -0400
Subject: Cookie size 20 minutes

---
 app/views/matches/show.html.erb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'app/views')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 53c3b38..4973dc3 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -12,7 +12,24 @@
   <strong>Name:</strong>
   <%= @match.name %>
 </p>
+<!--
+	Match Status 0 =>	Pairings Stage
+	Match Status 1 =>	Match Active 
+	Match Status 2 =>	Match Finished (Peer Review Starts) 
+	Match Status 3 => 	Match Completed (Scores Completed OR Results Page)  	
 
+	Four views:- (status is Match status)
+	A. Pairings, when status is 0 for either Host or Player Or when status is 1 for player 
+	B. A page the host will see if status is 1 OR 2
+	C. The Peer review page that the players will see if status is 2.
+	D. The page everyone will see when status is 3.
+
+	Note:- The change of status from 1 to 2 is coming from League Data Pull (RIOT API)
+
+-->
+<!--
+	This is what the HOST will see when the Match Status is NOT 3
+-->
 <% if (@tournament.hosts.include?(current_user) and @match.winner.nil?) %>
 	<%= form_for([@tournament, @match], method: "put") do |f| %>
 		<ul>
@@ -25,6 +42,8 @@
 	<% end %>
 <% end %>
 
+
+
 <% unless @match.winner.nil? %>
 	<p>
 		<strong>Winner:</strong>
-- 
cgit v1.2.3-2-g168b