From 67190909b6137683201b84b3dee982e8711b5363 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 17 Jul 2014 15:08:03 -0300 Subject: [PATCH 1/4] include duplicate: angular-route-min --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index e337dfde1..dc7f47cb5 100644 --- a/index.html +++ b/index.html @@ -37,7 +37,6 @@ - From 0ffb8eb42f9da7cba975af951ffe7a83226fea41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 17 Jul 2014 15:09:44 -0300 Subject: [PATCH 2/4] New schema for signin/join a wallet --- js/controllers/signin.js | 22 ++++++++++ views/signin.html | 87 ++++++++++++++++++++++------------------ 2 files changed, 69 insertions(+), 40 deletions(-) diff --git a/js/controllers/signin.js b/js/controllers/signin.js index 6503d46ab..3c7a097d8 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -75,4 +75,26 @@ angular.module('copayApp.controllers').controller('SigninController', }); }); } + + $scope.isHome = 1; + $scope.isJoin = 0; + $scope.isOpen = 0; + + $scope.backWallet = function() { + $scope.isHome = 1; + $scope.isJoin = 0; + $scope.isOpen = 0; + }; + + $scope.openWallet = function() { + $scope.isHome = 0; + $scope.isJoin = 0; + $scope.isOpen = 1; + }; + + $scope.joinWallet = function() { + $scope.isHome = 0; + $scope.isOpen = 0; + $scope.isJoin = 1; + }; }); diff --git a/views/signin.html b/views/signin.html index e420e2b52..bff920108 100644 --- a/views/signin.html +++ b/views/signin.html @@ -5,52 +5,59 @@
-
- +
+

Open Wallet

+
+ + + « Back + +
-
- +
+

Open a wallet

+ Open +
+
+

Create a new wallet

+ Create +
+
+

Join a Wallet in Creation

+
+ + + + « Back + +
+
+
+

Join a Wallet in Creation

+ Join +
+
+
Create a wallet
+ Create
-
+
+

+ Copay is a free, open-source, multisignature bitcoin wallet. A single-owner bitcoin wallet's security depends on carefully securing the private keys. With copay you can have multiple people controlling the funds, using bitcoin's multisignature functionality, requiring no trust in any third party. +

Settings · - - Create a new wallet · - Import a backup
From f7e4390507ed395310fec9d6a89dd36baa306763 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 17 Jul 2014 16:00:58 -0300 Subject: [PATCH 3/4] Split create new wallet page --- js/controllers/setup.js | 6 ++++++ views/setup.html | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/js/controllers/setup.js b/js/controllers/setup.js index 3ac730299..cd3811853 100644 --- a/js/controllers/setup.js +++ b/js/controllers/setup.js @@ -85,4 +85,10 @@ angular.module('copayApp.controllers').controller('SetupController', }); }; + $scope.isSetupWalletPage = 0; + + $scope.setupWallet = function() { + $scope.isSetupWalletPage = !$scope.isSetupWalletPage; + }; + }); diff --git a/views/setup.html b/views/setup.html index b8c83f8fa..67aadbb05 100644 --- a/views/setup.html +++ b/views/setup.html @@ -8,10 +8,10 @@

Create new wallet

-