From 3c41f0b077b7618a1158bf2841a5a55444e625c9 Mon Sep 17 00:00:00 2001
From: nrpatten <nrpatten@gmail.com>
Date: Tue, 11 Mar 2014 06:37:38 -0700
Subject: [PATCH] [UPDATE] progress bars and Est Next Difficulty split

---
 public/site_assets/bootstrap/css/mpos.css     | 14 ++++++-
 .../templates/bootstrap/dashboard/js/api.tpl  |  3 +-
 .../round_statistics/pplns/round.tpl          |  3 +-
 .../round_statistics/pplns/shares.tpl         | 40 ++++++++++++++-----
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css
index 992d75b1..32b640e5 100644
--- a/public/site_assets/bootstrap/css/mpos.css
+++ b/public/site_assets/bootstrap/css/mpos.css
@@ -386,6 +386,16 @@ th.smallwidth {
 }
 
 span.overview-mhs {
-    font-size: 11px;
-    font-weight: bold;
+  font-size: 11px;
+  font-weight: bold;
 }
+
+div.black {
+ color: black;
+}
+
+div.progress-fix {
+  margin: 0px 0px 5px 0px;
+}
+
+
diff --git a/public/templates/bootstrap/dashboard/js/api.tpl b/public/templates/bootstrap/dashboard/js/api.tpl
index 9c1c1a8c..82dfe35b 100644
--- a/public/templates/bootstrap/dashboard/js/api.tpl
+++ b/public/templates/bootstrap/dashboard/js/api.tpl
@@ -90,7 +90,8 @@ $(document).ready(function(){
     $('#b-pivalid').html(number_format(data.getdashboarddata.data.pool.shares.invalid));
     $('#b-pefficiency').html(number_format(100 - data.getdashboarddata.data.pool.shares.invalid_percent, 2) + "%");
     $('#b-diff').html(number_format(data.getdashboarddata.data.network.difficulty, 8));
-    $('#b-nextdiff').html(number_format(data.getdashboarddata.data.network.nextdifficulty, 8) + " (Change in " + data.getdashboarddata.data.network.blocksuntildiffchange + " Blocks)");
+    $('#b-nextdiff').html(number_format(data.getdashboarddata.data.network.nextdifficulty, 8));
+    $('#b-nextdiffc').html(" Change in " + data.getdashboarddata.data.network.blocksuntildiffchange + " Blocks");
     var minutes = Math.floor(data.getdashboarddata.data.network.esttimeperblock / 60);
     var seconds = Math.floor(data.getdashboarddata.data.network.esttimeperblock - minutes * 60);
     $('#b-esttimeperblock').html(minutes + " minutes " + seconds + " seconds"); // <- this needs some nicer format
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl
index 240c98b4..1d23a528 100644
--- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl
+++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl
@@ -22,7 +22,8 @@
           </div>
           <div class="col-xs-2 b-r">
             <i class="fa fa-sitemap fa-2x"></i>
-            <p id="b-nextdiff" class="h6 font-bold m-t">{$NETWORK.EstNextDifficulty|number_format:"8"} (Change in {$NETWORK.BlocksUntilDiffChange} Blocks)</p>
+            <p id="b-nextdiff" class="h6 font-bold m-t">{$NETWORK.EstNextDifficulty|number_format:"8"}</p>
+            <p id="b-nextdiffc" class="h6 font-bold m-t">Change in {$NETWORK.BlocksUntilDiffChange} Blocks</p>
             <p class="h6 text-muted">Est Next Difficulty</p>
           </div>
           <div class="col-xs-2 b-r">
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl
index 2c233030..8a23cab9 100644
--- a/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl
+++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl
@@ -2,24 +2,46 @@
         <thead>
           <tr>
             <th></th>
-            <th><span class="pull-right"><h5><i class="fa fa-user fa-fw"></i> Own<h5></th>
-            <th><span class="pull-right"><h5><i class="fa fa-users fa-fw"></i> Pool</h6></span></th>
+            <th><span><h5><i class="fa fa-user fa-fw"></i> Own<h5></th>
+            <th><span><h5><i class="fa fa-users fa-fw"></i> Pool</h6></span></th>
           </tr>
           <tr>
             <th><h5><i class="fa fa-smile-o fa-fw"></i> Valid</h6></th>
-            <th><span class="pull-right"><h5 id="b-yvalid">{$GLOBAL.userdata.shares.valid|number_format}</h5></span></th>
-            <th><span class="pull-right"><h5 id="b-pvalid">{$GLOBAL.roundshares.valid|number_format}</h5></span></th>
-            
+            <th>
+            <div class="progress progress-striped progress-fix">
+               <div id="b-yvalid" class="progress-bar progress-bar-info black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.userdata.shares.valid|number_format}" role="progressbar"></div>
+            </div>
+            </th>
+            <th>
+            <div class="progress progress-striped progress-fix">
+               <div id="b-pvalid" class="progress-bar progress-bar-info black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.roundshares.valid|number_format}" role="progressbar"></div>
+            </div>
+            </th>
           </tr>
           <tr>
             <th><h5><i class="fa fa-frown-o fa-fw"></i> Invalid</h6></th>
-            <th><span class="pull-right"><h5 id="b-yivalid">{$GLOBAL.userdata.shares.invalid|number_format}</h5></span></th>
-            <th><span class="pull-right"><h5 id="b-pivalid">{$GLOBAL.roundshares.invalid|number_format}</h5></span></th>
+            <th>
+            <div class="progress progress-striped progress-fix">
+               <div id="b-yivalid" class="progress-bar progress-bar-info black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.roundshares.invalid|number_format}" role="progressbar"></div>
+            </div>
+            </th>
+            <th>
+            <div class="progress progress-striped progress-fix">
+               <div id="b-pivalid" class="progress-bar progress-bar-info black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.roundshares.invalid|number_format}" role="progressbar"></div>
+            </div>
+            </th>
           </tr>
           <tr>
             <th><h5><i class="fa fa-bolt fa-fw"></i> Efficiency</h5></th>
-            <th><span class="pull-right"><h5 id="b-yefficiency">{if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}</h5></span></th>
-            <th><span class="pull-right"><h5 id="b-pefficiency">{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}</h5></span></th>
+            <th>
+            <div class="progress progress-striped active progress-fix">
+               <div id="b-yefficiency" class="progress-bar progress-bar-info black" style="width: {if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}" aria-valuemax="100" aria-valuemin="0" aria-valuenow="20" role="progressbar"></div>
+            </div>
+            </th>
+            <th>
+            <div class="progress progress-striped active progress-fix">
+               <div id="b-pefficiency" class="progress-bar progress-bar-info black" style="width:{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}" aria-valuemax="100" aria-valuemin="0" aria-valuenow="20" role="progressbar"></div>
+            </div>
           </tr>
         </thead>
       </table>