Merge branch 'master' of github.com:bitpay/insight into bug/wording_changes
Conflicts: public/views/status.html
This commit is contained in:
commit
8207b07dc5
|
@ -60,7 +60,7 @@ function spec() {
|
|||
// TODO TXout!
|
||||
//T
|
||||
function (cb) {
|
||||
TransactionItem.find({addr:that.addrStr}).sort({ts:1}).exec(function(err,txItems){
|
||||
TransactionItem.find({addr:that.addrStr}).sort({ts:-1}).exec(function(err,txItems){
|
||||
if (err) return cb(err);
|
||||
|
||||
txItems.forEach(function(txItem){
|
||||
|
|
|
@ -29,7 +29,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
|||
min-height: 100%;
|
||||
height: auto;
|
||||
/* Negative indent footer by its height */
|
||||
margin: 0 auto -44px;
|
||||
margin: 0 auto -51px;
|
||||
/* Pad bottom by footer height */
|
||||
padding: 0 0 60px;
|
||||
}
|
||||
|
@ -221,14 +221,27 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
|||
border: 2px solid #6C0000;
|
||||
}
|
||||
|
||||
#status .table {
|
||||
margin-bottom: 45px;
|
||||
}
|
||||
|
||||
/* Set the fixed height of the footer here */
|
||||
#footer {
|
||||
height: 44px;
|
||||
background-color: #8DC429;
|
||||
border-top: 4px solid #64920F;
|
||||
height: 51px;
|
||||
background-color: #373D42;
|
||||
border-top: 4px solid #656E76;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
#footer .insight {
|
||||
font-size: 20px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.line-footer {
|
||||
border-top: 2px dashed #ccc;
|
||||
}
|
||||
|
||||
.line-bot {
|
||||
padding: 0 0 10px 0;
|
||||
margin-bottom: 10px;
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
<div class="col-md-9">
|
||||
<div data-ng-controller="transactionsController" data-ng-init="load('address')">
|
||||
<h2>Transactions <small>Transactions contained within this block</small></h2>
|
||||
<h2>Transactions <small>Transactions for this address</small></h2>
|
||||
<div data-ng-include src="'/views/transaction/list.html'" when-scrolled="loadMore()"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<div class="container">
|
||||
<p class="text-center text-muted"><a href="/">Insight</a></p>
|
||||
<a class="insight m10v pull-right" href="/"><small>Insight</small></a>
|
||||
</div>
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
<div class="block-tx fader" data-ng-show="txs && txs[0].txid" data-ng-repeat="tx in txs">
|
||||
<div data-ng-include src="'/views/transaction/tx.html'"></div>
|
||||
</div>
|
||||
<div class="panel panel-default" data-ng-show="!txs.length || loading">
|
||||
<div class="panel-body">
|
||||
Loading...
|
||||
<div class="progress progress-striped active" data-ng-show="!txs.length || loading">
|
||||
<div class="progress-bar" style="width: 100%">
|
||||
<span>Loading...</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,14 +1,9 @@
|
|||
<div class="line-bot">
|
||||
<a href="/#!/tx/{{tx.txid}}">{{tx.txid}}</a>
|
||||
|
||||
<a class="pull-right" style="margin-left:10px" data-ng-click="itemsExpanded = !itemsExpanded">
|
||||
<span data-ng-show="itemsExpanded" class="glyphicon glyphicon-minus-sign" tooltip="Hide items details" tooltip-placement="down" ></span>
|
||||
<span data-ng-show="!itemsExpanded" class="glyphicon glyphicon-plus-sign" tooltip="Show items details" tooltip-placement="down"></span>
|
||||
<span class="glyphicon" data-ng-class="{'glyphicon-minus-sign': itemsExpanded, 'glyphicon-plus-sign': !itemsExpanded}" tooltip="Show/Hide items details" tooltip-placement="down"></span>
|
||||
</a>
|
||||
|
||||
<span class="pull-right">{{tx.time * 1000 | date:'medium'}}</span>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
|
Loading…
Reference in New Issue