diff --git a/css/src/main.css b/css/src/main.css index 1cfd78f0a..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; } @@ -577,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;} @@ -599,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;} @@ -1496,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; @@ -1821,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/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/views/homeWallet.html b/views/homeWallet.html index 49d9aff7c..b06f5f528 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -32,6 +32,8 @@ + +
@@ -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 a61ba08ce..3a7f09cad 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -3,11 +3,14 @@
-
+
+ + ● + To: - {{tx.merchant.domain}} - {{tx.merchant.domain}} + {{tx.merchant.domain}} + {{tx.merchant.domain}} 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 5a2a81261..665e07049 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -1,15 +1,19 @@ -× -
-
+ Close +
+ + +
+
+-{{btx.amount}} {{$root.wallet.settings.unitName}} - - {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} - +
+
+ {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}
@@ -37,10 +41,11 @@
-
- {{btx.merchant.pr.pd.memo}} +
+ Merchant Message: {{btx.merchant.pr.pd.memo}}
+
Unconfirmed @@ -52,7 +57,7 @@
- Signatures + Signatures:
  • 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 d3d9609b3..e79222faf 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,86 +1,75 @@ -× - -
    - - {{tx.comment}} +
    + Close
    -
    -
    - -
    -
    - -
    -
    - -
    - - [] -
    - -
    -
    - {{out.value}} {{$root.wallet.settings.unitName}} - +
    +
    +
    + {{out.value}} {{$root.wallet.settings.unitName}} +
    +
    {{out.alternativeAmount}} {{out.alternativeIsoCode}} - -
    - -
    -
    - {{tx.merchant.domain}} - {{tx.merchant.domain}} -
    - +
    +
    + +
    + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + + +
    -
    - {{tx.merchant.pr.pd.memo}} -
    - Expires: {{tx.merchant.expirationDate | amTimeAgo }} -
    -
    +
    + + +
    + +
    + Note: {{tx.comment}} +
    -
    - - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - +
    + Merchant Message: {{tx.merchant.pr.pd.memo}} +
    +
    + Expires: {{tx.merchant.expirationDate | amTimeAgo }} +
    - - {{tx.labelTo || tx.addressTo}} - -     -
    - - - -
    - Signatures -
      -
    • - +
      + 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