Merge branch 'master' into 'master'

Modification de l'ordre du menu afin de permettre au néophyte de mieux...

See merge request !586

www/templates/menu.html

@@ -109,29 +109,42 @@
           {{:locale:'MENU.HOME'|translate}}
         </ion-item>
 
+        <!-- USER Section -->
+        <div class="item item-divider"></div>
+
         <a menu-close
            class="item item-icon-left"
            active-link="active"
-           active-link-path-prefix="#/app/currency"
-           ui-sref="app.currency">
-          <i class="icon ion-ios-world-outline"></i>
-          {{:locale:'MENU.CURRENCY'|translate}}
+           active-link-path-prefix="#/app/account"
+           ui-sref="app.view_wallet"
+           ng-class="{'item-menu-disable': !login}">
+          <i class="icon ion-person"></i>
+          {{:locale:'MENU.ACCOUNT'|translate}}
         </a>
-        <a id="helptip-menu-btn-currency"></a>
+        <a id="helptip-menu-btn-account"></a>
 
         <a menu-close
-           class="item item-icon-left hidden-xs hidden-sm"
+           class="item item-icon-left"
            active-link="active"
-           active-link-path-prefix="#/app/network"
-           ui-sref="app.network">
-          <i class="icon ion-cloud"></i>
-          {{:locale:'MENU.NETWORK'|translate}}
+           active-link-path-prefix="#/app/history"
+           ui-sref="app.view_wallet_tx"
+           ng-class="{'item-menu-disable': !login}">
+          <i class="icon ion-card"></i>
+          {{:locale:'MENU.TRANSACTIONS'|translate}}
         </a>
-        <a id="helptip-menu-btn-network"></a>
-
-        <!-- Allow extension here -->
-        <cs-extension-point name="menu-discover"></cs-extension-point>
+        <a id="helptip-menu-btn-tx"></a>
 
+        <a menu-close
+           class="item item-icon-left "
+           active-link="active"
+           active-link-path-prefix="#/app/wallets"
+           ui-sref="app.view_wallets"
+           ng-class="{'item-menu-disable': !login}">
+          <i class="icon ion-card " style="top: -5px; left: 22px; font-size: 18px;"></i>
+          <i class="icon-secondary ion-card" style="top: 22px; left: 19px; font-size: 20px; background-color: white; width:17px; height: 14px;"></i>
+          {{:locale:'MENU.WALLETS'|translate}}
+        </a>
+		  
         <!-- MAIN Section -->
         <div class="item item-divider"></div>
 
@@ -147,41 +160,33 @@
         <!-- Allow extension here -->
         <cs-extension-point name="menu-main"></cs-extension-point>
 
-        <!-- USER Section -->
+        <!-- POWER USER Section -->
         <div class="item item-divider"></div>
-
+		  
         <a menu-close
            class="item item-icon-left"
            active-link="active"
-           active-link-path-prefix="#/app/account"
-           ui-sref="app.view_wallet"
-           ng-class="{'item-menu-disable': !login}">
-          <i class="icon ion-person"></i>
-          {{:locale:'MENU.ACCOUNT'|translate}}
+           active-link-path-prefix="#/app/currency"
+           ui-sref="app.currency">
+          <i class="icon ion-ios-world-outline"></i>
+          {{:locale:'MENU.CURRENCY'|translate}}
         </a>
-        <a id="helptip-menu-btn-account"></a>
+        <a id="helptip-menu-btn-currency"></a>
 
         <a menu-close
-           class="item item-icon-left "
+           class="item item-icon-left hidden-xs hidden-sm"
            active-link="active"
-           active-link-path-prefix="#/app/wallets"
-           ui-sref="app.view_wallets"
-           ng-class="{'item-menu-disable': !login}">
-          <i class="icon ion-card " style="top: -5px; left: 22px; font-size: 18px;"></i>
-          <i class="icon-secondary ion-card" style="top: 22px; left: 19px; font-size: 20px; background-color: white; width:17px; height: 14px;"></i>
-          {{:locale:'MENU.WALLETS'|translate}}
+           active-link-path-prefix="#/app/network"
+           ui-sref="app.network">
+          <i class="icon ion-cloud"></i>
+          {{:locale:'MENU.NETWORK'|translate}}
         </a>
+        <a id="helptip-menu-btn-network"></a>
 
-        <a menu-close
-           class="item item-icon-left"
-           active-link="active"
-           active-link-path-prefix="#/app/history"
-           ui-sref="app.view_wallet_tx"
-           ng-class="{'item-menu-disable': !login}">
-          <i class="icon ion-card"></i>
-          {{:locale:'MENU.TRANSACTIONS'|translate}}
-        </a>
-        <a id="helptip-menu-btn-tx"></a>
+        <!-- Allow extension here -->
+        <cs-extension-point name="menu-discover"></cs-extension-point>
+		  
+		  
 
 
         <div class="item item-divider visible-xs visible-sm"></div>