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

Merge pull request #5 from cmgustavo/bechi/tx-prososal-01

Browse source 
Fix copayer list from "Send" and "History"
This commit is contained in:
Juan Ignacio Sosa Lopez 2014-12-03 12:08:22 -03:00
commit 80668ecafc
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
css/src/main.css
View file

@ -433,12 +433,15 @@ ul.tx-copayers {
}
.tx-copayers li {
border-bottom: 1px solid #CAD2DA;
list-style: none;
padding: 0.3rem;
font-size: 12px;
}
.tx-copayers li.bottom-line-copayers {
border-bottom: 1px solid #CAD2DA;
}
.last-transactions-header {
border-radius: 3px 3px 0 0;
background: #2C3E50;

17
views/history.html
View file

@ -96,21 +96,16 @@
</div>
<table class="last-transactions-content" ng-if="btx.actionList[0]">
<tbody>
<tr ng-repeat="c in btx.actionList">
<td class="copayer-name text-gray" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
<tr ng-repeat="c in btx.actionList">
<td>
<i ng-if="c.actions.rejected" class="fi-x icon-status icon-active-x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-status icon-active-check"></i>
</td>
<td>
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active"></i>
<i ng-if="!c.actions.create" class="fi-crown icon-status"></i>
</td>
<td>
<i ng-if="c.actions.seen" class="fi-eye icon-status icon-active"></i>
<i ng-if="!c.actions.seen" class="fi-eye icon-status"></i>
</td>
<td>
<i ng-if="c.actions.rejected" class="fi-x icon-status icon-active-x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-status icon-active-check"></i>
<i ng-if="!c.actions.sign && !c.actions.rejected && tx.missingSignatures" class="fi-loop icon-rotate"></i>
</td>
<td class="copayer-name text-gray" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
</td>
</tr>
</tbody>

2
views/includes/transaction.html
View file

@ -101,7 +101,7 @@
</a>
<ul class="tx-copayers" ng-show="tx.showDetails">
<li ng-repeat="c in tx.actionList">
<li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
<span>
<i ng-if="c.actions.rejected" class="fi-x icon-sign x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-sign check"></i>