Move user login menu in Charisma theme to headermenu

This commit is contained in:
DariusIII
2016-06-08 12:17:31 +02:00
parent 5287d9b8d4
commit a1ccb68f98
4 changed files with 32 additions and 31 deletions
+1
View File
@@ -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
+1 -1
View File
@@ -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>
+1 -29
View File
@@ -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">
+29 -1
View File
@@ -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>