From cb2e6e45cf112e868dd761ad98cf2df7ad41e54b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 17:08:03 -0300 Subject: [PATCH 1/4] Hide reference of wallets 1-1 on sidebar --- public/views/includes/sidebar.html | 8 ++++---- src/css/main.css | 1 + src/css/mobile.css | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 4f57af1d6..9ebccb657 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -8,15 +8,15 @@ ng-repeat="item in sidebar.wallets track by $index" ng-class="{'selected': item.id == index.walletId}" class="nav-item"> - +
{{(item.name || item.id) | limitTo: 1}}
-
{{item.name || item.id}}
-
{{item.m}} of {{item.n}}
+
{{item.name || item.id}}
+
{{item.m}} of {{item.n}}
  • - +
    diff --git a/src/css/main.css b/src/css/main.css index 551246265..d29a7c9b7 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -338,6 +338,7 @@ ul.manage li { .size-72 { font-size: 72px; } .m5 {margin: 5px;} .m5t {margin-top: 5px;} +.m8t {margin-top: 8px;} .m5b {margin-bottom: 5px;} .m5r {margin-right: 5px;} .m10 {margin: 10px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index 252899b64..c9708913e 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -303,9 +303,7 @@ a.missing-copayers { } .sidebar header { - width: 100%; text-align: center; - height: 7rem; padding: 1.7rem; border-bottom: 1px solid #384B5F; } From 6d213a93ebec40732337b06dce0d7e23a5d8a8e7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 17:48:47 -0300 Subject: [PATCH 2/4] Fix homewallet for 1-1 --- public/views/walletHome.html | 11 ++++++----- src/css/mobile.css | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 3c40e3ab7..562ecf832 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -113,18 +113,19 @@

    - {{index.m}} of {{index.n}} + {{index.walletName}}

    - Multisignature wallet - Testnet + Multisignature wallet ({{index.m}} of {{index.n}}) + - Testnet

    - {{index.m}} of {{index.n}} + {{index.walletName}}

    -
    - Personal Wallet - Testnet +
    + Testnet
    diff --git a/src/css/mobile.css b/src/css/mobile.css index c9708913e..32e8daa36 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -205,8 +205,8 @@ _:-ms-fullscreen, :root .main { .walletHome .wallet-info { margin-left: 85px; line-height: 110%; - float: left; - margin-bottom: 20px; + height: 60px; + overflow: hidden; } .copayers { From 58cc46de60f5aff09aaefe7c4ac96a94e64903cd Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 18:18:19 -0300 Subject: [PATCH 3/4] Alias --- public/views/walletHome.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 562ecf832..7e24a8dac 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -113,7 +113,7 @@

    - {{index.walletName}} + {{(index.alias || index.walletName)}}

    Multisignature wallet ({{index.m}} of {{index.n}}) @@ -122,7 +122,7 @@

    - {{index.walletName}} + {{(index.alias || index.walletName)}}

    Testnet From ce0a7584b3b81909b1a84639df68641730472a2c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 04:05:13 -0300 Subject: [PATCH 4/4] Splits creating personal and multisign wallets --- public/views/create.html | 18 +++++++++++++++--- src/js/controllers/create.js | 11 ++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index cc04dddec..a62aadcdc 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -6,7 +6,7 @@ -
    +
    @@ -21,6 +21,16 @@
    +
    + Personal + Multisignature +
    @@ -47,10 +57,12 @@
    -
    +
    diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 02cbfa2d9..0aae93968 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -29,18 +29,19 @@ angular.module('copayApp.controllers').controller('createController', } var updateRCSelect = function(n) { + $scope.totalCopayers = n; var maxReq = COPAYER_PAIR_LIMITS[n]; self.RCValues = lodash.range(1, maxReq + 1); $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq); }; - $scope.$watch('totalCopayers', function(tc) { - updateRCSelect(tc); - }); - - this.TCValues = lodash.range(1, defaults.limits.totalCopayers + 1); + this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1); $scope.totalCopayers = defaults.wallet.totalCopayers; + this.setTotalCopayers = function(tc) { + updateRCSelect(tc); + }; + this.create = function(form) { if (form && form.$invalid) { this.error = gettext('Please enter the required fields');