mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #2082 from matiu/feat/tx-modals2
add comment to modals
This commit is contained in:
commit
4841c2dc05
|
@ -594,6 +594,7 @@ a.button-setup {
|
||||||
.m30v {margin: 30px 0;}
|
.m30v {margin: 30px 0;}
|
||||||
.m10h {margin:0 10px;}
|
.m10h {margin:0 10px;}
|
||||||
.m10v {margin:10px 0;}
|
.m10v {margin:10px 0;}
|
||||||
|
.m20v {margin:20px 0;}
|
||||||
.m30a {margin: 30px auto;}
|
.m30a {margin: 30px auto;}
|
||||||
.m-negative-l {margin-left: -0.9375rem;}
|
.m-negative-l {margin-left: -0.9375rem;}
|
||||||
.br100 {border-radius: 100%;}
|
.br100 {border-radius: 100%;}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<a class="close-reveal-modal" ng-click="cancel()">×</a>
|
<a class="close-reveal-modal" ng-click="cancel()">×</a>
|
||||||
|
|
||||||
<div class="size-14">
|
<div class="size-14">
|
||||||
<div class="text-center size-72">
|
<div class="text-center size-72 m20t">
|
||||||
<div ng-class="{
|
<div ng-class="{
|
||||||
'text-primary' : btx.action == 'received',
|
'text-primary' : btx.action == 'received',
|
||||||
'text-warning': btx.action == 'sent',
|
'text-warning': btx.action == 'sent',
|
||||||
|
@ -13,8 +13,6 @@
|
||||||
'fi-loop': btx.action == 'moved'}"></i>
|
'fi-loop': btx.action == 'moved'}"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="text-center" class="m10v">
|
<div class="text-center" class="m10v">
|
||||||
<div class="tx-amount" ng-class="{
|
<div class="tx-amount" ng-class="{
|
||||||
'text-primary' : btx.action == 'received',
|
'text-primary' : btx.action == 'received',
|
||||||
|
@ -29,13 +27,22 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="line-b m10t"></div>
|
|
||||||
<h1 class="m30v">Transaction Details</h1>
|
|
||||||
<div class="ellipsis" ng-if="btx.txid"> <b>ID:</b> <span class="text-gray"> {{btx.txid}} </span></div>
|
|
||||||
<div ng-if="btx.ts || btx.createdTs " class="m10v">
|
|
||||||
<time> <span>{{ (btx.ts || btx.createdTs ) | amCalendar}}</span></time>
|
|
||||||
|
|
||||||
[<time>{{ (btx.ts || btx.createdTs ) | amTimeAgo}}</time>]
|
|
||||||
|
<div class="line-b m10t"></div>
|
||||||
|
<h2>Transaction Details</h2>
|
||||||
|
|
||||||
|
<div class="m20v" ng-show="btx.comment">
|
||||||
|
<i class="fi-comment-quotes"></i> {{btx.comment}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div ng-if="btx.ts || btx.createdTs " class="m10v">
|
||||||
|
<i translate>Date:</i>
|
||||||
|
<time> <span>{{ (btx.ts || btx.createdTs ) | amCalendar}}</span>
|
||||||
|
</time>
|
||||||
|
|
||||||
|
[
|
||||||
|
<time>{{ (btx.ts || btx.createdTs ) | amTimeAgo}}</time>]
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="m10v">
|
<div class="m10v">
|
||||||
|
@ -43,14 +50,14 @@
|
||||||
<span translate>Unconfirmed</span>
|
<span translate>Unconfirmed</span>
|
||||||
</span>
|
</span>
|
||||||
<span ng-show="btx.confirmations>0" class="m10v">
|
<span ng-show="btx.confirmations>0" class="m10v">
|
||||||
<b translate>Confirmations:</b>
|
<i translate>Confirmations:</i>
|
||||||
<span class="text-gray">{{btx.confirmations}}</span>
|
<span class="text-gray">{{btx.confirmations}}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="btx.addressTo" class="m10v">
|
<div ng-if="btx.addressTo" class="m10v">
|
||||||
<span class="ellipsis">
|
<span class="ellipsis">
|
||||||
<b>To:</b>
|
<i>To:</i>
|
||||||
<span ng-if="btx.merchant">
|
<span ng-if="btx.merchant">
|
||||||
<span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
|
<span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
|
||||||
<span ng-show="!btx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{btx.merchant.domain}}</span>
|
<span ng-show="!btx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{btx.merchant.domain}}</span>
|
||||||
|
@ -67,7 +74,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="btx.actionList[0]" class="m10v">
|
<div ng-if="btx.actionList[0]" class="m10v">
|
||||||
<b>Copayers Signatures</b>
|
<i>Signatures</i>
|
||||||
<ul class="tx-copayers m10t" ng-if="btx.actionList[0]">
|
<ul class="tx-copayers m10t" ng-if="btx.actionList[0]">
|
||||||
<li ng-repeat="c in btx.actionList" ng-class="{'bottom-line-copayers':!$last}">
|
<li ng-repeat="c in btx.actionList" ng-class="{'bottom-line-copayers':!$last}">
|
||||||
<span>
|
<span>
|
||||||
|
@ -84,8 +91,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="m10t oh" ng-if="btx.txid">
|
<div class="m10t oh" ng-if="btx.txid">
|
||||||
<a class="right button-setup"
|
<div class="ellipsis text-gray" > ID: {{btx.txid}} </span>
|
||||||
ng-click="openExternalLink('http://' + getShortNetworkName() + '.insight.is/tx/' + btx.txid)">
|
</div>
|
||||||
|
|
||||||
|
<a class="right button-setup" ng-click="openExternalLink('http://' + getShortNetworkName() + '.insight.is/tx/' + btx.txid)">
|
||||||
See it on the blockchain <i class="icon-arrow-right2 vm"></i>
|
See it on the blockchain <i class="icon-arrow-right2 vm"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -25,7 +25,15 @@
|
||||||
<div class="text-light size-14">{{tx.comment}}</div>
|
<div class="text-light size-14">{{tx.comment}}</div>
|
||||||
|
|
||||||
<div class="line-b m10t"></div>
|
<div class="line-b m10t"></div>
|
||||||
<div ng-if="tx.createdTs " class="m10v size-14">
|
|
||||||
|
<div ng-if="tx.merchant" class="m20v">
|
||||||
|
{{tx.merchant.pr.pd.memo}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div ng-if="tx.createdTs " class="m10v">
|
||||||
|
<i translate>Date:</i>
|
||||||
<time> <span>{{ tx.createdTs | amCalendar}}</span></time>
|
<time> <span>{{ tx.createdTs | amCalendar}}</span></time>
|
||||||
|
|
||||||
[<time>{{ tx.createdTs | amTimeAgo}}</time>]
|
[<time>{{ tx.createdTs | amTimeAgo}}</time>]
|
||||||
|
@ -33,7 +41,7 @@
|
||||||
|
|
||||||
<div ng-if="tx.addressTo" class="m10v">
|
<div ng-if="tx.addressTo" class="m10v">
|
||||||
<span class="ellipsis">
|
<span class="ellipsis">
|
||||||
<b>To:</b>
|
<i>To:</i>
|
||||||
<span ng-if="tx.merchant">
|
<span ng-if="tx.merchant">
|
||||||
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{tx.merchant.domain}}</span>
|
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{tx.merchant.domain}}</span>
|
||||||
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{tx.merchant.domain}}</span>
|
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{tx.merchant.domain}}</span>
|
||||||
|
@ -45,18 +53,13 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="tx.merchant" class="size-12 m10v">
|
<div ng-if="tx.merchant && tx.merchant.expirationDate" class="m10v">
|
||||||
{{tx.merchant.pr.pd.memo}}
|
<i>Expires</i>: {{tx.merchant.expirationDate | amTimeAgo }}
|
||||||
|
|
||||||
<div ng-if="tx.merchant.expirationDate" class="m10v">
|
|
||||||
<b>Expires</b>: {{tx.merchant.expirationDate | amTimeAgo }}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div ng-if="tx.actionList[0]" class="m10v">
|
<div ng-if="tx.actionList[0]" class="m10v">
|
||||||
<b>Copayers Signatures</b>
|
<i>Signatures</i>
|
||||||
<ul class="tx-copayers m10t" ng-if="tx.actionList[0]">
|
<ul class="tx-copayers m10t" ng-if="tx.actionList[0]">
|
||||||
<li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
|
<li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
|
||||||
<span>
|
<span>
|
||||||
|
|
Loading…
Reference in New Issue