Merge pull request #177 from colkito/bug/new-templates-for-angular
Bug/new templates for angular
This commit is contained in:
commit
6995563437
|
@ -1,4 +1,4 @@
|
||||||
#footer(data-ng-include="'/views/footer.html'", role='navigation')
|
#footer(data-ng-include="'/views/includes/footer.html'", role='navigation')
|
||||||
|
|
||||||
script(type='text/javascript', src='/socket.io/socket.io.js')
|
script(type='text/javascript', src='/socket.io/socket.io.js')
|
||||||
script(type='text/javascript', src='/lib/momentjs/moment.js')
|
script(type='text/javascript', src='/lib/momentjs/moment.js')
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
.navbar.navbar-default.navbar-fixed-top(data-ng-include="'/views/header.html'", role='navigation')
|
.navbar.navbar-default.navbar-fixed-top(data-ng-include="'/views/includes/header.html'", role='navigation')
|
||||||
|
|
|
@ -1,11 +1,4 @@
|
||||||
extends layouts/default
|
extends layouts/default
|
||||||
|
|
||||||
block content
|
block content
|
||||||
.connection-status.container(data-ng-controller='ConnectionController')
|
|
||||||
.alert.alert-danger(data-ng-show='!serverOnline || !clienteOnline || !apiOnline', data-ng-init='getConnStatus()')
|
|
||||||
strong Error!
|
|
||||||
p(data-ng-show='!apiOnline') Can't connect to bitcoind.
|
|
||||||
p(data-ng-show='!serverOnline') Can't connect to server.
|
|
||||||
p(data-ng-show='!clienteOnline') Can't connect to internet. Please, check your connection.
|
|
||||||
|
|
||||||
section.container(data-ng-view)
|
section.container(data-ng-view)
|
||||||
|
|
|
@ -294,7 +294,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
||||||
-------------------------------------------------- */
|
-------------------------------------------------- */
|
||||||
/* Not required for template or sticky footer method. */
|
/* Not required for template or sticky footer method. */
|
||||||
|
|
||||||
#wrap > .container { padding: 0 15px; }
|
#wrap > .container { padding: 60px 15px 0; }
|
||||||
|
|
||||||
.container .text-muted a { color: #eee; }
|
.container .text-muted a { color: #eee; }
|
||||||
|
|
||||||
|
@ -401,7 +401,6 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
||||||
.transaction-vin-vout .ellipsis { margin-bottom: 10px; }
|
.transaction-vin-vout .ellipsis { margin-bottom: 10px; }
|
||||||
.transaction-vin-vout .btc-value { margin-left: 15px; }
|
.transaction-vin-vout .btc-value { margin-left: 15px; }
|
||||||
|
|
||||||
.connection-status { margin-top: 60px; }
|
|
||||||
.page-header { margin-top: 0; }
|
.page-header { margin-top: 0; }
|
||||||
|
|
||||||
.block_hash {
|
.block_hash {
|
||||||
|
|
|
@ -20,11 +20,11 @@ angular.module('insight').config(function($routeProvider) {
|
||||||
title: 'Home'
|
title: 'Home'
|
||||||
}).
|
}).
|
||||||
when('/blocks', {
|
when('/blocks', {
|
||||||
templateUrl: '/views/blocks/list.html',
|
templateUrl: '/views/blocks_list.html',
|
||||||
title: 'Bitcoin Blocks solved Today'
|
title: 'Bitcoin Blocks solved Today'
|
||||||
}).
|
}).
|
||||||
when('/blocks-date/:blockDate', {
|
when('/blocks-date/:blockDate', {
|
||||||
templateUrl: '/views/blocks/list.html',
|
templateUrl: '/views/blocks_list.html',
|
||||||
title: 'Bitcoin Blocks solved '
|
title: 'Bitcoin Blocks solved '
|
||||||
}).
|
}).
|
||||||
when('/address/:addrStr', {
|
when('/address/:addrStr', {
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<div data-ng-include src="'/views/includes/connection.html'"></div>
|
||||||
<div class="jumbotron">
|
<div class="jumbotron">
|
||||||
<h1>Ooops!</h1>
|
<h1>Ooops!</h1>
|
||||||
<h2 class="text-muted">404 Page not found :(</h2>
|
<h2 class="text-muted">404 Page not found :(</h2>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<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="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-gray col-gray-fixed">
|
<div class="col-xs-12 col-gray col-gray-fixed">
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<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="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-gray col-gray-fixed">
|
<div class="col-xs-12 col-gray col-gray-fixed">
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<div data-ng-include src="'/views/includes/connection.html'"></div>
|
||||||
<section data-ng-controller="BlocksController" data-ng-init="list()">
|
<section data-ng-controller="BlocksController" data-ng-init="list()">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-gray col-gray-fixed">
|
<div class="col-xs-12 col-gray col-gray-fixed">
|
|
@ -0,0 +1,8 @@
|
||||||
|
<div class="connection-status container" data-ng-controller="ConnectionController">
|
||||||
|
<div class="alert alert-danger" data-ng-show="!serverOnline || !clienteOnline || !apiOnline", data-ng-init="getConnStatus()">
|
||||||
|
<strong>Error!</strong>
|
||||||
|
<p data-ng-show="!apiOnline">Can't connect to bitcoind.</p>
|
||||||
|
<p data-ng-show="!serverOnline">Can't connect to server.</p>
|
||||||
|
<p data-ng-show="!clienteOnline">Can't connect to internet. Please, check your connection.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
|
@ -1,6 +1,7 @@
|
||||||
<div class="alert alert-danger" data-ng-show="flashMessage">
|
<div class="alert alert-danger" data-ng-show="flashMessage">
|
||||||
{{flashMessage}}
|
{{flashMessage}}
|
||||||
</div>
|
</div>
|
||||||
|
<div data-ng-include src="'/views/includes/connection.html'"></div>
|
||||||
<section data-ng-controller="IndexController" data-ng-init="index()">
|
<section data-ng-controller="IndexController" data-ng-init="index()">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div id="home" class="row">
|
<div id="home" class="row">
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<div data-ng-include src="'/views/includes/connection.html'"></div>
|
||||||
<section>
|
<section>
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1>
|
<h1>
|
||||||
|
@ -42,7 +43,7 @@
|
||||||
|
|
||||||
<h2>Transaction Output Set Information</h2>
|
<h2>Transaction Output Set Information</h2>
|
||||||
<table class="table" style="table-layout: fixed" data-ng-controller="StatusController" data-ng-init="getStatus('TxOutSetInfo')">
|
<table class="table" style="table-layout: fixed" data-ng-controller="StatusController" data-ng-init="getStatus('TxOutSetInfo')">
|
||||||
<thead data-ng-include src="'/views/infoStatus.html'"> </thead>
|
<thead data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Height</td>
|
<td>Height</td>
|
||||||
|
@ -77,7 +78,7 @@
|
||||||
|
|
||||||
<h2>Last Block</h2>
|
<h2>Last Block</h2>
|
||||||
<table class="table" style="table-layout: fixed" data-ng-controller="StatusController" data-ng-init="getStatus('LastBlockHash')">
|
<table class="table" style="table-layout: fixed" data-ng-controller="StatusController" data-ng-init="getStatus('LastBlockHash')">
|
||||||
<thead data-ng-include src="'/views/infoStatus.html'"> </thead>
|
<thead data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Last Block Hash</td>
|
<td>Last Block Hash</td>
|
||||||
<td class="text-right ellipsis"><a href="/block/{{lastblockhash}}">{{lastblockhash}}</a></td>
|
<td class="text-right ellipsis"><a href="/block/{{lastblockhash}}">{{lastblockhash}}</a></td>
|
||||||
|
@ -89,7 +90,7 @@
|
||||||
<div class="col-xs-12 col-md-4 col-gray">
|
<div class="col-xs-12 col-md-4 col-gray">
|
||||||
<h2>Bitcoin node information</h2>
|
<h2>Bitcoin node information</h2>
|
||||||
<table class="table" data-ng-controller="StatusController" data-ng-init="getStatus('Info')">
|
<table class="table" data-ng-controller="StatusController" data-ng-init="getStatus('Info')">
|
||||||
<thead data-ng-include src="'/views/infoStatus.html'"> </thead>
|
<thead data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Version</td>
|
<td>Version</td>
|
||||||
|
@ -144,7 +145,7 @@
|
||||||
|
|
||||||
<h4>Difficulty</h4>
|
<h4>Difficulty</h4>
|
||||||
<table class="table" data-ng-controller="StatusController" data-ng-init="getStatus('Difficulty')">
|
<table class="table" data-ng-controller="StatusController" data-ng-init="getStatus('Difficulty')">
|
||||||
<thead data-ng-include src="'/views/infoStatus.html'"> </thead>
|
<thead data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
|
||||||
<tbody
|
<tbody
|
||||||
<tr>
|
<tr>
|
||||||
<td>Mining Difficulty</td>
|
<td>Mining Difficulty</td>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<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()">
|
||||||
<h1>
|
<h1>
|
||||||
Transaction
|
Transaction
|
||||||
|
|
Loading…
Reference in New Issue