fix layout history, manage and settings

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-05 17:33:51 -03:00
commit 1e1f39e3b2
3 changed files with 64 additions and 54 deletions

View file

@ -1,5 +1,6 @@
<div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()">
<div ng-show='$root.wallet.isReady()'>
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<div ng-if="loading" class="m20b">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Loading...</span>
@ -15,20 +16,29 @@
<div class="panel oh"
ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
<div class="row size-14">
<div class="large-2 medium-3 small-12 columns">
<span ng-hide="btx.ts">&nbsp;</span>
<time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
<span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
<span translate>Unconfirmed</span>
</span>
<div class="large-2 medium-2 small-12 columns">
<div class="tx-date">
<time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
<span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
<span translate>Unconfirmed</span>
</span>
</div>
</div>
<div class="large-2 medium-3 small-6 columns text-right">
<div ng-class="{
<div class="large-2 medium-3 small-5 columns text-right">
<div class="tx-amount" ng-class="{
'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
</div>
</div>
<div class="large-1 medium-1 small-2 columns text-center">
<div ng-class="{
'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<i class="m15h"
ng-class="{
'fi-arrow-left' : btx.action == 'received',
@ -37,13 +47,13 @@
</div>
</div>
<div class="large-3 medium-3 small-6 columns text-gray">
<span ng-hide="btx.labelTo">&nbsp;</span>
<span ng-show="btx.labelTo">{{btx.labelTo}}</span>
<div class="large-3 medium-3 small-5 columns text-gray">
<span class="ellipsis">{{btx.labelTo || btx.addressTo}}</span>
</div>
<div class="large-4 medium-3 small-12 columns text-gray">
<span ng-show="btx.comment"><i class="fi-comment-quotes"></i> {{btx.comment}} </span>
<div class="large-3 medium-3 small-12 columns text-gray">
<div class="tx-comment" ng-show="btx.comment">
<i class="fi-comment-quotes"></i> {{btx.comment}}</div>
</div>
<div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false">