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

merge

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-05-15 16:39:22 -03:00
commit d8c3d08582
11 changed files with 478 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
index.html
View file

@ -112,6 +112,8 @@
</div>
<div notifications="middle right"></div>
<div id="main" class="row" ng-class="{'main-home': !$root.wallet}">
<div class="large-12 columns" ng-view></div>
</div>
@ -340,7 +342,7 @@
<div class="transactions" data-ng-controller="TransactionsController">
<div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="large-12 columns">
<h4>Transactions proposals <small>({{txs.length}})</small></h4>
<h4>Transaction proposals <small>({{txs.length}})</small></h4>
<div class="panel radius pending" ng-repeat="tx in txs | orderBy: 'createdTs':true">
<div class="txheader">
<div class="row m10">
@ -362,7 +364,7 @@
<div class="box-copayers" ng-repeat="(cId, actions) in tx.peerActions">
<figure class="left">
<a href="#/transactions" class="has-tip" tooltip-popup-delay='1000' tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
<img src="./img/satoshi.gif" alt="cId" width="200">
<img src="./img/satoshi.gif" alt="{{cId}}" width="200">
</a>
</figure>
<div class="box-status">
@ -682,6 +684,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
<script src="js/services/walletFactory.js"></script>
<script src="js/services/controllerUtils.js"></script>
<script src="js/services/passphrase.js"></script>
<script src="js/services/notifications.js"></script>
<script src="js/controllers/header.js"></script>
<script src="js/controllers/footer.js"></script>