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 branch 'master' into easy-install

This commit is contained in:
Eric Martindale 2014-01-22 00:04:48 +00:00
parent 904f21405e 4d0ec37652
commit e2ef12661f
3 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/HistoricSync.js
View File

@ -98,6 +98,8 @@ function spec() {
}
else {
self.syncPercentage = parseFloat(100 * self.syncedBlocks / self.blockChainHeight).toFixed(3);
if (self.syncPercentage > 100) self.syncPercentage = 100;
p(util.format('status: [%d%%] skipped: %d', self.syncPercentage, self.skippedBlocks));
}
if (self.opts.shouldBroadcast) {

2
public/views/header.html
View File

@ -27,7 +27,7 @@
<span data-ng-init="getSync()">
<div class="t text-danger" data-ng-show="sync.error" tooltip="{{sync.error}}" tooltip-placement="bottom"> ERROR </div>
<div class="t text-warning " tooltip="{{sync.syncedBlocks}} / {{sync.blockChainHeight}} synced. {{sync.skippedBlocks}} skipped" tooltip-placement="bottom" data-ng-show="sync.status==='syncing'"> {{sync.status}} {{sync.syncPercentage}}%</div>
<div class="t text-default" tooltip="historic sync finished" tooltip-placement="bottom" data-ng-show="sync.status==='finished'"> On sync</div>
<div class="t text-default" tooltip="Historic sync finished" tooltip-placement="bottom" data-ng-show="sync.status==='finished'"> On sync</div>
</span>
</span>
<span data-ng-init="getStatus('Info')">

39
public/views/status.html
View File

@ -10,53 +10,28 @@
<h4>Sync Status</h4>
<table class="table" data-ng-init="getSync()">
<tbody>
<tr data-ng-show="syncError">
<td colspan="2"> <span class="text-danger"> {{ syncError }} </span>
<tr data-ng-show="sync.error">
<td colspan="2"> <span class="text-danger"> {{ sync.err }} </span>
<td colspan="2"> <span class="text-danger"> {{sync.error}} </span>
</tr>
<tr>
<td>Sync Progress</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: {{(100 * sync.syncedBlocks/sync.blocksToSync)| number:2}}%">
<span>{{(100 * sync.syncedBlocks/sync.blocksToSync)| number:2}}% Complete</span>
<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>
</div>
</div>
</tr>
<tr>
<td>Blocks to Sync</td>
<td class="text-right">{{sync.blocksToSync}}</td>
<td>Initial Block Chain Height</td>
<td class="text-right">{{sync.blockChainHeight}}</td>
</tr>
<tr>
<td>Synced Blocks</td>
<td class="text-right">{{sync.syncedBlocks}}</td>
</tr>
<tr>
<td>Start</td>
<td class="text-right">
<a href="/#!/block/{{sync.start}}">{{sync.start}}</a>
<span data-ng-show="sync.isStartGenesis"> (genesisBlock)</span>
</td>
</tr>
<tr>
<td>End</td>
<td class="text-right">
<a href="/#!/block/{{sync.end}}">{{sync.end}}</a>
<span data-ng-show="sync.isEndGenesis"> (genesisBlock)</span>
</td>
</tr>
<tr>
<td>Sync properties</td>
<td class="text-right">
<ul>
<li data-ng-show="sync.upToExisting"> <span> Stops at existing block </span>
<li>
<span data-ng-show="sync.scanningBackward"> Backward Scan</span>
<span data-ng-hide="sync.scanningBackward"> Forward Scan</span>
</ul>
</td>
</tr>
<td>Skipped Blocks (previously synced)</td>
<td class="text-right">{{sync.skippedBlocks}}</td>
</tbody>
</table>