Fix Conflicts:
views/addresses.html views/send.html views/transactions.html
This commit is contained in:
commit
6a855b7ac1
18 changed files with 393 additions and 89 deletions
|
|
@ -31,14 +31,14 @@
|
|||
No transactions yet.
|
||||
</div>
|
||||
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
|
||||
<div class="last-transactions-header">
|
||||
<div class="large-8 medium-7 small-3 columns ellipsis">
|
||||
<div class="last-transactions-header size-14">
|
||||
<div class="large-8 medium-7 small-4 columns ellipsis">
|
||||
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
|
||||
{{btx.txid}}
|
||||
</a>
|
||||
<span class="btn-copy" clip-copy="btx.txid"></span>
|
||||
</div>
|
||||
<div class="large-4 medium-5 small-9 columns text-right">
|
||||
<div class="large-4 medium-5 small-8 columns text-right">
|
||||
<div data-ng-show="btx.firstSeenTs">
|
||||
<span translate>first seen at</span>
|
||||
<time>{{btx.firstSeenTs * 1000 | amCalendar}}</time>
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="last-transactions-content">
|
||||
<div class="large-5 medium-5 small-5 columns">
|
||||
<div class="large-5 medium-5 small-12 columns">
|
||||
<div ng-repeat="vin in btx.vinSimple">
|
||||
<small class="right m5t">{{vin.value| noFractionNumber}} {{$root.unitName}}</small>
|
||||
<p class="ellipsis text-gray size-12">
|
||||
|
|
@ -58,10 +58,13 @@
|
|||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="large-1 medium-1 small-1 columns text-center">
|
||||
<div class="large-1 medium-1 hide-for-small-only columns text-center">
|
||||
<i class="fi-arrow-right"></i>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<div class="show-for-small-only small-12 columns text-center">
|
||||
<i class="fi-arrow-down"></i>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-12 columns">
|
||||
<div ng-repeat="vout in btx.voutSimple">
|
||||
<small class="right m5t">{{vout.value| noFractionNumber}} {{$root.unitName}}</small>
|
||||
<p class="ellipsis text-gray size-12">
|
||||
|
|
@ -71,12 +74,13 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="last-transactions-footer">
|
||||
<div class="large-4 medium-4 small-4 columns">
|
||||
<span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.unitName}}</div>
|
||||
<div class="large-4 medium-4 small-4 columns text-center">
|
||||
<span translate>Confirmations</span>: {{btx.confirmations || 0}}</div>
|
||||
<div class="large-4 medium-4 small-4 columns text-right">
|
||||
<span translate>Total</span>: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}</div>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<p class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.unitName}}</p>
|
||||
<p class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</p>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<p class="label size-14"><span translate>Total</span>: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue