From 6a9e2a0a323ba98243e2d9cecc1d4ea1040a9818 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 4 Nov 2014 13:02:03 -0300 Subject: [PATCH 1/3] fix settings layout --- css/src/main.css | 2 +- css/src/style.css | 1 + views/history.html | 2 +- views/more.html | 197 ++++++++++++++++++++++++--------------------- 4 files changed, 108 insertions(+), 94 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index c36bdbb93..f1ca614f7 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -218,7 +218,7 @@ header .alt-currency { width: 30px; float: right; background-color: #23C9A9; - padding: 22px 6px; + padding: 16px 6px; color: #B6E9DF; } diff --git a/css/src/style.css b/css/src/style.css index 3ed5344a0..83be1d8bd 100644 --- a/css/src/style.css +++ b/css/src/style.css @@ -17,6 +17,7 @@ font-variant: normal; text-transform: none; line-height: 1; + vertical-align: middle; /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; diff --git a/views/history.html b/views/history.html index 1ba55ef8f..27ac42776 100644 --- a/views/history.html +++ b/views/history.html @@ -49,7 +49,7 @@
- +
diff --git a/views/more.html b/views/more.html index 03d72ad6b..95c7fe1be 100644 --- a/views/more.html +++ b/views/more.html @@ -1,120 +1,133 @@

{{$root.title}}

-
-
-
- Wallet Unit - -
-
- Alternative Currency - -
-
-
-
-
-

Backup

-

- It's important to backup your wallet so that you can recover it in case of disaster -

- Download File - View Backup -
-
- - Copy to clipboard +
+
+
+
+ Wallet Unit + +
-
- +
+
+ Alternative Currency + +
-
Copy this text as it is in a safe place (notepad or email)
-
-
-
-

Delete Wallet

-

If all funds have been removed from your wallet and you do not wish to have the wallet data stored on your computer anymore, you can delete your wallet.

-
- Delete + + +
+ +
+
+
+

Backup

+

+ It's important to backup your wallet so that you can recover it in case of disaster +

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

Delete Wallet

+

If all funds have been removed from your wallet and you do not wish to have the wallet data stored on your computer anymore, you can delete your wallet.

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

- Master Private Key

-

- Your master private key contains the information to sign any transaction on this wallet. Handle with care. +

+
+
+

+ Master Private Key

+

+ Your master private key contains the information to sign any transaction on this wallet. Handle with care.

-
- - Show - Hide - -
- + + Show + Hide + +
-
-

Scan Wallet Addresses

-

- This will scan the blockchain looking for addresses derived from your wallet, in case you have funds in addresses not yet generated (e.g.: you restored an old backup). This will also trigger a synchronization of addresses to other connected peers. -

-
- - Scan - -
-
-
-

Purge Pending Transaction Proposals

-

- Pending Transactions Proposals will be discarded. This needs to be done on ALL peers of a wallet, to prevent the old proposals to be resynced again. -

-
- - Purge - -
-
-

Purge ALL Transaction Proposals

-

+

+
+

Scan Wallet Addresses

+

+ This will scan the blockchain looking for addresses derived from your wallet, in case you have funds in addresses not yet generated (e.g.: you restored an old backup). This will also trigger a synchronization of addresses to other connected peers. +

+ + Scan + +
+
+
+
+

Purge Pending Transaction Proposals

+

+ Pending Transactions Proposals will be discarded. This needs to be done on ALL peers of a wallet, to prevent the old proposals to be resynced again. +

+ + Purge + +
+
+
+
+

Purge ALL Transaction Proposals

+

ALL Transactions Proposals will be discarded. This needs to be done on ALL peers of a wallet, to prevent the old proposals to be resynced again.

-
- - Purge All - -
+ + Purge All + +
-
-

- Join Secret

-

+

+
+

+ Join Secret

+

This is the initial secret join string. Since your wallet it is already complete, this is only useful to rejoin peers that lost their backup BUT have the extended private key stored (they will be rejected on other case). They need to enter their extended private key during the join process (in advanced options). -

-
- +

+ Show Hide +
-
-
From d5f7e46084b0d93568e5a9d08eba2da7beee2493 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 4 Nov 2014 15:14:42 -0300 Subject: [PATCH 2/3] fix transactions proposals list --- css/src/main.css | 5 +- views/history.html | 2 +- views/includes/transaction.html | 82 ++++++--------------------------- views/more.html | 8 ++-- views/send.html | 12 +++-- 5 files changed, 29 insertions(+), 80 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index f1ca614f7..1cd47a176 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -401,7 +401,7 @@ table.last-transactions-content { padding: 0; border: 0; background-color: #F8F8FB; - margin: 15px 0; + margin: 0; } .last-transactions-content .box-status { @@ -438,9 +438,8 @@ table.last-transactions-content { .private-message { margin-bottom: 10px; - padding-bottom: 5px; + padding-bottom: 10px; border-bottom: 1px solid #fff; - line-height: 20px; } .header-message { diff --git a/views/history.html b/views/history.html index 27ac42776..74eaec1bc 100644 --- a/views/history.html +++ b/views/history.html @@ -10,7 +10,7 @@
-
+
diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 810867104..aa52d45d1 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,4 +1,4 @@ -
+
{{tx.createdTs | amCalendar}}
@@ -6,39 +6,19 @@ {{tx.comment}}
-
-
-
-
-
- {{out.value |noFractionNumber}} - {{$root.wallet.settings.unitName}} -
-
- {{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}} -
-
-
-
- -
+
+
+
+ {{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}}
- -
- {{tx.createdTs | amCalendar}} +
+
+
- +
{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} @@ -59,64 +39,30 @@
-
-
- - {{c.cId}} - -
- - - - - - - - - - - - - - - - - - - - - -
- -
- {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
-
-
- -
- -
-
diff --git a/views/more.html b/views/more.html index 95c7fe1be..5dbfd4122 100644 --- a/views/more.html +++ b/views/more.html @@ -1,7 +1,7 @@

{{$root.title}}

-
-
+
+
Wallet Unit @@ -16,8 +16,8 @@
-
- + +
diff --git a/views/send.html b/views/send.html index b5a2499d3..7f5015397 100644 --- a/views/send.html +++ b/views/send.html @@ -1,11 +1,15 @@
-

Send Proposals

-
-
+
+
+

Pending Transactions Proposals

+
+
-
+

{{$root.title}}

From 861f3c584d8bd99abbdeae7b5a6c6776cd563bf8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 4 Nov 2014 16:32:43 -0300 Subject: [PATCH 3/3] fix payment protocol message on send page --- css/src/main.css | 21 ++- views/send.html | 351 +++++++++++++++++++++++------------------------ 2 files changed, 181 insertions(+), 191 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 1cd47a176..42068f86e 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -401,7 +401,7 @@ table.last-transactions-content { padding: 0; border: 0; background-color: #F8F8FB; - margin: 0; + margin: 10px 0; } .last-transactions-content .box-status { @@ -465,19 +465,18 @@ table.last-transactions-content { } .send-note { - font-style: italic; - color: gray; background-color: #EDEDF5; - padding: 1.5rem; - width: 400px; + padding: 10px; + margin-bottom: 10px; } -.box-note { - text-align: center; - clear: both; - font-style: italic; - color: gray; - margin-bottom: 10px; +.send-note p { + margin-bottom: 5px; + font-size: 12px; +} + +.send-note b { + color: #000; } a.button-setup.add-wallet { diff --git a/views/send.html b/views/send.html index 7f5015397..3ee7db97d 100644 --- a/views/send.html +++ b/views/send.html @@ -12,216 +12,207 @@

{{$root.title}}

-
-
-
-

+

+ +

{{error|translate}}

- -
-
-
- -
- - - + +
+ +
+ + + +
+
+ +
+
+ Cancel +
+
+
+
+ +
+
+ + + Get QR code + + +
-
- -
-
- Cancel +
+
-
-
- -
-
- - - Get QR code - - -
+
+ +
+
+
+ +
+ + + + + Use all funds ({{availableBalance}} {{$root.wallet.settings.unitName}}) +
-
- +
+ {{$root.wallet.settings.unitName}} +
+
+
+
+
+ +
+ +
+
+ {{alternativeIsoCode}}
-
-
-
-
-