From 72cfc49d554f62a3dae2895084eaf35560f51028 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Nov 2014 11:10:39 -0300 Subject: [PATCH] Removed createWallet page. Added link for create, join and import to the top menu. --- css/src/main.css | 6 +++++- js/controllers/create.js | 2 +- js/controllers/join.js | 2 +- js/routes.js | 4 ---- js/services/controllerUtils.js | 2 +- views/create.html | 4 ---- views/import.html | 4 ---- views/includes/head.html | 11 ++++++++--- views/includes/sidebar-mobile.html | 20 ++++++++++++-------- views/join.html | 4 ---- 10 files changed, 28 insertions(+), 31 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index d0c4b7fc1..b984e347b 100644 --- a/css/src/main.css +++ b/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); diff --git a/js/controllers/create.js b/js/controllers/create.js index 0f7cd7593..5a96adf46 100644 --- a/js/controllers/create.js +++ b/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) { diff --git a/js/controllers/join.js b/js/controllers/join.js index 392c43701..0a97826b1 100644 --- a/js/controllers/join.js +++ b/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; diff --git a/js/routes.js b/js/routes.js index f1747c928..7cccf70aa 100644 --- a/js/routes.js +++ b/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) { diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 24a4c57f8..b4f59e995 100644 --- a/js/services/controllerUtils.js +++ b/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() diff --git a/views/create.html b/views/create.html index 592f47a36..85396b9b0 100644 --- a/views/create.html +++ b/views/create.html @@ -57,10 +57,6 @@
- - - Back - diff --git a/views/import.html b/views/import.html index 79cd6074d..e5f49ed3a 100644 --- a/views/import.html +++ b/views/import.html @@ -83,10 +83,6 @@
- - - Back - diff --git a/views/includes/head.html b/views/includes/head.html index c6daa80d9..80705cedc 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -24,10 +24,15 @@ diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 858326237..10e6aec54 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -55,10 +55,6 @@
-
- {{'Create Wallet' | translate }} -
@@ -87,15 +83,23 @@ {{item.title}} {{$root.pendingTxCount}} + +
  • + + {{'Add new wallet' | translate }} +
    • +
  • + + {{'Join an existent wallet' | translate }} +
    • +
  • + + {{'Import a backup' | translate }}
  • {{'Profile' | translate }}
    • -
  • - - {{'Create Wallet' | translate }} -
  • {{'Close'|translate}} diff --git a/views/join.html b/views/join.html index 7489efa27..00c306692 100644 --- a/views/join.html +++ b/views/join.html @@ -70,10 +70,6 @@
    • - - - Back -