RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
public/src/css/common.css
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;
}

10
public/views/address.html
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">

170
public/views/block.html
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,95 +20,101 @@
</span> </span>
</div> </div>
</div> </div>
</div> <div class="hide_snavbar">
<h1>Block #{{block.height}}</h1> <a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<div class="progress progress-striped active" data-ng-if="!block.hash"> <span data-ng-show="hideSNavbar">Show</span>
<div class="progress-bar progress-bar-info" style="width: 100%"> <span data-ng-show="!hideSNavbar">Hide</span>
<span>Loading Block...</span> </a>
</div> </div>
</div> </div>
<div class="row ng-cloak" data-ng-cloak data-ng-if="block.hash"> <h1>Block #{{block.height}}</h1>
<div class="text-muted" data-ng-if="!block.hash">
<span>Loading Block Information...</span>
</div>
<div class="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="col-md-6"> <div class="row">
<table class="table" style="table-layout: fixed"> <div class="col-md-6">
<tbody> <table class="table" style="table-layout: fixed">
<tr> <tbody>
<td><strong>Number Of Transactions</strong></td> <tr>
<td class="text-right text-muted">{{block.tx.length}}</td> <td><strong>Number Of Transactions</strong></td>
</tr> <td class="text-right text-muted">{{block.tx.length}}</td>
<tr> </tr>
<td><strong>Height</strong></td> <tr>
<td class="text-right text-muted">{{block.height}} <td><strong>Height</strong></td>
<span data-ng-show="block.isMainChain" class="text-success">(Mainchain)</span> <td class="text-right text-muted">{{block.height}}
<span data-ng-show="!block.isMainChain" class="text-danger"> <span class="glyphicon glyphicon-warning-sign"></span> (Orphaned)</span> <span data-ng-show="block.isMainChain" class="text-success">(Mainchain)</span>
</td> <span data-ng-show="!block.isMainChain" class="text-danger"> <span class="glyphicon glyphicon-warning-sign"></span> (Orphaned)</span>
</tr> </td>
<tr> </tr>
<td><strong>Block Reward</strong></td> <tr>
<td class="text-right text-muted">{{$root.currency.getConvertion(block.reward) || block.reward + ' BTC'}}</td> <td><strong>Block Reward</strong></td>
</tr> <td class="text-right text-muted">{{$root.currency.getConvertion(block.reward) || block.reward + ' BTC'}}</td>
<tr> </tr>
<td><strong>Timestamp</strong></td> <tr>
<td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td> <td><strong>Timestamp</strong></td>
</tr> <td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td>
<tr data-ng-show="block.poolInfo"> </tr>
<td><strong>Mined by</strong></td> <tr data-ng-show="block.poolInfo">
<td class="text-right text-muted"> <td><strong>Mined by</strong></td>
<a href="{{block.poolInfo.url}}" target="_blank" title="{{block.poolInfo.poolName}}">{{block.poolInfo.poolName}}</a> <td class="text-right text-muted">
</td> <a href="{{block.poolInfo.url}}" target="_blank" title="{{block.poolInfo.poolName}}">{{block.poolInfo.poolName}}</a>
</tr> </td>
<tr> </tr>
<td><strong>Merkle Root</strong></td> <tr>
<td class="text-right text-muted"> <td><strong>Merkle Root</strong></td>
<div class="ellipsis"> <td class="text-right text-muted">
<span class="btn-copy" clip-copy="block.merkleroot"></span> <div class="ellipsis">
<span>{{block.merkleroot}}</span> <span class="btn-copy" clip-copy="block.merkleroot"></span>
</div> <span>{{block.merkleroot}}</span>
</td> </div>
</tr> </td>
<tr data-ng-show="block.previousblockhash"> </tr>
<td><strong>Previous Block</strong></td> <tr data-ng-show="block.previousblockhash">
<td class="text-right"><a href="/block/{{block.previousblockhash}}">{{block.height-1}}</a></td> <td><strong>Previous Block</strong></td>
</tr> <td class="text-right"><a href="/block/{{block.previousblockhash}}">{{block.height-1}}</a></td>
</tbody> </tr>
</table> </tbody>
</table>
</div>
<div class="col-md-6">
<table class="table">
<tbody>
<tr>
<td> <strong> Difficulty </strong></td>
<td class="text-right text-muted">{{block.difficulty}}</td>
</tr>
<tr>
<td> <strong> Bits </strong></td>
<td class="text-right text-muted">{{block.bits}}</td>
</tr>
<tr>
<td> <strong> Size (bytes) </strong></td>
<td class="text-right text-muted">{{block.size}}</td>
</tr>
<tr>
<td> <strong> Version </strong></td>
<td class="text-right text-muted">{{block.version}}</td>
</tr>
<tr>
<td> <strong> Nonce </strong></td>
<td class="text-right text-muted">{{block.nonce}}</td>
</tr>
<tr data-ng-show="block.nextblockhash">
<td><strong>Next Block</strong></td>
<td class="text-right"><a href="/block/{{block.nextblockhash}}">{{block.height+1}}</a></td>
</tr>
</tbody>
</table>
</div>
</div> </div>
<div class="col-md-6"> </div>
<table class="table">
<tbody>
<tr>
<td> <strong> Difficulty </strong></td>
<td class="text-right text-muted">{{block.difficulty}}</td>
</tr>
<tr>
<td> <strong> Bits </strong></td>
<td class="text-right text-muted">{{block.bits}}</td>
</tr>
<tr>
<td> <strong> Size (bytes) </strong></td>
<td class="text-right text-muted">{{block.size}}</td>
</tr>
<tr>
<td> <strong> Version </strong></td>
<td class="text-right text-muted">{{block.version}}</td>
</tr>
<tr>
<td> <strong> Nonce </strong></td>
<td class="text-right text-muted">{{block.nonce}}</td>
</tr>
<tr data-ng-show="block.nextblockhash">
<td><strong>Next Block</strong></td>
<td class="text-right"><a href="/block/{{block.nextblockhash}}">{{block.height+1}}</a></td>
</tr>
</tbody>
</table>
</div>
</div><!-- END OF ROW -->
<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>

10
public/views/transaction.html
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