From 22d9741ac82181b39355d60a2137fe755ceade2f Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 21 Feb 2012 14:28:05 +0800
Subject: [PATCH] Fix for orbit_bar

---
 app/assets/javascripts/orbit-1.0.js   |  2 +-
 app/assets/stylesheets/style.css.erb  | 13 ++++++++++++-
 app/views/layouts/_orbit_bar.html.erb |  5 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index 866f4d2a..b9f03c95 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -20,7 +20,7 @@ $(document).ready(function(){
 		$('.bar-login .dropdown-menu').hide();
 	});
 
-	$(document).on('click', '.dropdown-menu', function(e) {
+	$(document).on('click', '.bar-login .dropdown-menu', function(e) {
 		e.stopPropagation();
 		$('.bar-login .dropdown-menu').show();
 	});
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index 0153dfcd..7dbda9f4 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -106,8 +106,9 @@
 	height: 34px;
 	padding: 3px;
 	text-indent: inherit;
-	min-width: 120px;
+	min-width: 125px;
 	width: auto !important;
+	text-align: left;
 }
 #orbit-bar .nav span.member-name {
 	display: inline-block;
@@ -115,6 +116,11 @@
 	line-height: 34px;
 	padding: 0 10px;
 }
+#orbit-bar .nav img.member-img {
+	display: inline-block;
+	float: left;
+	max-width: 34px;
+}
 #orbit-bar .account-menu {
 	right: 5px;
 }
@@ -186,6 +192,11 @@
 	font-size:16px;
 	text-align: center;
 }
+#orbit-bar .bar-login .dropdown-menu .register {
+   color: #FFFFFF;
+   margin: 0 15px;
+   width: 188px;
+}
 #main-sidebar {
     background: url(<%= asset_path 'background.jpg' %>) repeat left top;
 	width: 155px;
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index a93741fc..469ddc8f 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -21,7 +21,8 @@
 				<% if user_signed_in? %>
 					<li class="dropdown active clear">
 						<a class="orbit-bar-account" href="#" data-toggle="dropdown">
-							<img src="images/menber-pic.png" />
+							<!-- <img src="images/menber-pic.png" /> -->
+							<%= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
 							<span class="member-name"><%= current_user.name %></span>
 						</a>
 						<ul class="dropdown-menu account-menu">
@@ -73,9 +74,9 @@
 										</label>
 									</li>
 									<li class="divider"><span><%= t(:or_lower) %></span></li>
-									<li><%= link_to content_tag(:button, t(:register), :class => 'btn btn-danger'), new_user_registration_path, :style => "padding:0px;" %></li>
 								<% end %>
 							</ul>
+							<%= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
 						</div>
 					</li>
 				<% end %>