RanchiMall/flocore-node
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: { nodemon: {
dev: { dev: {
script: 'server.js',
options: { options: {
file: 'server.js',
args: [], args: [],
ignoredFiles: ['public/**', 'test/**','util/**'], ignore: ['public/**', 'test/**','util/**'],
watchedExtensions: ['js'],
// nodeArgs: ['--debug'], // nodeArgs: ['--debug'],
delayTime: 1, delayTime: 1,
env: { env: {
@ -95,7 +94,7 @@ module.exports = function(grunt) {
//Default task(s). //Default task(s).
grunt.registerTask('default', ['jshint','concurrent']); grunt.registerTask('default', ['jshint','concurrent']);
//Test task. //Test task.
grunt.registerTask('test', ['env:test', 'mochaTest']); 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; background-color: #F4F4F4;
padding: 15px; padding: 15px;
margin-top: 10px; margin-top: 10px;
width: 360px; width: 265px;
height: 89%; height: 89%;
border-radius: 5px; border-radius: 5px;
} }
@ -124,8 +124,8 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
} }
.col-gray .address { .col-gray .address {
float: right; line-height: 20px;
width: 150px; width: 125px;
} }
.block-id { .block-id {

52
public/views/block.html
View File

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