Merge pull request #402 from cmgustavo/feature/02fix-layout

Feature/02fix layout
This commit is contained in:
Mario Colque 2014-02-25 11:10:43 -02:00
commit f42d4ff1cf
6 changed files with 116 additions and 88 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -680,3 +680,13 @@ a.v_highlight_more {
z-index: 1000; z-index: 1000;
} }
.hide_snavbar {
position: absolute;
right: 10px;
border: 1px solid #eee;
padding: 5px 10px;
margin-top: 10px;
background: #fff;
}

View File

@ -1,7 +1,7 @@
<div data-ng-include src="'/views/includes/connection.html'"></div> <div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="AddressController" data-ng-init="findOne()"> <section data-ng-controller="AddressController" data-ng-init="findOne()">
<div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="address.addrStr"> <div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="address.addrStr" data-ng-init="hideSNavbar=0">
<div class="row"> <div class="row" data-ng-if="!hideSNavbar">
<div class="col-md-8 text-center"> <div class="col-md-8 text-center">
<span class="ellipsis txvalues txvalues-normal"> <span class="ellipsis txvalues txvalues-normal">
<strong>Address</strong> {{address.addrStr}} <strong>Address</strong> {{address.addrStr}}
@ -12,6 +12,12 @@
<span class="txvalues txvalues-primary"><strong>Final Balance</strong> {{$root.currency.getConvertion(address.balance) || address.balance + ' BTC' }}</span> <span class="txvalues txvalues-primary"><strong>Final Balance</strong> {{$root.currency.getConvertion(address.balance) || address.balance + ' BTC' }}</span>
</div> </div>
</div> </div>
<div class="hide_snavbar">
<a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<span data-ng-show="hideSNavbar">Show</span>
<span data-ng-show="!hideSNavbar">Hide</span>
</a>
</div>
</div> </div>
<h1>Address <small data-ng-show="address.addrStr">{{$root.currency.getConvertion(address.balance) || address.balance + ' BTC'}}</small></h1> <h1>Address <small data-ng-show="address.addrStr">{{$root.currency.getConvertion(address.balance) || address.balance + ' BTC'}}</small></h1>
<div class="text-muted" data-ng-if="!address.addrStr"> <div class="text-muted" data-ng-if="!address.addrStr">

View File

@ -1,7 +1,7 @@
<div data-ng-include src="'/views/includes/connection.html'"></div> <div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="BlocksController" data-ng-init="findOne()"> <section data-ng-controller="BlocksController" data-ng-init="findOne()">
<div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}"> <div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="block.hash" data-ng-init="hideSNavbar=0">
<div class="row"> <div class="row" data-ng-if="!hideSNavbar">
<div class="col-md-2 text-right"> <div class="col-md-2 text-right">
<span class="ellipsis txvalues txvalues-normal"> <span class="ellipsis txvalues txvalues-normal">
<a href="/block/{{block.previousblockhash}}">&larr; Previous Block</a> <a href="/block/{{block.previousblockhash}}">&larr; Previous Block</a>
@ -20,20 +20,25 @@
</span> </span>
</div> </div>
</div> </div>
<div class="hide_snavbar">
<a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<span data-ng-show="hideSNavbar">Show</span>
<span data-ng-show="!hideSNavbar">Hide</span>
</a>
</div>
</div> </div>
<h1>Block #{{block.height}}</h1> <h1>Block #{{block.height}}</h1>
<div class="progress progress-striped active" data-ng-if="!block.hash"> <div class="text-muted" data-ng-if="!block.hash">
<div class="progress-bar progress-bar-info" style="width: 100%"> <span>Loading Block Information...</span>
<span>Loading Block...</span>
</div> </div>
</div> <div class="ng-cloak" data-ng-cloak data-ng-if="block.hash">
<div class="row ng-cloak" data-ng-cloak data-ng-if="block.hash">
<div class="well well-sm ellipsis"> <div class="well well-sm ellipsis">
<strong>BlockHash</strong> <strong>BlockHash</strong>
<span class="txid text-muted">{{block.hash}}</span> <span class="txid text-muted">{{block.hash}}</span>
<span class="btn-copy" clip-copy="block.hash"></span> <span class="btn-copy" clip-copy="block.hash"></span>
</div> </div>
<h2>Summary</h2> <h2>Summary</h2>
<div class="row">
<div class="col-md-6"> <div class="col-md-6">
<table class="table" style="table-layout: fixed"> <table class="table" style="table-layout: fixed">
<tbody> <tbody>
@ -108,7 +113,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div><!-- END OF ROW --> </div>
</div>
<div data-ng-controller="transactionsController" data-ng-init="load('block')"> <div data-ng-controller="transactionsController" data-ng-init="load('block')">
<h3>Transactions</h3> <h3>Transactions</h3>

View File

@ -1,7 +1,7 @@
<div data-ng-include src="'/views/includes/connection.html'"></div> <div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="transactionsController" data-ng-init="findThis()"> <section data-ng-controller="transactionsController" data-ng-init="findThis()">
<div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}"> <div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="tx.txid" data-ng-init="hideSNavbar=0">
<div class="row"> <div class="row" data-ng-if="!hideSNavbar">
<div class="col-md-8 text-center"> <div class="col-md-8 text-center">
<span class="ellipsis txvalues txvalues-normal"> <span class="ellipsis txvalues txvalues-normal">
<strong>Transaction</strong> {{tx.txid}} <strong>Transaction</strong> {{tx.txid}}
@ -14,6 +14,12 @@
<span class="txvalues txvalues-primary">{{$root.currency.getConvertion(tx.valueOut) || tx.valueOut + ' BTC' }}</span> <span class="txvalues txvalues-primary">{{$root.currency.getConvertion(tx.valueOut) || tx.valueOut + ' BTC' }}</span>
</div> </div>
</div> </div>
<div class="hide_snavbar">
<a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<span data-ng-show="hideSNavbar">Show</span>
<span data-ng-show="!hideSNavbar">Hide</span>
</a>
</div>
</div> </div>
<div class="ng-cloak" data-ng-cloak data-ng-if="tx.txid"> <div class="ng-cloak" data-ng-cloak data-ng-if="tx.txid">
<h1>Transaction <h1>Transaction