zcash-hackworks
/
insight-ui-zcash
mirror of https://github.com/zcash-hackworks/insight-ui-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #177 from colkito/bug/new-templates-for-angular 

Bug/new templates for angular
This commit is contained in:
Gustavo Maximiliano Cortez 2014-01-31 12:56:15 -08:00
parent 71ce49b9ef 35fcb49660
commit 6995563437
16 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/includes/foot.jade
View File

@ -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='/lib/momentjs/moment.js')

2
app/views/includes/navbar.jade
View File

@ -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')

7
app/views/index.jade
View File

@ -1,11 +1,4 @@
extends layouts/default
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)

3
public/css/common.css
View File

@ -294,7 +294,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-------------------------------------------------- */
/* 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; }
@ -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 .btc-value { margin-left: 15px; }
.connection-status { margin-top: 60px; }
.page-header { margin-top: 0; }
.block_hash {

4
public/js/config.js
View File

@ -20,11 +20,11 @@ angular.module('insight').config(function($routeProvider) {
title: 'Home'
}).
when('/blocks', {
templateUrl: '/views/blocks/list.html',
templateUrl: '/views/blocks_list.html',
title: 'Bitcoin Blocks solved Today'
}).
when('/blocks-date/:blockDate', {
templateUrl: '/views/blocks/list.html',
templateUrl: '/views/blocks_list.html',
title: 'Bitcoin Blocks solved '
}).
when('/address/:addrStr', {

1
public/views/404.html
View File

@ -1,3 +1,4 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<div class="jumbotron">
<h1>Ooops!</h1>
<h2 class="text-muted">404 Page not found :(</h2>

1
public/views/address.html
View File

@ -1,3 +1,4 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="AddressController" data-ng-init="findOne()">
<div class="row">
<div class="col-xs-12 col-gray col-gray-fixed">

1
public/views/block.html
View File

@ -1,3 +1,4 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="BlocksController" data-ng-init="findOne()">
<div class="row">
<div class="col-xs-12 col-gray col-gray-fixed">

1
public/views/blocks/list.html → public/views/block_list.html
View File

@ -1,3 +1,4 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="BlocksController" data-ng-init="list()">
<div class="row">
<div class="col-xs-12 col-gray col-gray-fixed">

8
public/views/includes/connection.html Normal file
View File

@ -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>

0
public/views/footer.html → public/views/includes/footer.html
View File

0
public/views/header.html → public/views/includes/header.html Executable file → Normal file
View File

0
public/views/infoStatus.html → public/views/includes/infoStatus.html
View File

1
public/views/index.html
View File

@ -1,6 +1,7 @@
<div class="alert alert-danger" data-ng-show="flashMessage">
{{flashMessage}}
</div>
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="IndexController" data-ng-init="index()">
<div class="container">
<div id="home" class="row">

21
public/views/status.html
View File

@ -1,11 +1,12 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section>
<div class="page-header">
<h1>
Application Status
Application Status
</h1>
</div>
<div id="status" class="row">
<div class="col-xs-12 col-md-8">
<h2>Sync Status</h2>
<table class="table" data-ng-controller="StatusController" data-ng-init="getSync()">
@ -15,7 +16,7 @@
</thead>
<tr>
<td>Sync Progress</td>
<td>
<td>
<div class="progress">
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {{ sync.syncPercentage}}%">
<span>{{sync.syncPercentage}}% Complete</span>
@ -26,7 +27,7 @@
<td>Current Sync Status</td>
<td class="text-right">{{sync.status}}</td>
</tr>
<tr>
<td>Initial Block Chain Height</td>
<td class="text-right">{{sync.blockChainHeight}}</td>
@ -39,10 +40,10 @@
<td class="text-right">{{sync.skippedBlocks}}</td>
</tbody>
</table>
<h2>Transaction Output Set Information</h2>
<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>
<tr>
<td>Height</td>
@ -74,10 +75,10 @@
</tr>
</tbody>
</table>
<h2>Last Block</h2>
<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>
<td>Last Block Hash</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">
<h2>Bitcoin node information</h2>
<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>
<tr>
<td>Version</td>
@ -144,7 +145,7 @@
<h4>Difficulty</h4>
<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
<tr>
<td>Mining Difficulty</td>

3
public/views/transaction.html
View File

@ -1,3 +1,4 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="transactionsController" data-ng-init="findThis()">
<h1>
Transaction
@ -48,7 +49,7 @@
</tbody>
</table>
</div>
</div>
</section>