ROUGH listing of tournaments

2 files changed, 66 insertions, 47 deletions

diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index eca4c7e..8de3d81 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -39,4 +39,29 @@ span.default-explanation {
 	.black {
 		color: black;
 	}
+}
+
+div.tournament-listing {
+	margin-top: 10px;
+	border-radius: 5px;
+	box-shadow: 2px 2px 4px #B8B8B8;
+	border: 2px solid #AAAAAA;
+	min-height: 100px;
+	padding: 4px;
+
+
+	h3 {
+		margin-top: 0px;
+		color: #F0AD4E;
+		font-weight: bold;
+	}
+
+	h3:hover {
+		color: #D09D3E;
+	}
+
+	.host {
+		font-weight: bold;
+	}
+
 }
\ No newline at end of file
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 90c3d7a..804d086 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -1,55 +1,49 @@
 <h1>Listing Tournaments</h1>
 
 <% if @tournaments.length > 0 %>
-<table class="table table-hover">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Game</th>
-      <th>Status</th>
-      <th>Players per team</th>
-      <th>Teams per match</th>
-      <th>Randomized teams</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @tournaments.each do |tournament| %>
-      <tr>
-        <td><%= tournament.name %></td>
-        <td><% case tournament.status
-              when 0 %>
-              <%= form_tag(tournament_path(tournament), method: "put") do %>
-              <input type="hidden" name="update_action" value="join">
-                <%= submit_tag("Join") %>
-              <% end %>
-            <% when 1 %>
-              Ongoing
+  <div id="tournament-list">
+    
+    <% @tournaments.each do |t| %>
+      <div class="row tournament-listing">
+          <div class="col-md-2 ">Gravatar of Host Goes Here</div>
+          
+
+          <div class="col-md-8">
+            <%# "header" %>
+            <%= link_to(t) do %>
+              <h3><%= t.name %></h3>
+            <% end %>
+
+             <div class="row">
+              <div class="col-md-4 host">
+               Hosted by: <%= t.hosts.first.name %>
+              </div>
+              <div class="col-md-8 things">
+                <p> Players per team </p>
+                <p> two </p>
+              </div>
+            </div> 
+          
+          </div>
+          
+
+          <div class="col-md-2">
+            <%# If this guy is logged in AND not in the tournament %>
+            <% if signed_in? && !t.players.include?(current_user) %>
+              <%= form_tag(tournament_path(t), method: "put") do %>
+                <input type="hidden" name="update_action" value="join">
+                  <%= submit_tag("Join") %>
+                <% end %>
             <% else %>
-              Closed
-            <%end %>
-          </td>
-        <td><%= tournament.min_players_per_team %>
-            <% if tournament.min_players_per_team != tournament.max_players_per_team %>
-              to <%= tournament.max_players_per_team %>
-              <% end %>
-        </td>
-        <td><%= tournament.min_teams_per_match %>
-         <% if tournament.min_teams_per_match != tournament.max_teams_per_match %>
-              to <%= tournament.max_teams_per_match %>
-              <% end %>
-          </td>
-        <td><%= tournament.randomized_teams %></td>
-        <td><%= link_to 'Show', tournament %></td>
-        <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
-        <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
+              <p> You've signed up for this tournament! </p>
+            <% end %>
+          </div>
+
+      </div>
     <% end %>
-  </tbody>
-</table>
+
+
+  </div>
 <% else %>
   <p class="no-entries"> No tournaments going on right now... Why not start your own? </p>
 <% end %>