// fix menu + sass refacto

admin-dev/themes/default/template/header.tpl

@@ -102,10 +102,10 @@
 	{/if}
 </head>
 
-<body class="page-topbar">
+<body class="page-sidebar">
 <!-- 
-<body>
-<body class="page-sidebar-closed">
+<body class="page-sidebar">
+<body class="page-sidebar page-sidebar-closed">
 <body class="page-topbar">
 -->
 {if $display_header}
@@ -288,8 +288,8 @@
 {/if}
 
 	<div id="main">
-		{include file='nav-top.tpl'}
-		
+		{include file='nav.tpl'}
+
 		<div id="content" class="page-content">
 {if $display_header && $install_dir_exists}
 			<div class="alert alert-warning">

admin-dev/themes/default/template/nav-top.tpl

@@ -1,39 +0,0 @@
-<nav id="nav-topbar" data-spy="affix" data-offset-top="0" role="navigation">
-{if !$tab}
-	<div class="mainsubtablist" style="display:none"></div>
-{/if}
-	<span class="menu-collapse">
-		<i class="icon-align-justify"></i>
-	</span>
-{if $controller_name != 'AdminLogin'}
-	<ul class="menu">
-		<li class="maintab {if $smarty.get.controller == 'AdminDashboard'}active{/if}">
-			<a href="{$link->getAdminLink('AdminDashboard')|escape:'htmlall':'UTF-8'}" class="title">
-				<i class="icon-AdminDashboard"></i>
-				<span class="title">{l s='Dashboard'}</span>
-			</a>
-		</li>
-	{foreach $tabs as $t}
-		{if $t.active}
-		<li class="maintab {if $t.sub_tabs}has_submenu{/if} {if $t.current}active{/if}" id="maintab{$t.id_tab}" data-submenu="{$t.id_tab}">
-			<a href="{if count($t.sub_tabs) > 0}{$t.sub_tabs[0].href}{else}#{/if}" class="title" >
-				<i class="icon-{$t.class_name}"></i>
-				<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
-			</a>
-			<ul class="submenu">
-			{foreach from=$t.sub_tabs item=t2}
-				{if $t2.active}
-				<li {if $t2.current} class="active"{/if}>
-					<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
-						{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
-					</a>
-				</li>
-				{/if}
-			{/foreach}
-			</ul>
-		</li>
-		{/if}
-	{/foreach}
-	</ul>
-{/if}
-</nav>