From a1ccb68f986f463ecb76aaec84b3e016b1d477a4 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Wed, 8 Jun 2016 12:17:31 +0200
Subject: [PATCH] Move user login menu in Charisma theme to headermenu

---
 Changelog                                    |  1 +
 build/nntmux.xml                             |  2 +-
 www/themes/Charisma/templates/basepage.tpl   | 30 +-------------------
 www/themes/Charisma/templates/headermenu.tpl | 30 +++++++++++++++++++-
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/Changelog b/Changelog
index 9886f499e..4e87aaf7a 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-06-08 DariusIII
+	* Chg: Move user login menu in Charisma theme to headermenu
 	* Fix: Fix send to queue and download basket in Charisma theme.
 	* Upd: Make PreDb class to default to remote Db.
 	* Upd: Change DATEDIFF to constant comparison to allow index scan
diff --git a/build/nntmux.xml b/build/nntmux.xml
index 92abfac7b..bfc6b1b4b 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -8,7 +8,7 @@
 				<precommit>9</precommit>
 				<!-- this is the version of the pre-commit file in githooks NOT the files it calls -->
 			</hooks>
-		<commit>5278</commit></git>
+		<commit>5279</commit></git>
 		<scripts>
 			<last>
 				<date>0000-00-00</date>
diff --git a/www/themes/Charisma/templates/basepage.tpl b/www/themes/Charisma/templates/basepage.tpl
index 42e772bd8..8d0cc7eba 100755
--- a/www/themes/Charisma/templates/basepage.tpl
+++ b/www/themes/Charisma/templates/basepage.tpl
@@ -62,37 +62,9 @@
 				<a href="{$site->home_link}" class="navbar-brand">
 				<span>{$site->title}</span></a>
 			</div>
-			<div class="navbar-header">
+			<div class="navbar-header" style="margin: 0 auto; float: right;">
 			{$header_menu}
 			</div>
-			<!-- user dropdown starts -->
-			{if $loggedin == "true"}
-			<div class="btn-group navbar-right">
-				<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-					<i class="fa fa-user"></i><span class="hidden-sm hidden-xs"><span
-								class="username"> Hi, {$userdata.username}</span></span>
-					<span class="caret"></span>
-				</button>
-				<ul class="dropdown-menu">
-					<li><a href="{$smarty.const.WWW_TOP}/profile"><i class="fa fa-user"></i><span> My Profile</span></a></li>
-					<li><a href="{$smarty.const.WWW_TOP}/cart"><i class="fa fa-shopping-basket"></i><span> My Download Basket</span></a></li>
-					<li><a href="{$smarty.const.WWW_TOP}/queue"><i class="fa fa-cloud-download"></i><span> My Queue</span></a></li>
-					<li><a href="{$smarty.const.WWW_TOP}/mymovies"><i class="fa fa-film"></i><span> My movies</span></a></li>
-					<li><a href="{$smarty.const.WWW_TOP}/myshows"><i class="fa fa-television"></i> My Shows</a></li>
-					<li><a href="{$smarty.const.WWW_TOP}/profileedit"><i class="fa fa-cog fa-spin"></i><span> Account Settings</span></a>
-					</li>
-					{if isset($isadmin)}
-						<li><a href="{$smarty.const.WWW_TOP}/admin"><i class="fa fa-cogs fa-spin"></i><span> Admin</span></a></li>
-					{/if}
-					<li><a href="{$smarty.const.WWW_TOP}/logout"><i class="fa fa-unlock-alt"></i><span> Logout</span></a></li>
-				</ul>
-				{else}
-				<li><a href="{$smarty.const.WWW_TOP}/login"><i class="fa fa-lock"></i><span> Login</span></a></li>
-				<li><a href="{$smarty.const.WWW_TOP}/register"><i class="fa fa-bookmark-o"></i><span> Register</span></a></li>
-			</div>
-			{/if}
-			<!-- user dropdown ends -->
-		</div>
 	</div>
 	<!-- topbar ends -->
 	<div class="ch-container">
diff --git a/www/themes/Charisma/templates/headermenu.tpl b/www/themes/Charisma/templates/headermenu.tpl
index 3ff39e490..9c31cd277 100755
--- a/www/themes/Charisma/templates/headermenu.tpl
+++ b/www/themes/Charisma/templates/headermenu.tpl
@@ -192,7 +192,7 @@
 					<li><a href="{$smarty.const.WWW_TOP}/browse?t={$catClass::OTHER_HASHED}">Hashed</a></li>
 				</ul>
 			</li>
-			<ul class="nav pull-left">
+			<ul class="nav navbar-left">
 				<li class="">
 					<form class="navbar-form" id="headsearch_form" action="{$smarty.const.WWW_TOP}/search/" method="get">
 						<select class="form-control" id="headcat" name="t">
@@ -211,6 +211,34 @@
 			</ul>
 			<!-- End If logged in -->
 		{/if}
+		<!-- user dropdown starts -->
+		{if $loggedin == "true"}
+			<div class="btn-group navbar-right">
+				<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+					<i class="fa fa-user"></i><span class="hidden-sm hidden-xs"><span
+								class="username"> Hi, {$userdata.username}</span></span>
+					<span class="caret"></span>
+				</button>
+				<ul class="dropdown-menu">
+					<li><a href="{$smarty.const.WWW_TOP}/profile"><i class="fa fa-user"></i><span> My Profile</span></a></li>
+					<li><a href="{$smarty.const.WWW_TOP}/cart"><i class="fa fa-shopping-basket"></i><span> My Download Basket</span></a></li>
+					<li><a href="{$smarty.const.WWW_TOP}/queue"><i class="fa fa-cloud-download"></i><span> My Queue</span></a></li>
+					<li><a href="{$smarty.const.WWW_TOP}/mymovies"><i class="fa fa-film"></i><span> My movies</span></a></li>
+					<li><a href="{$smarty.const.WWW_TOP}/myshows"><i class="fa fa-television"></i> My Shows</a></li>
+					<li><a href="{$smarty.const.WWW_TOP}/profileedit"><i class="fa fa-cog fa-spin"></i><span> Account Settings</span></a>
+					</li>
+					{if isset($isadmin)}
+						<li><a href="{$smarty.const.WWW_TOP}/admin"><i class="fa fa-cogs fa-spin"></i><span> Admin</span></a></li>
+					{/if}
+					<li><a href="{$smarty.const.WWW_TOP}/logout"><i class="fa fa-unlock-alt"></i><span> Logout</span></a></li>
+				</ul>
+				{else}
+				<li><a href="{$smarty.const.WWW_TOP}/login"><i class="fa fa-lock"></i><span> Login</span></a></li>
+				<li><a href="{$smarty.const.WWW_TOP}/register"><i class="fa fa-bookmark-o"></i><span> Register</span></a></li>
+			</div>
+		{/if}
+		<!-- user dropdown ends -->
+	</div>
 		{/if}
 	</div>
 </div>