3 files changed, 27 insertions, 4 deletions
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
diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb
index 324fa48..0f689d5 100644
--- a/app/views/search/go.html.erb
+++ b/app/views/search/go.html.erb
@@ -17,7 +17,7 @@
 			<h4> Players </h4>
 		<% end %>
 		<% @players.each do |p| %>
-			<%= render "common/show_player", :target => p %>
+			<%= render "common/show_user", :target => p %>
 		<% end %>
 
 	<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c2b5c75..b85cbda 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -22,7 +22,7 @@
 
 <div class="row">
 	<div class="col-md-6">
-	  	<h3> Recent Tournaments Players </h3>
+	  	<h3> Recent Tournaments Played </h3>
 		<ul>
 			<% @user.tournaments_played.each do |t| %>
 				<li><%= t.name %></li>
@@ -37,8 +37,7 @@
 				<li><%= t.name %></li>
 			<% end %>
 		</ul>
-	  </div>
-    </div>
+	</div>
 </div>
 
 <%= link_to 'Edit', edit_user_path(@user) %> |