From fd5591fbc4784a49ab3712d1bdac5fc055a480af Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 00:09:37 -0700 Subject: [PATCH] New Test Setout --- public/site_assets/bootstrap/css/mpos.css | 58 ++++++++++ .../dashboard/overview/_with_price_graph.tpl | 100 +++++++++++++++--- .../bootstrap/dashboard/overview/default.tpl | 2 +- .../statistics/pool/contributors_hashrate.tpl | 4 +- .../statistics/pool/contributors_shares.tpl | 4 +- 5 files changed, 146 insertions(+), 22 deletions(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 1739d8cb..96422900 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -409,3 +409,61 @@ span.spark-18 { span.spark-25 { margin: -25%; } + +/* Test Edit */ + +.circle-tile { + margin-bottom: 30px; +} + +.circle-tile { + margin-bottom: 15px; + text-align: center; +} + +.circle-tile-content { + padding-top: 50px; + border-radius: 8px; + border: 3px solid rgba(255, 255, 255, 0.3); +} + +.circle-tile-description { + font-weight: bold; + font-size: 16px; +} + +.circle-tile-number { + padding: 0px 1px 4px; +} + +.circle-tile-heading { + position: relative; + width: 80px; + height: 80px; + margin: 0px auto -40px; + border: 3px solid rgba(255, 255, 255, 0.3); + border-radius: 100%; + color: #FFF; + transition: all 0.3s ease-in-out 0s; +} + +.circle-tile-heading .fa { + line-height: 80px; +} + +.blue { + background-color: #428BCA; +} + +.text-faded { + color: rgba(255, 255, 255, 0.7); +} + +p.up { + margin: -14px 0px 0px 0px; +} + +div.up { + margin: -10px 0px 6px 0px; +} +/* End Test */ diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl index cda1bc1c..accaceab 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -1,37 +1,103 @@ -
-

My Hashrate

+
+
+
+ +
+
+
+

My Hashrate

+
{$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal}
+
+
+
+
-
-

My Sharerate

- {$GLOBAL.userdata.sharerate|number_format:"2"} S/s -
- -
-
-

Pool Hashrate

+
+
+
+ +
+
+
+

Pool Hashrate

+
+
{$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool}
+
+
+
-
-

Pool Workers

+
+
+
+ +
+
+
+

My Sharerate

+
+
+ {$GLOBAL.userdata.sharerate|number_format:"2"} S/s +
+ +
+
+
+
+
+
+
+ +
+
+
+

Pool Workers

+
+
{$GLOBAL.workers}
+
+
+
-
-

Net Hashrate

+
+
+
+ +
+
+
+

Net Hashrate

+
+
{$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network}
+
+
+
-
-

{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}

- {$GLOBAL.price|default:"0"|number_format:"8"} +
+
+
+ +
+
+
+

{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}

+
+
+ {$GLOBAL.price|default:"0"|number_format:"8"}
+
+
+
diff --git a/public/templates/bootstrap/dashboard/overview/default.tpl b/public/templates/bootstrap/dashboard/overview/default.tpl index de533cc7..94652aad 100644 --- a/public/templates/bootstrap/dashboard/overview/default.tpl +++ b/public/templates/bootstrap/dashboard/overview/default.tpl @@ -6,7 +6,7 @@
-
+
{* Depending on the price option we need to load a different template so it aligns properly *} {if $GLOBAL.config.price.enabled} {include file="dashboard/overview/_with_price_graph.tpl"} diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl index 354f3925..bb49912e 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl @@ -22,7 +22,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if} {$rank++} {if $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" > 0}{else}{/if} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} @@ -35,7 +35,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.rawhashrate|default:"0" > 0} {math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate} - + n/a {if $GLOBAL.userdata.donate_percent|default:"0" >= 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}{else}{/if} {$GLOBAL.userdata.username|escape} diff --git a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl index e2c9432f..06661e03 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl @@ -17,7 +17,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1}{else}{/if} {$rank++} {if $CONTRIBSHARES[shares].donate_percent|default:"0" >= 2}{else if $CONTRIBSHARES[shares].donate_percent|default:"0" < 2 AND $CONTRIBSHARES[shares].donate_percent|default:"0" > 0}{else}{/if} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} @@ -25,7 +25,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0} - + n/a {if $GLOBAL.userdata.donate_percent|default:"0" >= 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}{else}{/if} {$GLOBAL.userdata.username|escape}