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

Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api

Browse Source
This commit is contained in:
Manuel Araoz 2014-01-20 13:31:57 -03:00
commit 76273d1c6c
3 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gruntfile.js
View File

@ -63,11 +63,10 @@ module.exports = function(grunt) {
nodemon: {
dev: {
script: 'server.js',
options: {
file: 'server.js',
args: [],
ignoredFiles: ['public/**', 'test/**','util/**'],
watchedExtensions: ['js'],
ignore: ['public/**', 'test/**','util/**'],
// nodeArgs: ['--debug'],
delayTime: 1,
env: {
@ -95,7 +94,7 @@ module.exports = function(grunt) {
//Default task(s).
grunt.registerTask('default', ['jshint','concurrent']);
//Test task.
grunt.registerTask('test', ['env:test', 'mochaTest']);
};

6
public/css/common.css
View File

@ -101,7 +101,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
background-color: #F4F4F4;
padding: 15px;
margin-top: 10px;
width: 360px;
width: 265px;
height: 89%;
border-radius: 5px;
}
@ -124,8 +124,8 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
}
.col-gray .address {
float: right;
width: 150px;
line-height: 20px;
width: 125px;
}
.block-id {

52
public/views/block.html
View File

@ -1,6 +1,6 @@
<section data-ng-controller="BlocksController" data-ng-init="findOne()">
<div class="row">
<div class="col-md-4">
<div class="col-md-3">
<div class="bs-sidebar hidden-print affix col-gray">
<div class="block-id">
<div class="icon-block text-center">
@ -9,38 +9,34 @@
<h1 data-ng-if="block">Block #{{ block.height }}</h1>
</div>
<div data-ng-show="!tx.isCoinBase">
<div class="panel-heading">
<h3>Hashes</h3>
</div>
<div class="panel-body">
<table class="table table">
<tbody>
<tr>
<td>Hash</td>
<td><a class="address ellipsis" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
</tr>
<tr>
<td>Previous Block</td>
<td><a class="address ellipsis" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
</tr>
<tr>
<td>Next Block</td>
<td><a class="address ellipsis" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
</tr>
<tr>
<td>Merkle Root</td>
<td> <p class="address ellipsis"> {{block.merkleroot}} </p> </td>
</tr>
</tbody>
</table>
</div>
<div class="m50v" data-ng-show="!tx.isCoinBase">
<h4>Hashes</h4>
<table class="table">
<tbody>
<tr>
<td> <small>Hash </small></td>
<td><a class="address ellipsis" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
</tr>
<tr>
<td><small> Previous Block</small></td>
<td><a class="address ellipsis" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
</tr>
<tr>
<td><small> Next Block</small></td>
<td><a class="address ellipsis" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
</tr>
<tr>
<td><small> Merkle Root</small></td>
<td> <p class="address ellipsis"> {{block.merkleroot}} </p> </td>
</tr>
</tbody>
</table>
</div>
</div>
</div> <!-- END OF COL-GRAY -->
<div class="col-md-8">
<div class="col-md-9">
<h3>Summary</h3>
<div class="row">
<div class="col-md-6">