3 files changed, 67 insertions, 0 deletions
diff --git a/app/views/common/_error_messages.html.erb b/app/views/common/_error_messages.html.erb
new file mode 100644
index 0000000..731f62c
--- /dev/null
+++ b/app/views/common/_error_messages.html.erb
@@ -0,0 +1,11 @@
+<%# http://railscasts.com/episodes/211-validations-in-rails-3 %>
+<% if target.errors.any? %>
+<div id="errorExplanation">
+  <h2><%= pluralize(target.errors.count, "error") %> prohibited this form from being submitted:</h2>
+  <ul>
+  <% target.errors.full_messages.each do |msg| %>
+    <li><%= msg %></li>
+  <% end %>
+  </ul>
+</div>
+<% end %>
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/common/_show_user.html.erb b/app/views/common/_show_user.html.erb
new file mode 100644
index 0000000..70f1ca4
--- /dev/null
+++ b/app/views/common/_show_user.html.erb
@@ -0,0 +1,24 @@
+<div class="row user-listing">
+	<div class="col-md-3 col-sm-3 col-xs-6"><%= image_tag ('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.email) + '?s=100&d=mm') %></div>
+	
+
+	<div class="col-md-9 col-sm-9 col-xs-6">
+		<%# "header" %>
+		<%= link_to(target) do %><h3><%= target.user_name %></h3><% end %>
+		
+		<div class="row" style="margin-left:2%;">
+			<div class="col-md-6 things">
+				<p> Preferred Name: </p>
+				<p> <%= target.name %></p>
+			</div>
+			<div class="col-md-6 things">
+				<p>Latest Tournament:
+				<% if !target.tournaments_played.first.nil? %>
+					<%= target.tournaments_played.first.name %>
+				<% end %>
+				</p>
+			</div>
+		</div>
+
+	</div>
+</div>
+\ No newline at end of file