Merge branch 'master' of https://github.com/LukeShu/leaguer

6 files changed, 71 insertions, 41 deletions

diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
new file mode 100644
index 0000000..89d8f53
--- /dev/null
+++ b/app/views/common/_show_tournament.html.erb
@@ -0,0 +1,32 @@
+<div class="row tournament-listing">
+	<div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag ('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=100&d=mm') %></div>
+	<div class="col-md-8 col-sm-7 col-xs-6">
+		<%# "header" %>
+		<%= 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 %>
+			</div>
+			<div class="col-md-4 things">
+				<p> Players per team: <%= target.min_players_per_team %></p>
+				<p> Players signed up: <%= target.players.count %> </p>
+			</div>
+			<div class="col-md-4 things">
+				<p> <%= (target.randomized_teams)? "Teams are Random" : "Teams are Chosen" %></p>
+				<p> Players signed up: <%= target.players.count %> </p>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-2 col-sm-2 col-xs-2">
+		<% 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 %>
+			<% else %>
+			<p style="margin-top:10px;"> You've signed up for this tournament! 	</p>
+			<% end %>
+		<% end %>
+	</div>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e6b5b25..fb5c1c5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,15 +13,20 @@
 			BetterDragSort.makeListSortable(document.getElementById("boxes"));
 		};
 </script>
-<header><nav>
+<header>
+	<nav>
+	<%# This is the logo %>
 	<div class="navbar-brand"><%= link_to('Leaguer', root_path) %></div>
+
+	<%# This is the search bar  #%>
 	<div>
 		<%= form_tag("/search", method: "get", :class => "search") do %>
 			<%= text_field_tag(:query, nil, :placeholder => "Search") %>
-			<%= submit_tag("Go") %>
+			<%= submit_tag("Go", :name=>nil) %>
 		<% end %>
 	</div>
 
+	<%# these are the log in buttons #%>
 	<div id="log-buttons">
 		<% if signed_in? %>
 			<%= link_to current_user.user_name, current_user, :class => "user" %>
@@ -34,7 +39,8 @@
 			<%= link_to "Sign up", new_user_path, :class => "signup" %>
 		<% end %>
 	</div>
-</nav></header>
+	</nav>
+</header>
 
 <% if notice %><div id="notice"><p><%= notice %></p></div><% end %>
 
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 058477a..fda8582 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -37,5 +37,5 @@
 <br>
 
 <% @tournament.stages_ordered.keys.sort.each do |stage_key| %>
-	<div class="graph"><%= raw @tournament.stages_ordered[stage_key].to_svg %></div>
+	<div class="graph"><%= raw @tournament.stages_ordered[stage_key].to_svg(current_user) %></div>
 <% end %>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index e7fe791..a1d82a3 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -7,10 +7,6 @@
 	<%= @match.tournament_stage %>
 </p>
 
-<p>
-	<strong>Name:</strong>
-	<%= @match.name %>
-</p>
 <!--
 	Match Status 0 =>	Created, waiting to start
 	Match Status 1 =>	Match is running, waiting to finish
diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb
new file mode 100644
index 0000000..324fa48
--- /dev/null
+++ b/app/views/search/go.html.erb
@@ -0,0 +1,24 @@
+
+<%# Show search results if a query was not nill %>
+<% if !@query.empty? %>
+
+	<% if @tournaments.empty? and @players.empty? %>
+		<h3> No results found for "<%= @query %>" </h3>
+	<% else %>
+		<h3> Showing results for: <span><%= @query %></span></h3>
+		<% if @tournaments.length > 0 %>
+			<h4> Tournaments </h4>
+		<% end %>
+		<% @tournaments.each do |t| %>
+			<%= render "common/show_tournament", :target => t %>
+		<% end %>
+
+		<% if @players.length > 0 %>
+			<h4> Players </h4>
+		<% end %>
+		<% @players.each do |p| %>
+			<%= render "common/show_player", :target => p %>
+		<% end %>
+
+	<% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index eef9577..06e1b25 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -2,48 +2,20 @@
 
 <div id="tournament-list">
 	<% if @tournaments.length > 0 %>
+
 		<%# Each tournament has a div for its listing %>
 		<% @tournaments.each do |t| %>
-			<div class="row tournament-listing">
-				<div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div>
-				<div class="col-md-8 col-sm-7 col-xs-6">
-					<%# "header" %>
-					<%= link_to(t) do %><h3><%= t.name %></h3><% end %>
-					<div class="row" style="margin-left:2%;">
-						<div class="col-md-4 host">
-							Hosted by: <%= t.hosts.first.name %>
-						</div>
-						<div class="col-md-4 things">
-						  <p> Players per team: <%= t.min_players_per_team %></p>
-						  <p> Players signed up: <%= t.players.count %> </p>
-						</div>
-						<div class="col-md-4 things">
-						  <p> <%= (t.randomized_teams)? "Teams are Random" : "Teams are Chosen" %></p>
-						  <p> Players signed up: <%= t.players.count %> </p>
-						</div>
-					</div>
-				</div>
-				<div class="col-md-2 col-sm-2 col-xs-2">
-					<% if signed_in? %>
-						<% if !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 %>
-							<p style="margin-top:10px;"> You've signed up for this tournament! </p>
-						<% end %>
-					<% end %>
-				</div>
-			</div>
+			<%= render "common/show_tournament", :target => t %>
 		<% end %>
+
 	<% else %>
+
 		<p class="no-entries"> No tournaments going on right now...
 			<% if current_user.can?(:create_tournament) %>
 				Why not start your own?
 			<% end %>
 		</p>
+		
 	<% end %>
 </div>