anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix paypro loading notification

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-10 21:12:08 -03:00
commit b7da80d2e1
2 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/src/main.css
View file

@ -462,7 +462,7 @@ ul.tx-copayers {
} }
.last-transactions-content { .last-transactions-content {
padding: 0.8rem 0.8rem; padding: 0.8rem 0;
color: #7A8C9E; color: #7A8C9E;
} }

33
views/includes/transaction.html
View file

@ -12,16 +12,16 @@
<div class="last-transactions-content" ng-click="openTxModal(tx)"> <div class="last-transactions-content" ng-click="openTxModal(tx)">
<div class="row" ng-repeat="out in tx.outs"> <div class="row" ng-repeat="out in tx.outs">
<div class="large-5 medium-5 small-6 columns size-14"> <div class="large-5 medium-5 small-5 columns size-14">
<b>{{out.value}} {{$root.wallet.settings.unitName}}</b> <b>{{out.value}} {{$root.wallet.settings.unitName}}</b>
<span ng-show="out.alternativeAmount" class="alt-currency gray"> <span ng-show="out.alternativeAmount" class="alt-currency gray">
{{out.alternativeAmount}} {{out.alternativeIsoCode}} {{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span> </span>
</div> </div>
<div class="large-2 medium-2 small-1 columns text-center"> <div class="large-2 medium-2 small-2 columns text-center">
<i class="fi-arrow-right"></i> <i class="fi-arrow-right"></i>
</div> </div>
<div class="large-5 medium m0-5 small-5 columns ellipsis size-12"> <div class="large-5 medium-5 small-5 columns ellipsis size-12">
<div ng-if="tx.merchant"> <div 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>
@ -67,7 +67,6 @@
</div> </div>
<div class="row collapse right show-for-large-up" ng-click="openTxModal(tx)"> <div class="row collapse right show-for-large-up" ng-click="openTxModal(tx)">
<div class="text-gray text-center m10t size-12"> <div class="text-gray text-center m10t size-12">
<span ng-click="tx.showDetails = !tx.showDetails">
<span ng-show="!tx.finallyRejected && tx.missingSignatures==1"> <span ng-show="!tx.finallyRejected && tx.missingSignatures==1">
One signature missing One signature missing
<i class="icon-arrow-right2 size-18"></i> <i class="icon-arrow-right2 size-18"></i>
@ -77,30 +76,26 @@
<i class="icon-arrow-right2 size-18"></i> <i class="icon-arrow-right2 size-18"></i>
</span> </span>
<span ng-show="!tx.finallyRejected && tx.missingSignatures==0"> <span ng-show="!tx.finallyRejected && tx.missingSignatures==0">
Copayers Approved
<i class="icon-arrow-right2 size-18"></i>
</span> </span>
</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row collapse last-transactions-footer hide-for-large-up size-12" ng-click="openTxModal(tx)"> <div class="row collapse last-transactions-footer hide-for-large-up size-14" ng-click="openTxModal(tx)">
<div class="small-12 small text-gray text-center"> <div class="text-gray text-center">
<span ng-click="tx.showDetails = !tx.showDetails"> <span ng-show="!tx.finallyRejected && tx.missingSignatures==1">
<span ng-show="!tx.finallyRejected && tx.missingSignatures==1"> <i class="fi-torso"></i>
<i class="fi-torso"></i> One signature missing
One signature missing </span>
</span>
<span ng-show="!tx.finallyRejected && tx.missingSignatures>1"> <span ng-show="!tx.finallyRejected && tx.missingSignatures>1">
<i class="icon-people"></i> <i class="icon-people"></i>
{{tx.missingSignatures}} signatures missing {{tx.missingSignatures}} signatures missing
</span> </span>
<span ng-show="!tx.finallyRejected && tx.missingSignatures==0"> <span ng-show="!tx.finallyRejected && tx.missingSignatures==0">
Copayers Approved
</span>
</span> </span>
</div> </div>
</div> </div>