From 4088810f5e2f5f5d0294f4ce17bb1644f42bdfcb Mon Sep 17 00:00:00 2001
From: "Pablo Martin (wdp)" <caedes@sindominio.net>
Date: Fri, 5 Aug 2016 21:44:23 +0200
Subject: [PATCH] Move tools and dev tools to the sidebar.

---
 src/html/partials/settings.html |  3 +--
 src/html/partials/sidebar.html  | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/html/partials/settings.html b/src/html/partials/settings.html
index 60179383..2050185d 100644
--- a/src/html/partials/settings.html
+++ b/src/html/partials/settings.html
@@ -52,6 +52,7 @@ <h5>{{'Notifications'|_}}</h5>
           <input id="checkbox-notify" ng-model="settings.notifications.popup" type="checkbox" ng-change="storeSettings()"><label for="checkbox-notify">{{'For chat messages'|_}}</label><br>
           <h5>{{'Language'|_}}</h5>
           <select id="select-language" ng-model="settings.language" ng-change="languageChanged()" ng-options="language.code as language.name for language in languages"></select>
+          <input id="checkbox-devmode" ng-model="settings.advanced" ng-change="setAdvanced()" type="checkbox"><label for="checkbox-devmode">{{'Enable developer mode'|_}}</label><br>
         </div>
         <div ng-controller="ServersCtrl" class="panel setback net">
           <h5>{{'Servers'|_}}</h5>
@@ -127,7 +128,5 @@ <h5>{{'Local currency'|_}}</h5>
           <select ng-model="selectedFiat" ng-options="key as value.name for (key , value) in fiatCurrencies" ng-change="fiatCurrencyChanged()">
           </select>
         </div>
-        <a class="button fa fa-gears postfix" href="#tools">{{'Tools'|_}}</a>
-        <a class="button fa fa-flask postfix" href="#dev">{{'Development'|_}}</a>
       </div>
 </div>
diff --git a/src/html/partials/sidebar.html b/src/html/partials/sidebar.html
index f9b7b556..f9f834a8 100644
--- a/src/html/partials/sidebar.html
+++ b/src/html/partials/sidebar.html
@@ -12,7 +12,7 @@
       <a href="" ng-click="selectPocket(hdPocket.name, $index)">{{hdPocket.name | pocket}}</a>
     </li>
     <li class="divider"></li>
-    <li>
+    <li ng-if="allFunds.length">
       <a class="cornerbutton" ng-class="" ng-click=""><label><i class="fa fa-chevron-up"></i></label></a>
       <label>{{'multisig funds'|_}} </label>
     </li>
@@ -26,17 +26,18 @@
 
     <li><label>Management</label></li>
 
+    <li title="{{'Identities'|_}}" ng-class="{active:isActive('/identities')}"><a ng-show="identityName" href="#identities"><i class="icon-wallet"></i> {{'Wallets'|_}} ({{identityName}})</a></li>
     <li ng-class="{active:isActive('/contact')}"><a href="#contacts"><i class="icon-contacts"></i> {{'Contacts'|_}}</a></li>
 
-    <li title="{{'Settings'|_}}" id="settings" ng-class="{active:isActive('/settings')}"><a href="#settings"><i class="icon-cog"></i> {{'Settings'|_}}</a></li>
-
-
-    <li title="{{'Identities'|_}}" ng-class="{active:isActive('/identities')}"><a ng-show="identityName" href="#identities"><i class="icon-wallet"></i> {{'Wallets'|_}} ({{identityName}})</a></li>
     <li ng-class="{active:isActive('/send')}"><a href="#send"><i class="icon-rocket"></i> {{'Send'|_}}</a></li>
 
     <li ng-class="{active:isActive('/lobby')}"><a href="#lobby"><i class="icon-chat"></i> {{'Lobby'|_}}</a></li>
 
     <li title="{{'Gateway'|_}}: {{status.obelisk}}" ng-show="!settings.advanced && status.obelisk!='ok'"><a><i class="fa fa-chain-broken"></i> Disconnected!!</a></li>
-    <li ng-show="settings.advanced" title="{{'Block explorer'|_}}" ng-class="{active:isActive('/browser')}"><a href="#browser"><i class="fa fa-sitemap"></i> {{'Browser'|_}} {{currentHeight}}</a></li>
+    <li ng-show="settings.advanced"><label>Tools</label></li>
+    <li title="{{'Tools'|_}}" id="settings" ng-class="{active:isActive('/tools')}"><a href="#tools"><i class="icon-cog"></i> {{'Tools'|_}}</a></li>
+    <li title="{{'Settings'|_}}" id="settings" ng-class="{active:isActive('/settings')}"><a href="#settings"><i class="icon-cog"></i> {{'Settings'|_}}</a></li>
+    <li ng-if='settings.advanced' title="{{'Dev'|_}}" id="settings" ng-class="{active:isActive('/dev')}"><a href="#development"><i class="icon-cog"></i> {{'Dev'|_}}</a></li>
+    <li ng-show="settings.advanced" title="{{'Block explorer'|_}}" ng-class="{active:isActive('/browser')}"><a href="#browser"><i class="fa fa-sitemap"></i> {{currentHeight}}</a></li>
 
 </ul>