From 80e2eb73784e6d4d1d85b4b5512ed64ba8ce2314 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Nov 2014 17:29:59 -0300 Subject: [PATCH 1/6] fixes sidebar: hide locked balance when selecting wallet --- views/includes/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 96b2fe375..8cb8396f4 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -31,7 +31,7 @@ -
+
{{'Locked'|translate}}   From 33b8412b97bad4cf891c7247c262fa58ab689886 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Nov 2014 17:31:00 -0300 Subject: [PATCH 2/6] fix sidebar tooltip and label for addresses --- css/src/main.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/src/main.css b/css/src/main.css index 14e818f75..de889402a 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -630,7 +630,6 @@ a.button-setup { width: 100%; padding: 0.3rem 0.7rem; color: white; - border-bottom: 1px solid #374756; } .hidden { @@ -808,6 +807,12 @@ input[type=number]::-webkit-outer-spin-button { background-color: #1ABC9C; } +.addresses .label { + font-weight: normal; + padding: .2rem .3rem; + font-size: 8px; +} + .label.success { background-color: #1ABC9C; } From 2122ccff43b0e683e90e9f830185201b6fae7908 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Nov 2014 17:33:00 -0300 Subject: [PATCH 3/6] fix addresses to string. fix layout of receive --- css/src/mobile.css | 21 +++++++++-- js/models/Wallet.js | 3 +- views/receive.html | 92 ++++++++++++++++++++++++--------------------- 3 files changed, 69 insertions(+), 47 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index 8f04fb956..400c76249 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -39,7 +39,7 @@ margin-top: 40px; margin-left: 0; margin-bottom: -40px; - padding: 20px 10px 60px 10px; + padding: 20px 0 60px 0; } .tab-bar { @@ -116,8 +116,8 @@ color: white; } - .addresses .panel { - padding: 1rem 0.8rem; + .panel { + padding: 0.5rem; } .btn-copy { @@ -184,3 +184,18 @@ } +@media (max-width: 640px) { + .tx-date { + margin-bottom: 10px; + padding-bottom: 10px; + border-bottom: 1px solid #eee; + } + + .tx-comment { + border-top: 1px solid #eee; + padding-top: 10px; + margin-top: 10px; + } + +} + diff --git a/js/models/Wallet.js b/js/models/Wallet.js index 2695c94f3..dcdf76a7e 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -2823,7 +2823,7 @@ Wallet.prototype.getTransactionHistory = function(cb) { return { type: 'out', - address: addr ? addr : itemAddr, + address: addr ? addr.addressStr : itemAddr, isMine: !_.isUndefined(addr), isChange: addr ? !!addr.isChange : false, label: self.addressBook[itemAddr] ? self.addressBook[itemAddr].label : undefined, @@ -2880,6 +2880,7 @@ Wallet.prototype.getTransactionHistory = function(cb) { }); tx.comment = proposal ? proposal.comment : undefined; tx.labelTo = firstOut ? firstOut.label : undefined; + tx.addressTo = firstOut ? firstOut.address : undefined; tx.amountSat = Math.abs(amount); tx.amount = tx.amountSat * satToUnit; tx.sentTs = proposal ? proposal.sentTs : undefined; diff --git a/views/receive.html b/views/receive.html index 391270c2f..c82c2443b 100644 --- a/views/receive.html +++ b/views/receive.html @@ -1,61 +1,67 @@
-

Receive

+

{{$root.title}}

-
-
-
-
-
-
-
+
+
+
+
+
+
+
- - + + change
-
- - - - - {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} - -
-
- Show QR -
-
-
- -
- - change -
-
- +
+ - - + + {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} - + +
+
+ Show QR +
- +
+
+
+
+ + change +
+
+ + + + + {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} + +
+
+
+
+
-
- - - Show all - Show less - - -
- Add +
+
+ + Show all + Show less + +
+ + Add + +
From 1e1f39e3b26f6845157121f588e1848eebaed92a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Nov 2014 17:33:51 -0300 Subject: [PATCH 4/6] fix layout history, manage and settings --- views/history.html | 36 +++++++++++++-------- views/manage.html | 80 +++++++++++++++++++++++----------------------- views/more.html | 2 +- 3 files changed, 64 insertions(+), 54 deletions(-) diff --git a/views/history.html b/views/history.html index 74eaec1bc..d67cb1cc2 100644 --- a/views/history.html +++ b/views/history.html @@ -1,5 +1,6 @@
+

{{$root.title}}

Loading... @@ -15,20 +16,29 @@
-
-   - - - Unconfirmed - +
+
+ + + Unconfirmed + +
-
-
+
{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}} +
+
+ +
+
-   - {{btx.labelTo}} +
+ {{btx.labelTo || btx.addressTo}}
-
- {{btx.comment}} +
+
+ {{btx.comment}}
diff --git a/views/manage.html b/views/manage.html index d010c8138..95e4cf5ef 100644 --- a/views/manage.html +++ b/views/manage.html @@ -1,49 +1,49 @@

{{$root.title}}

-
-
-
-
-
-

Create a new Wallet

- {{'Create' | translate }} -
-
-
-
-
-

Join an existent Wallet

- {{'Join' | translate }} -
-
-
-
-
-

Import a Wallet to Copay

- {{'Import wallet' | translate }} -
-
+
+
+
+
+

Create a new Wallet

+ {{'Create' | translate }} +
+
+
+
+
+

Join an existent Wallet

+ {{'Join' | translate }} +
+
+
+
+
+

Import a Wallet to Copay

+ {{'Import wallet' | translate }} +
+
-
-
-

Backup Profile

-

It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets

-
- Backup profile - View profile backup -
-
- -
- Copy to clipboard -
-
- Copy this text as it is in a safe place (notepad or email) +
+
+
+

Backup Profile

+

It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets

+ Backup profile + View profile backup +
+ +
+ Copy to clipboard +
+
+ Copy this text as it is in a safe place (notepad or email) +
+
diff --git a/views/more.html b/views/more.html index 5dbfd4122..108151341 100644 --- a/views/more.html +++ b/views/more.html @@ -1,5 +1,5 @@
-

{{$root.title}}

+

{{$root.title}}

From a067b24a5742b0286dcbfe67c6c1b6edce75ec88 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Nov 2014 17:52:21 -0300 Subject: [PATCH 5/6] fix layout create, join and import --- views/create.html | 91 ++++++++++++++++++----------------- views/import.html | 85 +++++++++++++++++---------------- views/join.html | 119 ++++++++++++++++++++++++---------------------- 3 files changed, 153 insertions(+), 142 deletions(-) diff --git a/views/create.html b/views/create.html index 1f6e21dbb..5c2535aab 100644 --- a/views/create.html +++ b/views/create.html @@ -4,54 +4,56 @@ Creating wallet...
+

{{$root.title}}

- -

{{$root.title}}

-
-
- -
-
- -
-
- -
-
-
-
-
- +
+
+
+ +
+
+ +
+
+
-
-

(*) The limits are imposed by the bitcoin network.

+
+
+
+ +
+
+
+

(*) The limits are imposed by the bitcoin network.

-
+
-
- - - Show - Hide - advanced options - -
-
- - +
+ + + Show + Hide + advanced options + + + +
+
+ + -

- -

+

+ +

@@ -64,9 +66,10 @@

Using network: {{networkName}} at {{networkUrl}}

-
+
- +
+
diff --git a/views/import.html b/views/import.html index cd6601f54..8b3ec1f33 100644 --- a/views/import.html +++ b/views/import.html @@ -4,44 +4,45 @@ {{ importStatus|translate }}
-
-
- -

{{$root.title}}

-
+
+

{{$root.title}}

+
+
+
+
Choose backup file from your computer + placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
- - + +
- +
- +
@@ -49,39 +50,43 @@ Show Hide advanced options + +
- -
- - Skipping fields: {{skipFields}} -
- -
- - - Back - - -
- +
+ + Skipping fields: {{skipFields}} +
+ + +
+ + + Back + + +
+ +
+
diff --git a/views/join.html b/views/join.html index 6f87b96dc..b2472da64 100644 --- a/views/join.html +++ b/views/join.html @@ -6,73 +6,76 @@

{{$root.title}}

-
-
+
+
+
+ - +
+
+ + + +
+
+   +
+
+   +
+
-
-
- - - -
-
-   -
-
-   -
-
- -
-
- -
-
- - - Get QR code - - +
+
+ +
+
+ + + Get QR code + + +
+
+
+
-
- -
-
-
+
-
- - - Show - Hide - advanced options - -
-
-

- -

+
+ + + Show + Hide + advanced options + + + +
+
+

+ +

-
- - - Back - - +
+ + + Back + + +
From aa58070d7d5a9b42b6b410ffa41bc4b472272c21 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Nov 2014 17:52:55 -0300 Subject: [PATCH 6/6] fixed page not found --- views/errors/404.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/views/errors/404.html b/views/errors/404.html index ea1962f5d..3610e89b2 100644 --- a/views/errors/404.html +++ b/views/errors/404.html @@ -1,9 +1,11 @@ -
+
- Copay + Copay + Copay
-

404

-

Page not found

+

404

+

Page not found

« Back