Merge pull request #123 from bechi/feature/tx-details

Feature/tx details
This commit is contained in:
Manuel Aráoz 2014-04-22 12:33:29 -03:00
commit 0b09e13d2b
2 changed files with 35 additions and 17 deletions

View File

@ -81,6 +81,10 @@ body {
border:0;
}
.panel.status {
margin: 0;
}
/*.panel:hover {
background: #efefef;
color: #111;
@ -91,7 +95,7 @@ body {
}
.transactions .panel {
background: #ECECEC;
background: #f5f5f5;
border: 1px solid #eee;
}
@ -213,7 +217,10 @@ small.has-error {
}
}
tr { background: none !important;}
table tr th, table tr td { padding: 0.5625rem 0rem; }
hr { margin: 2.25rem 0;}
table { margin-bottom: 0.25rem;}
button.primary { background-color: #111; }
button.secondary { background-color: #FAE448 !important; }
@ -221,6 +228,7 @@ button.secondary { background-color: #FAE448 !important; }
button.primary:hover { background-color: #333;}
button.secondary:hover { background-color: #FFDF00 !important;}
.text-gray { color: #999 !important;}
.pr {position: relative;}
.m0 {margin: 0;}
.db {display: block;}
@ -241,6 +249,7 @@ button.secondary:hover { background-color: #FFDF00 !important;}
.p5h {padding: 0 5px;}
.p20h {padding: 0 20px;}
.m30v {margin: 30px 0;}
.m10h {margin:0 10px;}
.m30a {margin: 30px auto;}
.br100 {border-radius: 100%;}

View File

@ -249,10 +249,14 @@
<div class="txheader">
<div class="row">
<div class="large-8 columns">
Proposal ID: {{tx.ntxid}}
<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>
</tr>
</div>
<div class="large-4 columns text-right">
created at {{tx.createdTs | date:'medium'}}
<h6> created at {{tx.createdTs | date:'medium'}} </h6>
</div>
</div>
</div>
@ -261,21 +265,26 @@
<div class="large-12 columns">
<table style="width:100%">
<tbody>
<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">
<td class="text-left size-24">{{o.address}}</td>
</tr>
<tr>
<small class="right text-gray"> <strong> Proposal ID: </strong> {{tx.ntxid}} </small>
</tr>
<tr ng-repeat="(peer, actions) in tx.peerActions">
<td colspan="3" >
<span ng-if="peer == $root.wallet.network.peerId"> You</span>
<span ng-if="peer != $root.wallet.network.peerId"> {{peer}}</span>
:
<span ng-repeat="(action, ts) in actions">
<a title="{{ts | date:'medium'}}"> {{action}}</a>
</span>
</tr>
<td colspan="3">
<div class="panel status">
<span ng-if="peer == $root.wallet.network.peerId"> You
</span>
<span ng-if="peer != $root.wallet.network.peerId"> {{peer}}</span>
<span ng-repeat="(action, ts) in actions">
<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>
<a title="{{ts | date:'medium'}}"></a>
</span>
</div>
</td>
</tr>
</tbody>
</table>
</div>