From f0bed5a1ef09609eaa8a242216e9abdb839c5856 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 19 Aug 2015 14:58:48 -0400
Subject: [PATCH] new menu completed

---
 public/less/admin/header.less     |   4 +-
 src/views/admin/header.tpl        |  53 +-------
 src/views/admin/partials/menu.tpl | 201 +++++++++++++++---------------
 3 files changed, 102 insertions(+), 156 deletions(-)

diff --git a/public/less/admin/header.less b/public/less/admin/header.less
index f319747180..06737fdbc5 100644
--- a/public/less/admin/header.less
+++ b/public/less/admin/header.less
@@ -4,12 +4,13 @@
 	width: 100%;
 	height: 200px;
 	margin-bottom: 50px;
+	font-size: 16px;
 
 	> ul {
 		list-style-type: none;
 		padding: 0px;
 		position: absolute;
-		bottom: 0px;
+		bottom: 10px;
 		left: 50px;
 
 		> li {
@@ -18,7 +19,6 @@
 
 			> a {
 				color: white;
-				font-size: 20px;
 				text-transform: uppercase;
 				text-decoration: none;
 			}
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index 5118b8250e..60c32d5026 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -151,57 +151,6 @@
 			</div>
 		</nav>-->
 
-		<nav class="header">
-			<ul>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">General</a>
-					<ul class="dropdown-menu" role="menu">
-						<li><a href="#">Action</a></li>
-						<li><a href="#">Another action</a></li>
-						<li><a href="#">Something else here</a></li>
-						<li class="divider"></li>
-						<li><a href="#">Separated link</a></li>
-						<li class="divider"></li>
-						<li><a href="#">One more separated link</a></li>
-					</ul>
-				</li>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings</a>
-					<ul class="dropdown-menu" role="menu">
-						<li><a href="#">Action</a></li>
-						<li><a href="#">Another action</a></li>
-						<li><a href="#">Something else here</a></li>
-						<li class="divider"></li>
-						<li><a href="#">Separated link</a></li>
-						<li class="divider"></li>
-						<li><a href="#">One more separated link</a></li>
-					</ul>
-				</li>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Manage</a>
-					<ul class="dropdown-menu" role="menu">
-						<li><a href="#">Action</a></li>
-						<li><a href="#">Another action</a></li>
-						<li><a href="#">Something else here</a></li>
-						<li class="divider"></li>
-						<li><a href="#">Separated link</a></li>
-						<li class="divider"></li>
-						<li><a href="#">One more separated link</a></li>
-					</ul>
-				</li>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Appearance</a>
-					<ul class="dropdown-menu" role="menu">
-						<li><a href="#">Action</a></li>
-						<li><a href="#">Another action</a></li>
-						<li><a href="#">Something else here</a></li>
-						<li class="divider"></li>
-						<li><a href="#">Separated link</a></li>
-						<li class="divider"></li>
-						<li><a href="#">One more separated link</a></li>
-					</ul>
-				</li>
-			</ul>
-		</nav>
+		<!-- IMPORT admin/partials/menu.tpl -->
 		
 		<div class="container" id="content">
\ No newline at end of file
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index ff59c181d9..984d632455 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -1,103 +1,100 @@
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-dashboard"></i> General</li>
-						<li class="active"><a href="{relative_path}/admin/general/dashboard">Dashboard</a></li>
-						<li><a href="{relative_path}/admin/general/homepage">Home Page</a></li>
-						<li><a href="{relative_path}/admin/general/navigation">Navigation</a></li>
-						<li><a href="{relative_path}/admin/general/languages">Languages</a></li>
-						<li><a href="{relative_path}/admin/general/sounds">Sounds</a></li>
-					</ul>
-				</div>
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-comments-o"></i> Manage</li>
-						<li><a href="{relative_path}/admin/manage/categories">Categories</a></li>
-						<li><a href="{relative_path}/admin/manage/tags">Tags</a></li>
-						<li><a href="{relative_path}/admin/manage/users">Users</a></li>
-						<li><a href="{relative_path}/admin/manage/groups">Groups</a></li>
-						<li><a href="{relative_path}/admin/manage/flags">Flags</a></li>
-					</ul>
-				</div>
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-cogs"></i> Settings</li>
-						<li><a href="{relative_path}/admin/settings/general">General</a></li>
-						<li><a href="{relative_path}/admin/settings/reputation">Reputation</a></li>
-						<li><a href="{relative_path}/admin/settings/email">Email</a></li>
-						<li><a href="{relative_path}/admin/settings/user">User</a></li>
-						<li><a href="{relative_path}/admin/settings/group">Group</a></li>
-						<li><a href="{relative_path}/admin/settings/guest">Guests</a></li>
-						<li><a href="{relative_path}/admin/settings/post">Post</a></li>
-						<li><a href="{relative_path}/admin/settings/pagination">Pagination</a></li>
-						<li><a href="{relative_path}/admin/settings/tags">Tags</a></li>
-						<li><a href="{relative_path}/admin/settings/notifications">Notifications</a></li>
-						<li><a href="{relative_path}/admin/settings/web-crawler">Web Crawler</a></li>
-						<li><a href="{relative_path}/admin/settings/sockets">Sockets</a></li>
-						<li><a href="{relative_path}/admin/settings/advanced">Advanced</a></li>
-					</ul>
-				</div>
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-paint-brush"></i> Appearance</li>
-						<li><a href="{relative_path}/admin/appearance/themes">Themes</a></li>
-						<li><a href="{relative_path}/admin/appearance/skins">Skins</a></li>
-						<li><a href="{relative_path}/admin/appearance/customise">Custom HTML &amp; CSS</a></li>
-					</ul>
-				</div>
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-wrench"></i> Extend</li>
-						<li><a href="{relative_path}/admin/extend/plugins">Plugins</a></li>
-						<li><a href="{relative_path}/admin/extend/widgets">Widgets</a></li>
-						<li><a href="{relative_path}/admin/extend/rewards">Rewards</a></li>
-					</ul>
-				</div>
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-hdd-o"></i> Advanced</li>
-						<li><a href="{relative_path}/admin/advanced/database">Database</a></li>
-						<li><a href="{relative_path}/admin/advanced/events">Events</a></li>
-						<li><a href="{relative_path}/admin/advanced/logs">Logs</a></li>
-						<li><a href="{relative_path}/admin/advanced/post-cache">Post Cache</a></li>
-					</ul>
-				</div>
-				<!-- IF authentication.length -->
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-facebook-square"></i> Social Authentication</li>
-						<!-- BEGIN authentication -->
-						<li>
-							<a href="{relative_path}/admin{authentication.route}">{authentication.name}</a>
-						</li>
-						<!-- END authentication -->
-					</ul>
-				</div>
-				<!-- ENDIF authentication.length -->
-				<!-- IF plugins.length -->
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-th"></i> Installed Plugins</li>
-						<!-- BEGIN plugins -->
-						<li>
-							<a href="{relative_path}/admin{plugins.route}">
-							<!-- IF plugins.icon -->
-							<i class="fa {plugins.icon}"></i>
-							<!-- ENDIF plugins.icon -->
-							{plugins.name}
-							</a>
-						</li>
-						<!-- END plugins -->
-						<li data-link="1">
-							<a href="{relative_path}/admin/extend/plugins"><i class="fa fa-plus"></i> Install Plugins</a>
-						</li>
-					</ul>
-				</div>
-				<!-- ENDIF plugins.length -->
+<nav class="header">
+	<ul>
+		<li>
+			<a href="{relative_path}/admin/general/dashboard">Dashboard</a>
+		</li>
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">General</a>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="{relative_path}/admin/general/homepage">Home Page</a></li>
+				<li><a href="{relative_path}/admin/general/navigation">Navigation</a></li>
+				<li><a href="{relative_path}/admin/general/languages">Languages</a></li>
+				<li><a href="{relative_path}/admin/general/sounds">Sounds</a></li>
+			</ul>
+		</li>
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Manage</a>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="{relative_path}/admin/manage/categories">Categories</a></li>
+				<li><a href="{relative_path}/admin/manage/tags">Tags</a></li>
+				<li><a href="{relative_path}/admin/manage/users">Users</a></li>
+				<li><a href="{relative_path}/admin/manage/groups">Groups</a></li>
+				<li><a href="{relative_path}/admin/manage/flags">Flags</a></li>
+			</ul>
+		</li>
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Settings</a>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="{relative_path}/admin/settings/general">General</a></li>
+				<li><a href="{relative_path}/admin/settings/reputation">Reputation</a></li>
+				<li><a href="{relative_path}/admin/settings/email">Email</a></li>
+				<li><a href="{relative_path}/admin/settings/user">User</a></li>
+				<li><a href="{relative_path}/admin/settings/group">Group</a></li>
+				<li><a href="{relative_path}/admin/settings/guest">Guests</a></li>
+				<li><a href="{relative_path}/admin/settings/post">Post</a></li>
+				<li><a href="{relative_path}/admin/settings/pagination">Pagination</a></li>
+				<li><a href="{relative_path}/admin/settings/tags">Tags</a></li>
+				<li><a href="{relative_path}/admin/settings/notifications">Notifications</a></li>
+				<li><a href="{relative_path}/admin/settings/web-crawler">Web Crawler</a></li>
+				<li><a href="{relative_path}/admin/settings/sockets">Sockets</a></li>
+				<li><a href="{relative_path}/admin/settings/advanced">Advanced</a></li>
+			</ul>
+		</li>
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Appearance</a>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="{relative_path}/admin/appearance/themes">Themes</a></li>
+				<li><a href="{relative_path}/admin/appearance/skins">Skins</a></li>
+				<li><a href="{relative_path}/admin/appearance/customise">Custom HTML &amp; CSS</a></li>
+			</ul>
+		</li>
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Extend</a>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="{relative_path}/admin/extend/plugins">Plugins</a></li>
+				<li><a href="{relative_path}/admin/extend/widgets">Widgets</a></li>
+				<li><a href="{relative_path}/admin/extend/rewards">Rewards</a></li>
+			</ul>
+		</li>
+		<!-- IF authentication.length -->
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Social Authentication</a>
+			<ul class="dropdown-menu" role="menu">
+				<!-- BEGIN authentication -->
+				<li>
+					<a href="{relative_path}/admin{authentication.route}">{authentication.name}</a>
+				</li>
+				<!-- END authentication -->
+			</ul>
+		</li>
+		<!-- ENDIF authentication.length -->
+		<!-- IF plugins.length -->
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Plugins</a>
+			<ul class="dropdown-menu" role="menu">
+				<!-- BEGIN plugins -->
+				<li>
+					<a href="{relative_path}/admin{plugins.route}">{plugins.name}</a>
+				</li>
+				<!-- END plugins -->
+				<li class="divider"></li>
+				<li data-link="1">
+					<a href="{relative_path}/admin/extend/plugins"><i class="fa fa-plus"></i> Install Plugins</a>
+				</li>
+			</ul>
+		</li>
+		<!-- ENDIF plugins.length -->
+		<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Advanced</a>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="{relative_path}/admin/advanced/database">Database</a></li>
+				<li><a href="{relative_path}/admin/advanced/events">Events</a></li>
+				<li><a href="{relative_path}/admin/advanced/logs">Logs</a></li>
+				<li><a href="{relative_path}/admin/advanced/post-cache">Post Cache</a></li>
 				<!-- IF env -->
-				<div class="sidebar-nav">
-					<ul class="nav nav-list">
-						<li class="nav-header"><i class="fa fa-fw fa-th"></i> Development</li>
-						<li><a href="{relative_path}/admin/development/logger">Logger</a></li>
-					</ul>
-				</div>
-				<!-- ENDIF env -->
\ No newline at end of file
+				<li><a href="{relative_path}/admin/development/logger">Logger</a></li>
+				<!-- ENDIF env -->
+			</ul>
+		</li>
+	</ul>
+</nav>
\ No newline at end of file