From c13ca3ca2c167158ca0f6ff8a20f2b4943f3e04d Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Tue, 22 Apr 2014 20:17:18 -0400
Subject: users look nice

---
 app/assets/images/ChessBlackKnightIcon.png | Bin 893 -> 0 bytes
 app/assets/images/LOLG_icon_large.gif      | Bin 8207 -> 0 bytes
 app/assets/images/chess_icon.png           | Bin 0 -> 893 bytes
 app/assets/images/league_icon.gif          | Bin 0 -> 8207 bytes
 app/assets/stylesheets/users.css.scss      |  31 +++++++++++++++++++++++++++++
 app/views/common/_show_user.html.erb       |  24 ++++++++++++++++++++++
 app/views/search/go.html.erb               |   2 +-
 app/views/users/show.html.erb              |   5 ++---
 8 files changed, 58 insertions(+), 4 deletions(-)
 delete mode 100644 app/assets/images/ChessBlackKnightIcon.png
 delete mode 100644 app/assets/images/LOLG_icon_large.gif
 create mode 100644 app/assets/images/chess_icon.png
 create mode 100644 app/assets/images/league_icon.gif
 create mode 100644 app/views/common/_show_user.html.erb

diff --git a/app/assets/images/ChessBlackKnightIcon.png b/app/assets/images/ChessBlackKnightIcon.png
deleted file mode 100644
index 6bcffe6..0000000
Binary files a/app/assets/images/ChessBlackKnightIcon.png and /dev/null differ
diff --git a/app/assets/images/LOLG_icon_large.gif b/app/assets/images/LOLG_icon_large.gif
deleted file mode 100644
index 1f0fa43..0000000
Binary files a/app/assets/images/LOLG_icon_large.gif and /dev/null differ
diff --git a/app/assets/images/chess_icon.png b/app/assets/images/chess_icon.png
new file mode 100644
index 0000000..6bcffe6
Binary files /dev/null and b/app/assets/images/chess_icon.png differ
diff --git a/app/assets/images/league_icon.gif b/app/assets/images/league_icon.gif
new file mode 100644
index 0000000..1f0fa43
Binary files /dev/null and b/app/assets/images/league_icon.gif differ
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index 3453a55..5df7aee 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -7,4 +7,35 @@
 .simple_captcha {
 	background-color: rgba(255, 255, 255, 0.7);
 	margin: 10px 0px;
+}
+
+
+div.user-listing {
+	margin: 10px 0px;
+	border-radius: 5px;
+	box-shadow: 0px 0px 3px #B8B8B8;
+	background-color: rgba(0, 0, 0, 0.6);
+	border: 1px solid #AAAAAA;
+	min-height: 100px;
+	padding: 8px 4px;
+	display: inline-table;
+
+	/* AKA the listing title */
+	h3 {
+		margin-top: 0px;
+		color: #F0AD4E;
+		font-weight: bold;
+	}
+
+	h3:hover {
+		color: #D09D3E;
+	}
+
+	.things {
+		padding: 0px 10px;
+	}
+
+	p {
+		margin: 0;
+	}
 }
\ 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
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) %> |
-- 
cgit v1.1-4-g5e80