From 30c8fffd8fb5037bc64dcb54e7fdb41edb9c4f84 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@nebulon.de>
Date: Tue, 24 Feb 2015 18:42:08 +0100
Subject: [PATCH] Move settings link to navbar

---
 webadmin/dist/index.html | 4 +---
 webadmin/src/index.html  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/webadmin/dist/index.html b/webadmin/dist/index.html
index 470d44e94..d70341000 100644
--- a/webadmin/dist/index.html
+++ b/webadmin/dist/index.html
@@ -155,6 +155,7 @@
                   <ul class="dropdown-menu" role="menu">
                     <li><a href="#/account"><i class="fa fa-user fa-fw"></i> Account</a></li>
                     <li><a href="#/security"><i class="fa fa-unlock-alt fa-fw"></i> Security</a></li>
+                    <li ng-show="userInfo.admin"><a href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a></li>
                     <li class="divider"></li>
                     <li><a href="" ng-click="logout($event)"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
                   </ul>
@@ -183,9 +184,6 @@
                                 </li>
                             </ul>
                         </li>
-                        <li ng-show="userInfo.admin">
-                            <a ng-class="{ active: isActive('/settings')}" href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a>
-                        </li>
                     </ul>
                 </div>
                 <!-- /.sidebar-collapse -->
diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index 470d44e94..d70341000 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -155,6 +155,7 @@
                   <ul class="dropdown-menu" role="menu">
                     <li><a href="#/account"><i class="fa fa-user fa-fw"></i> Account</a></li>
                     <li><a href="#/security"><i class="fa fa-unlock-alt fa-fw"></i> Security</a></li>
+                    <li ng-show="userInfo.admin"><a href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a></li>
                     <li class="divider"></li>
                     <li><a href="" ng-click="logout($event)"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
                   </ul>
@@ -183,9 +184,6 @@
                                 </li>
                             </ul>
                         </li>
-                        <li ng-show="userInfo.admin">
-                            <a ng-class="{ active: isActive('/settings')}" href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a>
-                        </li>
                     </ul>
                 </div>
                 <!-- /.sidebar-collapse -->