From 93b935ee0ae9f0fba06780f035cc19e9c0e15442 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Dec 2015 13:43:59 -0300 Subject: [PATCH 1/3] New design for modals. Fix notification errors --- public/views/backup.html | 4 +- public/views/buyGlidera.html | 8 +- public/views/create.html | 12 +- public/views/import.html | 46 ++++---- public/views/join.html | 12 +- public/views/modals/txp-details.html | 167 ++++++++++++++------------- public/views/paperWallet.html | 5 +- public/views/sellGlidera.html | 4 +- public/views/walletHome.html | 57 +++++---- src/css/main.css | 7 +- src/css/mobile.css | 21 ++++ 11 files changed, 185 insertions(+), 158 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index 33e4061c9..6dbd71fd3 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -20,8 +20,8 @@
- - {{wordsC.error}} + + {{wordsC.error|translate}}
diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index f60e945e3..bcab328de 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -35,8 +35,8 @@
-
- +
+ This operation was disabled because you have a pending first transaction
@@ -117,8 +117,8 @@

-
- +
+ {{buy.error}}
diff --git a/public/views/create.html b/public/views/create.html index e0254971e..d7b4fc04c 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -49,13 +49,13 @@
+
+ + {{create.error|translate}} + +
-
-
- - {{create.error|translate}} - -
+
-
-
- -
- - {{import.error|translate}} - -
+
+
+ + {{import.error|translate}} + +
+
+
-
-
- -
- - {{import.error|translate}} - -
+
+
+ + {{import.error|translate}} + +
+
+
-
-
-
- - {{import.error|translate}} - -
+
+
+ + {{import.error|translate}} + +
+
diff --git a/public/views/join.html b/public/views/join.html index fce9954f4..c587ff86e 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -34,13 +34,13 @@
+
+ + {{join.error|translate}} + +
-
-
- - {{join.error|translate}} - -
+
  • - Fee: + Fee {{tx.feeStr}}
  • - Time: + Time
  • - Created by: + Created by {{tx.creatorName}}
    • Warning: this transaction has unconfirmed inputs
    +

    Payment details

    • - To: + To {{tx.paypro.domain}} @@ -81,83 +139,36 @@
    • - Expires: + Expires
    • - Merchant Message: + Merchant Message {{tx.paypro.pr.pd.memo}}
    -

    Participants

    +

    +
    + {{tx.requiredSignatures}}/{{tx.walletN}} +
    + Participants +

    • {{ac.copayerName}} ({{'Me'|translate}}) - - - - + + Rejected + Signed
    -
    -
    - - {{error|translate}} - -
    - -
    - The payment was removed by creator -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    Payment accepted, but not yet broadcasted
    - - -
    -
    -
    Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
    -
    -
    - Payment Sent -
    -
    - Payment Rejected -
    -
    +
    diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index 53894df75..b06bf75f7 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -19,9 +19,8 @@ Sending funds...
    -
    - - {{paperWallet.error|translate}} +
    + {{paperWallet.error|translate}}
    diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 1d2d7960a..bf948a1ef 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -35,8 +35,8 @@
    -
    - +
    + This operation was disabled because you have a pending first transaction
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 295234259..68f182e9a 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -301,36 +301,33 @@
    +
    + + {{home.addrError|translate}} + +

    My Bitcoin address

    -
    -
    - - {{home.addrError|translate}} - -
    - -
    - -
    -
    - +
    + +
    +
    +
    -
    -

    - {{home.generatingAddress ? '...' : home.addr[index.walletId]}} +

    +
    +

    + {{home.generatingAddress ? '...' : home.addr[index.walletId]}} -

    -
    +
    @@ -386,14 +383,14 @@
    +
    + + {{home.error|translate}} + +
    -
    - -
    - - {{home.error|translate}} - -
    +
    +
    diff --git a/src/css/main.css b/src/css/main.css index e0cd00855..4318fc8af 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -75,7 +75,7 @@ h4.title a { .preferences h4, .modal-content h4, .walletHome h4, .glidera h4 { background: #F6F7F9; - padding: 25px 0px 5px 20px; + padding: 25px 0px 5px 10px; text-transform: uppercase; color: #555; font-size: 12px; @@ -272,9 +272,6 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu padding: 0.5rem; border-radius: 2px; background: #FFFFFF; - box-shadow: 1px 1px 0px 0px rgba(0,0,0,0.10); - margin: 0 auto; - margin-bottom: 1.6rem; } .box-notification .box-icon { @@ -482,6 +479,7 @@ ul.manage li { .m0 {margin: 0;} .p0i {padding: 0 !important;} .db {display: block;} +.dib {display: inline-block;} .size-10 { font-size: 10px; } .size-12 { font-size: 12px; } .size-14 { font-size: 14px; } @@ -529,6 +527,7 @@ ul.manage li { .p25l {padding-left: 25px;} .p15 {padding:15px;} .p20 {padding:20px;} +.p20t {padding-top:20px;} .p10 {padding:10px;} .p10b {padding-bottom:10px;} .p45t {padding-top:45px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index c8f79cc39..585fa132e 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -744,6 +744,27 @@ textarea:focus padding-top: 1rem; } +.payment-proposal-head { + color: #fff; + padding: 0 10px 20px 10px; + text-align: center; +} + +.payment-proposal-to { + display: inline-block; + padding: 3px 15px; + background-color: rgba(0, 0, 0, 0.1); +} + +.payment-proposal-to i { + margin-right: 10px; + padding-right: 10px; + border-right: 1px solid; + border-color: rgba(0, 0, 0, 0.1); + font-size: 25px; + vertical-align: middle; +} + ::-webkit-input-placeholder { color: #B7C2CD; } From 69d83ec5278ae8be5643520c20e64f15a4a8d517 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Dec 2015 15:11:23 -0300 Subject: [PATCH 2/3] New design for transaction info --- public/views/modals/tx-details.html | 33 ++++++++++++++-------------- public/views/modals/txp-details.html | 8 +++---- src/css/main.css | 4 ++-- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 1e1294504..8b1673cb4 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -15,11 +15,11 @@
    -
    -
    +
    +
    +-{{btx.amountStr}}
    -
    +
    -
    @@ -29,7 +29,7 @@
    • - To: + To {{btx.merchant.domain}} @@ -44,7 +44,7 @@
    • - Recipients: + Recipients {{btx.recipientCount}} @@ -57,7 +57,7 @@
  • - Note: + Note {{btx.message}}
    • @@ -66,28 +66,28 @@ This transaction has become invalid; possibly due to a double spend attempt.
  • - Date: + Date
  • - Fee: + Fee {{btx.feeStr}}
  • - Note: + Note {{btx.message}}
  • - Merchant message: + Merchant message {{btx.merchant.pr.pd.memo}}
  • - Confirmations: + Confirmations Unconfirmed @@ -107,11 +107,12 @@

    Participants

    • - - - - - {{c.copayerName}} ({{'Me'|translate}}) + + + + + + {{c.copayerName}} ({{'Me'|translate}})
    • diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index c79149cd4..ae30f4e4c 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -161,11 +161,11 @@
    • - {{ac.copayerName}} ({{'Me'|translate}}) - - Rejected - Signed + + + + {{ac.copayerName}} ({{'Me'|translate}})
    diff --git a/src/css/main.css b/src/css/main.css index 4318fc8af..b0806d3ea 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -343,7 +343,8 @@ ul.tx-copayers { padding: 0.2rem 0.3rem; border-radius: 100%; color: #fff; - margin-right: 7px; + font-size: 10px; + margin-top: 3px; } .icon-sign.check { @@ -625,7 +626,6 @@ input[type=number]::-webkit-outer-spin-button { } .header-modal { - border-bottom: 1px solid #E2E7ED; background: #fff; width: 100%; padding: 0.8rem; From afc52d69ce4308a7d104cc5da5faec1acf6d0b11 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Dec 2015 16:22:44 -0300 Subject: [PATCH 3/3] Updates tx-status, new design --- public/views/modals/tx-status.html | 27 +++++++++++++++------------ src/css/main.css | 1 + src/css/mobile.css | 17 ++++++++++------- src/js/services/txStatus.js | 5 ++++- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 507a85e6b..7d6481f5c 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,18 +1,21 @@ -
    - -
    - Payment Sent +
    + +
    + {{tx.amountStr}}
    -
    - OKAY +
    + Sent +
    +
    + OKAY
    - -
    + +
    Payment Proposal Created
    @@ -23,8 +26,8 @@
    - -
    + +
    Payment Accepted
    @@ -33,8 +36,8 @@
    - -
    + +
    Payment Rejected
    diff --git a/src/css/main.css b/src/css/main.css index b0806d3ea..2546f314c 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -513,6 +513,7 @@ ul.manage li { .m20r {margin-right: 20px;} .m20t {margin-top: 20px;} .m20tp {margin-top: 20%;} +.m30tp {margin-top: 30%;} .m15 {margin: 15px;} .m15h {margin: 0 15px;} .p10t {padding-top: 10px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index 585fa132e..8ab2e81fb 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -705,14 +705,15 @@ textarea:focus position: absolute; width: 100%; height: 100%; - background: #1ABC9C; + background: rgba(24,44,58,0.90); } .popup-txsent i { font-size: 5rem; - background-color: #fff; - color: #1ABC9C; + color: #4A90E2; border-radius: 100%; + border-color: #4A90E2; + border: 2px solid; width: 150px; height: 150px; display: block; @@ -722,9 +723,10 @@ textarea:focus .popup-txsigned i { font-size: 5rem; - background-color: #1ABC9C; - color: #fff; + color: #4A90E2; border-radius: 100%; + border-color: #4A90E2; + border: 2px solid; width: 150px; height: 150px; display: block; @@ -734,9 +736,10 @@ textarea:focus .popup-txrejected i { font-size: 5rem; - background-color: #ED4A43; - color: #fff; + color: #4A90E2; border-radius: 100%; + border-color: #4A90E2; + border: 2px solid; width: 150px; height: 150px; display: block; diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index a4b45d485..8456d85d1 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout) { +angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout, txFormatService) { var root = {}; root.notify = function(txp, cb) { @@ -42,8 +42,11 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, }; var openModal = function(type, txp, cb) { + var fc = profileService.focusedClient; var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.type = type; + $scope.tx = txFormatService.processTx(txp); + $scope.color = fc.backgroundColor; $scope.cancel = function() { $modalInstance.dismiss('cancel'); };