From 163eda58409d03b8ceba3db853199b4a9d0f1845 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 21 Jan 2014 19:53:00 -0300
Subject: [PATCH] update status page

---
 lib/HistoricSync.js      |  2 ++
 public/views/header.html |  2 +-
 public/views/status.html | 39 +++++++--------------------------------
 3 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/lib/HistoricSync.js b/lib/HistoricSync.js
index 4f8c825..7fd0a56 100644
--- a/lib/HistoricSync.js
+++ b/lib/HistoricSync.js
@@ -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) {
diff --git a/public/views/header.html b/public/views/header.html
index 726b838..baf6f77 100755
--- a/public/views/header.html
+++ b/public/views/header.html
@@ -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')">
diff --git a/public/views/status.html b/public/views/status.html
index 6ff6abf..ab26f95 100644
--- a/public/views/status.html
+++ b/public/views/status.html
@@ -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>