diff --git a/css/src/main.css b/css/src/main.css index 9a237e42a..0dc551234 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -109,6 +109,11 @@ header .alt-currency { color: yellow !important; } + +.color-alert { + color: #C0392A; +} + .alt-currency.green { background: #1abc9c; } @@ -414,6 +419,13 @@ a:hover { background-color: #C0392A; } +.box-notification .box-icon.secondary { + background-color: #3498DB; +} + + + + .box-notification a.close-notification { position: absolute; top: 8px; @@ -445,48 +457,25 @@ ul.tx-copayers { border-bottom: 1px solid #CAD2DA; } -.last-transactions-header { - border-radius: 3px 3px 0 0; - background: #2C3E50; - padding: 0.6rem; - color: #fff; - box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); - -moz-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); - -o-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); -} .last-transactions-content { - padding: 0.8rem 0.8rem 0; - color: #7A8C9E; -} - -.last-transactions-footer { padding: 0.8rem; - overflow: hidden; + cursor:pointer; } -.last-transactions-content .box-status { - font-size: 13px; - width: 30px; -} +.last-transactions-content:hover { + background: #eee; +} -.last-transactions-content .box-copayer { - width: 100px; - margin-right: 20px; - float: left; + + +.sign-action { + background: #E4E8EC; + width: 100%; + padding: 1rem; text-align: center; } -.last-transactions-content .copayer-ico { - width: 45px; - height: 45px; - border: 2px solid #7A8C9B; -} - -.last-transactions-content .icon-active { - color: #fff; -} - .icon-sign { padding: 0.2rem 0.3rem; border-radius: 100%; @@ -593,6 +582,7 @@ a.button-setup { .m20r {margin-right: 20px;} .m15r {margin-right: 15px;} .m20t {margin-top: 20px;} +.m20tp {margin-top: 20%;} .m5 {margin: 5px;} .m10 {margin: 10px;} .m15 {margin: 15px;} @@ -615,6 +605,7 @@ a.button-setup { .m-negative-l {margin-left: -0.9375rem;} .br100 {border-radius: 100%;} .lh {line-height: 0;} +.lh140 {line-height: 140%;} .oh {overflow:hidden;} .vm {vertical-align: middle;} .ma { margin: 0 auto;} @@ -1512,6 +1503,10 @@ a.text-warning:hover {color: #FD7262;} } @media only screen and (max-width: 40em) { + dialog.tiny, .reveal-modal.tiny { + height: 100%; + overflow-y: auto; + } dialog.large, .reveal-modal.large { height: 100%; overflow-y: auto; @@ -1837,3 +1832,19 @@ a.text-warning:hover {color: #FD7262;} font-weight: normal; } +.reveal-modal .close-reveal-modal, dialog .close-reveal-modal { + padding: 5px 10px; + position: relative; + font-weight: normal; + border: 1px solid #bbb; + font-size: 22px; + background:#eee; + right:0; + top:0; + text-transform: uppercase; +} + +.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover { + background:#ddd; +} + diff --git a/css/src/mobile.css b/css/src/mobile.css index 300d373d8..0674b49f4 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -116,7 +116,6 @@ display: none; } - .tab-bar h1 { font-weight: 100; text-align: center; diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js index 79cc35606..77969439a 100644 --- a/js/controllers/homeWallet.js +++ b/js/controllers/homeWallet.js @@ -48,14 +48,18 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi }; + var $outScope = $scope; $scope.openTxModal = function(tx) { var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.tx = tx; - $scope.getShortNetworkName = function() { - var w = $rootScope.wallet; - return w.getNetworkName().substring(0, 4); + $scope.sign = function(ntxid) { + $outScope.sign(ntxid); + $modalInstance.dismiss('cancel'); + }; + $scope.reject = function(ntxid) { + $outScope.reject(ntxid); + $modalInstance.dismiss('cancel'); }; - $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; diff --git a/js/controllers/send.js b/js/controllers/send.js index ae46f8066..2ccd1079d 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -399,7 +399,11 @@ angular.module('copayApp.controllers').controller('SendController', if (err) { copay.logger.warn(err); $scope.resetForm(); - $scope.error = err.toString(); + var msg = err.toString(); + if (msg.match('HTTP')) { + msg = 'Could not fetch payment information'; + } + $scope.error = msg; } else { $scope._merchantData = merchantData; $scope._domain = merchantData.domain; diff --git a/views/history.html b/views/history.html index 16e63cb49..54d0ee72b 100644 --- a/views/history.html +++ b/views/history.html @@ -13,51 +13,39 @@
-
-
+
+
-
-
- - - Unconfirmed - -
-
- -
- - {{btx.amount}} {{$root.wallet.settings.unitName}} - - {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} - +
+
+
+ + + Unconfirmed - - - -
- -
-
- {{btx.comment}} -
+
+
+ + + +-{{btx.amount}} + + {{$root.wallet.settings.unitName}} + + + {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} + +
+
+
+
diff --git a/views/homeWallet.html b/views/homeWallet.html index d5d4c8725..b06f5f528 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -32,9 +32,11 @@
+ +
-
+
Personal Wallet Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] @@ -53,8 +55,16 @@

Spend proposals

-
+
+ +
+ Total Locked Balance: + {{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} + {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} +
+ +

No pending spend proposals at the moment.

diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 91ab43e6a..def5a4554 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -36,18 +36,13 @@
- {{'Locked'|translate}}   + {{'Locked'|translate}}   {{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} - {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} -
diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 0d5224d10..3a7f09cad 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,92 +1,35 @@ -
-
-
- - {{tx.comment}} -
-
-
- {{tx.createdTs | amCalendar}} -
-
-
+ +
-
- {{out.value}} {{$root.wallet.settings.unitName}} - - {{out.alternativeAmount}} {{out.alternativeIsoCode}} +
+
+ + ● + + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + + +
-
- -
-
-
- {{tx.merchant.domain}} - {{tx.merchant.domain}} + +
+
+ + + {{out.value}} + + {{$root.wallet.settings.unitName}} + + + {{out.alternativeAmount}} {{out.alternativeIsoCode}}
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
- -
- -
-
- -
- -
- -
-
- - - - One signature missing - - - - {{tx.missingSignatures}} signatures missing - - - Copayers - - -
-
- diff --git a/views/modals/paypro.html b/views/modals/paypro.html index 0d8620111..9cb597acc 100644 --- a/views/modals/paypro.html +++ b/views/modals/paypro.html @@ -1,30 +1,39 @@ -× - -
-

Payment Request

- -

- Signature: {{md.domain}} - {{md.pr.ca}} - Untrusted -

- Merchant Message: -
- {{md.pr.pd.memo || address}} -

- -

- Amount: - {{md.unitTotal}} {{$root.wallet.settings.unitName}} - - {{ alternative }} {{ alternativeIsoCode }} - - -

- Expires: {{md.expirationDate | amTimeAgo }} -
-
+
+ Close
+ +
+
+ {{md.unitTotal}} {{$root.wallet.settings.unitName}} +
+
+ {{ alternative }} {{ alternativeIsoCode }} +
+
+
+ +
+ To: {{md.domain}} +
+ +
+ Certified by: + {{md.pr.ca}} + Untrusted +
+ +
+ Merchant Message: + {{md.pr.pd.memo}} +
+ + +
+ Expires: {{md.expirationDate | amTimeAgo }} +
+ + + diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index 2da6c8c54..665e07049 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -1,103 +1,84 @@ -× - -
-
-
- -
-
-
-
- {{btx.amount}} {{$root.wallet.settings.unitName}} - - {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} - -
-
- - -
-

Transaction Details

- -
- {{btx.comment}} -
- -
- Date: - - - [ - ] -
- -
- - Unconfirmed - - - Confirmations: - {{btx.confirmations}} - -
- -
- - To: - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - - {{btx.labelTo || btx.addressTo}} - - -
- -
- {{btx.merchant.pr.pd.memo}} -
- -
- Signatures -
    -
  • - - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
    • -
-
- -
-
ID: {{btx.txid}} -
- - - See it on the blockchain - -
+
+ Close +
+ + +
+
+ +-{{btx.amount}} + {{$root.wallet.settings.unitName}} +
+
+ {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} +
+
+ +
+
+ + +
+ +
+ Note: {{btx.comment}} +
+ +
+ + To: + + {{btx.merchant.domain}} + {{btx.merchant.domain}} + + + + {{btx.labelTo || btx.addressTo}} + + +
+ +
+ Merchant Message: {{btx.merchant.pr.pd.memo}} +
+ + +
+ + Unconfirmed + + + Confirmations: + {{btx.confirmations}} + +
+ +
+ Signatures: +
    +
  • + + + + + + + + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} +
    • +
+
+ +
ID: {{btx.txid}} +
+ +
+ + See it on the blockchain +
diff --git a/views/modals/tx-status.html b/views/modals/tx-status.html index 5cc79f165..af9b15d77 100644 --- a/views/modals/tx-status.html +++ b/views/modals/tx-status.html @@ -1,6 +1,5 @@ -
- +
diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html index 0fc21650f..e79222faf 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,78 +1,74 @@ -× +
+ Close +
-

Transaction Proposal Details

- -
-
- {{out.value}} {{$root.wallet.settings.unitName}} - - {{out.alternativeAmount}} {{out.alternativeIsoCode}} - +
+
+
+ {{out.value}} {{$root.wallet.settings.unitName}}
-
- +
+ {{out.alternativeAmount}} {{out.alternativeIsoCode}}
-
-
- {{tx.merchant.domain}} - {{tx.merchant.domain}} - -
- -
- -
{{tx.comment}}
- -
- -
- {{tx.merchant.pr.pd.memo}}
+
- - -
- Date: - - - [] -
- -
- - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - - - - {{tx.labelTo || tx.addressTo}} - +
+ To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + +
+
-
- Expires: {{tx.merchant.expirationDate | amTimeAgo }} -
+
+ + +
+ +
+ Note: {{tx.comment}} +
-
- Signatures -
    -
  • - +
    + Merchant Message: {{tx.merchant.pr.pd.memo}} +
    +
    + Expires: {{tx.merchant.expirationDate | amTimeAgo }} +
    + +
    + Signatures: +
      +
    • + - + - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
      • -
    + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} +
    • +
+
+ +
+
+ +
+
+
diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html index c19f7daf4..d46633bb2 100644 --- a/views/modals/wallet-info.html +++ b/views/modals/wallet-info.html @@ -1,3 +1,8 @@ + +
+ Close +
+

{{item.name || item.id }}

@@ -54,5 +59,4 @@

- ×
diff --git a/views/modals/walletSelection.html b/views/modals/walletSelection.html index 0f98dfa8d..5d7617984 100644 --- a/views/modals/walletSelection.html +++ b/views/modals/walletSelection.html @@ -1,6 +1,10 @@ -
- × +
+ Close +
+ + +

Select a wallet to make the payment

diff --git a/views/send.html b/views/send.html index 2e6a4597b..041cb840b 100644 --- a/views/send.html +++ b/views/send.html @@ -6,7 +6,22 @@
-
+
+
+
+
+
+ +
+ + Fetching Payment Information... + +
+
+
+
+ +
@@ -17,6 +32,7 @@ {{error|translate}} + ×
@@ -25,6 +41,7 @@ {{success|translate}} + ×
@@ -67,10 +84,10 @@ Payment to -
- - -
+
+ + +
@@ -120,15 +137,6 @@
- -
-
-

>> - - Fetching payment request -

-
-