From 24e79b3f4e597d49076aef7e34013f99f59e05ea Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 21 Oct 2013 18:51:33 -0400
Subject: [PATCH] #426

---
 public/src/forum/footer.js  |  5 +++--
 public/templates/header.tpl | 40 +++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index 31e96395df..15061a6424 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -58,9 +58,10 @@
 			$('#search-button').show();
 
 			var userLabel = loggedInMenu.find('#user_label');
+			
 			if (userLabel.length) {
 				if (data['userslug'])
-					userLabel.attr('href', '/user/' + data['userslug']);
+					userLabel.find('#user-profile-link').attr('href', '/user/' + data['userslug']);
 				if (data['picture'])
 					userLabel.find('img').attr('src', data['picture']);
 				if (data['username'])
@@ -87,7 +88,7 @@
 
 		}
 
-		$('#main-nav a,#right-menu a').off('click').on('click', function() {
+		$('#main-nav a,#user-control-list a').off('click').on('click', function() {
 			if($('.navbar .navbar-collapse').hasClass('in'))
 				$('.navbar-header button').click();
 		});
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index e0056401b0..4b25b60dcd 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -72,6 +72,18 @@
 						<a href="#" id="reconnect"></a>
 					</li>
 
+					<li>
+						<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
+							<div class="hide" id="search-fields">
+								<div class="form-group">
+									<input type="text" class="form-control" placeholder="Search" name="query" value="">
+								</div>
+								<button type="submit" class="btn btn-default hide">[[global:search]]</button>
+							</div>
+							<button id="search-button" type="button" class="btn btn-link"><i class="icon-search"></i></button>
+						</form>
+					</li>
+
 					<li id="notifications-list" class="notifications dropdown text-center hidden-xs">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
 						<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
@@ -81,26 +93,20 @@
 						</ul>
 					</li>
 
-					<li>
-						<a id="user_label" href="">
+					<li id="user_label" class="dropdown">
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown">
 							<img src=""/>
-							<span></span>
 						</a>
+						<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
+							<li>
+								<a id="user-profile-link" href=""><span>Profile</span></a>
+							</li>
+							<li id="logout-link">
+								<a href="#">Log out</a>
+							</li>
+						</ul>
 					</li>
-
-					<li id="logout-link">
-						<a href="#">Log out</a>
-					</li>
-
-					<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
-						<div class="hide" id="search-fields">
-							<div class="form-group">
-								<input type="text" class="form-control" placeholder="Search" name="query" value="">
-							</div>
-							<button type="submit" class="btn btn-default hide">[[global:search]]</button>
-						</div>
-						<button id="search-button" type="button" class="btn btn-link"><i class="icon-search"></i></button>
-					</form>
+					
 				</ul>
 
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">