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

Fix conflicts:

Browse source 
js/controllers/transactions.js
This commit is contained in:
Gustavo Cortez 2014-04-23 15:10:42 -03:00
commit e17aed54b0
13 changed files with 196 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

35
index.html
View file

@ -178,7 +178,7 @@
</script>
<script type="text/ng-template" id="peer.html">
<div class="row" ng-controller="PeerController">
<div class="row">
<div class="large-6 columns p70r line-dashed-v">
<h3>I am </h3>
<div class="row">
@ -244,16 +244,18 @@
<div class="transactions" data-ng-controller="TransactionsController">
<div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="large-12 columns">
<h4>Pending transactions <small>({{txs.length}})</small></h4>
<h4>Transactions proposals <small>({{txs.length}})</small></h4>
<div class="panel pending" ng-repeat="tx in txs | orderBy: 'createdTs':true">
<div class="txheader">
<div class="row">
<div class="large-8 columns">
<tr ng-repeat="o in tx.outs">
<td class="text-right size-24">{{o.value}} <i class="fi-bitcoin"></i></td>
<td class="text-center size-48"> <i class="fi-arrow-right size-40"> </i>
<td class="text-left size-24">{{o.address}}</td>
<table style="width:100%">
<tr ng-repeat="out in tx.outs">
<td class="text-right size-24"> <i class="fi-bitcoin"></i> {{out.value}}</td>
<td class="text-center size-48"> <i class="fi-arrow-right size-24"> </i></td>
<td class="text-left size-24">{{out.address}}</td>
</tr>
</table>
</div>
<div class="large-4 columns text-right">
<h6> created at {{tx.createdTs | date:'medium'}} </h6>
@ -266,7 +268,10 @@
<table style="width:100%">
<tbody>
<tr>
<small class="right text-gray"> <strong> Proposal ID: </strong> {{tx.ntxid}} </small>
<small class="right text-gray">
Fee: <strong> <i class="fi-bitcoin"></i> {{tx.fee}} </strong>
<strong> Proposal ID: </strong> {{tx.ntxid}}
</small>
</tr>
<tr ng-repeat="(peer, actions) in tx.peerActions">
<td colspan="3">
@ -279,6 +284,7 @@
<span ng-if="action == 'create'" title="{{ts | date:'medium'}}" class="fi-page-add size-18 right m10h"></span>
<span ng-if="action == 'seen'" title="{{ts | date:'medium'}}" class="fi-eye size-18 right m10h"> </span>
<span ng-if="action == 'sign'" title="{{ts | date:'medium'}}" class="fi-check size-18 right m10h"> </span>
<span ng-if="action == 'rejected'" title="{{ts | date:'medium'}}" class="fi-x size-18 right m10h" style="color:red"> </span>
<a title="{{ts | date:'medium'}}"></a>
</span>
@ -296,16 +302,20 @@
<div ng-show="tx.signedByUs">
<i class="fi-check size-40"></i> Signed by you already
</div>
<div ng-show="!tx.signedByUs && tx.missingSignatures">
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
<button class="secondary round" ng-click="sign(tx.ntxid)">
<i class="fi-check"></i> Sign
</button>
<button class="primary round">
<i class="fi-x"></i> Ignore
<button class="primary round" ng-click="reject(tx.ntxid)">
<i class="fi-x" ></i> Reject
</button>
</div>
</div>
<div class="large-6 columns text-right">
<span ng-show="tx.finallyRejected ">
Transaction finally rejected
</span>
<span ng-show="!tx.missingSignatures && !tx.sentTs">
Transaction ready.
<button class="secondary round" ng-click="send(tx.ntxid)">
@ -318,10 +328,10 @@
Sent at {{tx.sentTs | date:'medium'}}
TXID: {{tx.sentTxid}}
</span>
<span ng-show="tx.missingSignatures==1">
<span ng-show="!tx.finallyRejected && tx.missingSignatures==1">
One signature missing
</span>
<span ng-show="tx.missingSignatures>1">
<span ng-show="!tx.finallyRejected && tx.missingSignatures>1">
{{tx.missingSignatures}} signatures missing</span>
</div>
</div>
@ -497,7 +507,6 @@
<script src="js/controllers/backup.js"></script>
<script src="js/controllers/signin.js"></script>
<script src="js/controllers/setup.js"></script>
<script src="js/controllers/peer.js"></script>
<script src="js/init.js"></script>
</body>