Merge pull request #1798 from cmgustavo/ux/user-menu

Removed createWallet page. Added link for create, join and import to the...

css/src/main.css

@@ -128,11 +128,15 @@ header .alt-currency {
   border-bottom-left-radius: 3px;
   position: absolute;
   right: 14px;
-  width: 180px;
+  width: 220px;
   list-style-type: none;
   top: 47px;nt 
 }
 
+.head .menu ul li.divider {
+  border-bottom: 1px solid #eee;
+}
+
 .head .menu ul.hover {
   background: #FFFFFF;
   -moz-box-shadow:    0px 1px 2px 0px rgba(0,0,0,0.25);

js/controllers/create.js

@@ -9,7 +9,7 @@ angular.module('copayApp.controllers').controller('CreateController',
     $scope.isMobile = !!window.cordova;
     $scope.hideAdv = true;
     $scope.networkName = config.networkName;
-    $rootScope.title = 'Create a wallet';
+    $rootScope.title = 'Add new wallet';
 
     // ng-repeat defined number of times instead of repeating over array?
     $scope.getNumber = function(num) {

js/controllers/join.js

@@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('JoinController',
     $rootScope.fromSetup = false;
     $scope.loading = false;
     $scope.isMobile = !!window.cordova;
-    $rootScope.title = 'Join a wallet';
+    $rootScope.title = 'Join an existent wallet';
 
     // QR code Scanner
     var cameraInput;

js/routes.js

@@ -76,10 +76,6 @@ angular
       .when('/profile', {
         templateUrl: 'views/profile.html',
         logged: true
-      })
-      .when('/createWallet', {
-        templateUrl: 'views/createWallet.html',
-        logged: true
       });
 
     if (config.developmentFeatures) {

js/services/controllerUtils.js

@@ -231,7 +231,7 @@ angular.module('copayApp.services')
       if (w) {
         root.setFocusedWallet(w);
       } else {
-        $location.path('/createWallet');
+        $location.path('/create');
       }
       $timeout(function() {
         $rootScope.$digest()

views/create.html

@@ -57,10 +57,6 @@
 
 
             <div class="text-right">
-              <a class="back-button m20r text-primary" href="#!/createWallet">
-                <i class="icon-arrow-left2 vm"></i> 
-                <span translate>Back</span>
-              </a>
               <button translate  type="submit" class="button primary m0" ng-disabled="setupForm.$invalid || loading">
                 Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
               </button>

views/import.html

@@ -83,10 +83,6 @@
 
 
             <div class="text-right m20t">
-              <a class="back-button m20r text-black" href="#!/createWallet">
-                <i class="icon-arrow-left2 vm"></i> 
-                <span translate>Back</span>
-              </a>
               <button translate type="submit" class="button black m0" ng-disabled="importForm.$invalid">
                 Import backup
               </button>

views/includes/head.html

@@ -24,10 +24,15 @@
     <i class="icon-arrow-down size-16 vm"></i> 
   </a>
   <ul ng-show="hoverMenu" ng-class="{'hover': hoverMenu}">
+    <li><a class="text-gray size-16" href="#!/create" title="Add new wallet">
+      <i class="fi-plus m10r"></i> {{'Add new wallet'|translate}}</a></li>
+    <li><a class="text-gray size-16" href="#!/join" title="Join an existent wallet">
+      <i class="fi-torsos-all m10r"></i> {{'Join an existent wallet'|translate}}</a></li>
+    <li><a class="text-gray size-16" href="#!/import" title="Import a backup">
+      <i class="fi-download m10r"></i> {{'Import a backup'|translate}}</a></li>
+    <li class="divider"></li>
     <li><a class="text-gray size-16" href="#!/profile" title="Profile">
-      <i class="fi-torso m10r"></i> {{'Profile'|translate}}</a></li>
-    <li><a class="text-gray size-16" href="#!/createWallet" title="Create Wallet">
-      <i class="fi-plus m10r"></i> {{'Create Wallet'|translate}}</a></li>
+      <i class="fi-torso m10r"></i> {{'Profile'|translate}}</a></li> 
     <li><a class="text-gray size-16" href="#!/" title="Close" ng-click="signout()">
       <i class="fi-power m10r"></i> {{'Close'|translate}}</a></li>
   </ul>

views/includes/sidebar-mobile.html

@@ -55,10 +55,6 @@
         </div>
         </li>
       </ul>
-      <div class="off-canvas-list" ng-click="toggleWalletSelection()">
-        <a href="#!/createWallet" class="button-setup add-wallet db p20h"
-          title="Create"><i class="m5r fi-plus"></i> {{'Create Wallet' | translate }} </a>
-      </div>
     </div>
     <div class="line-t" ng-show="!walletSelection" ng-click="refresh()">
       <a class="side-bar text-gray right" title="Manual Refresh"><i class="fi-refresh"></i></a>
@@ -87,15 +83,23 @@
         <i class="size-24 m20r {{item.icon}}"></i> {{item.title}}
         <span class="label alert round" ng-if="item.link=='send' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
       </a>
+    </li> 
+    <li>
+      <a href="#!/create" class="db p20h" title="Add new wallet">
+        <i class="size-24 m20r fi-plus"></i> {{'Add new wallet' | translate }} </a>
+    </li>
+    <li>
+    <a href="#!/join" class="db p20h" title="Join an existent wallet">
+      <i class="size-24 m20r fi-torsos-all"></i> {{'Join an existent wallet' | translate }} </a>
+    </li>
+    <li>
+    <a href="#!/import" class="db p20h" title="Import a backup">
+      <i class="size-24 m20r fi-download"></i> {{'Import a backup' | translate }} </a>
     </li>
     <li>
       <a href="#!/profile" class="db p20h" title="Profile">
         <i class="size-24 m20r fi-torso"></i> {{'Profile' | translate }} </a>
     </li>
-    <li>
-      <a href="#!/createWallet" class="db p20h" title="Create">
-        <i class="size-24 m20r fi-plus"></i> {{'Create Wallet' | translate }} </a>
-    </li>
     <li>
       <a href="#!/" class="db p20h" title="Close"
         ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>

views/join.html

@@ -70,10 +70,6 @@
             </div>
 
             <div class="text-right">
-              <a class="back-button m20r" href="#!/createWallet">
-                <i class="icon-arrow-left2 vm"></i> 
-                <span translate>Back</span>
-              </a>
               <button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button>
             </div>
           </div>