From 8cff8fe2f26590cb57b769a51fb9400463c99f98 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 6 Jul 2016 15:49:30 +0200 Subject: [PATCH] - changed dashboard layout - added shares to overview --- public/site_assets/bluemoon/css/new.css | 20 ++ .../dashboard/account_data/_workers.tpl | 15 -- templates/bluemoon/dashboard/default.tpl | 19 +- .../prop/{round.tpl => default.tpl} | 254 ++++++++++-------- .../round_statistics/prop/shares.tpl | 61 ----- .../dashboard/worker_information/default.tpl | 46 ++-- 6 files changed, 200 insertions(+), 215 deletions(-) delete mode 100644 templates/bluemoon/dashboard/account_data/_workers.tpl rename templates/bluemoon/dashboard/round_statistics/prop/{round.tpl => default.tpl} (61%) delete mode 100644 templates/bluemoon/dashboard/round_statistics/prop/shares.tpl diff --git a/public/site_assets/bluemoon/css/new.css b/public/site_assets/bluemoon/css/new.css index 33470274..32e33e3d 100644 --- a/public/site_assets/bluemoon/css/new.css +++ b/public/site_assets/bluemoon/css/new.css @@ -1354,6 +1354,26 @@ ul.appointments { top: 2px; display: none; } + + + +.mini-widget-orange .mini-widget-heading { + background: #FAB20A; + color: black; } + .mini-widget-orange .mini-widget-heading .pull-right { + color: white; } +.mini-widget-orange .mini-widget-body { + background: #EBAD1C; } + .mini-widget-orange .mini-widget-body i { + color: #FCCD60; } + .mini-widget-orange .mini-widget-body .number { + color: white; } +.mini-widget-orange .mini-widget-footer { + color: white; + background: #CC930E; } + + + .mini-widget-yellow .mini-widget-heading { background: #ffff00; color: black; } diff --git a/templates/bluemoon/dashboard/account_data/_workers.tpl b/templates/bluemoon/dashboard/account_data/_workers.tpl deleted file mode 100644 index 4e3887d1..00000000 --- a/templates/bluemoon/dashboard/account_data/_workers.tpl +++ /dev/null @@ -1,15 +0,0 @@ - {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} - - - - - - - - - - - - -
WorkerHashrateDifficulty
No worker information available
- {/if} diff --git a/templates/bluemoon/dashboard/default.tpl b/templates/bluemoon/dashboard/default.tpl index 98079e8c..b993cf2c 100644 --- a/templates/bluemoon/dashboard/default.tpl +++ b/templates/bluemoon/dashboard/default.tpl @@ -18,11 +18,22 @@
{* Load our payout system so we can load some payout specific templates *} {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} - {include file="dashboard/blocks/default.tpl"} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"} {if !$DISABLED_API} - {include file="dashboard/worker_information/default.tpl"} +
+
+ {include file="dashboard/blocks/default.tpl"} +
+
+ {include file="dashboard/worker_information/default.tpl"} +
+
+ {else} +
+
+ {include file="dashboard/blocks/default.tpl"} +
+
{/if}
diff --git a/templates/bluemoon/dashboard/round_statistics/prop/round.tpl b/templates/bluemoon/dashboard/round_statistics/prop/default.tpl similarity index 61% rename from templates/bluemoon/dashboard/round_statistics/prop/round.tpl rename to templates/bluemoon/dashboard/round_statistics/prop/default.tpl index 82ccb74e..2519ec8f 100644 --- a/templates/bluemoon/dashboard/round_statistics/prop/round.tpl +++ b/templates/bluemoon/dashboard/round_statistics/prop/default.tpl @@ -1,112 +1,144 @@ -
-
-
-
-
Current Block
- -
-
-
-

{$NETWORK.block}

-
-
- Better than last week -
-
-
- -
-
-
-
Difficulty
- -
-
-
-

{$NETWORK.difficulty|number_format:"8"}

-
-
- Better than last week -
-
-
- -
-
-
-
Est. Next Difficulty
- -
-
-
-

{if $GLOBAL.nethashrate > 0}{$NETWORK.EstNextDifficulty|number_format:"8"}{else}n/a{/if}

-
-
- {if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if} -
-
-
- -
-
-
-
Of Expected Shares
- -
-
-
-

{$ESTIMATES.percent|number_format:"2"} %

-
-
- Difficulty{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if} -
-
-
- -
-
-
-
Est. Avg. Time per Block
- -
-
-
-

{$NETWORK.EstTimePerBlock|seconds_to_hhmmss}

-
-
- Last Block found {$LASTBLOCKTIME|seconds_to_hhmmss} ago -
-
-
- -
-
-
-
{$GLOBAL.config.currency} Est. Earnings
- {if $GLOBAL.fees > 0} -
{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}%
- {/if} -
-
-
-

{$GLOBAL.userdata.estimates.payout|number_format:$PRECISION}

-
-
- - {if $GLOBAL.userdata.no_fees} - No pool fee and - {else if $GLOBAL.fees > 0} - {if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}% pool fee and - {else} - No pool fee and - {/if} - {if $GLOBAL.userdata.donate_percent > 0} - {$GLOBAL.userdata.donate_percent|escape}% donation. - {else} - no donation. - {/if} - -
-
-
+
+
+
+
+
Current Block
+ +
+
+
+

{$NETWORK.block}

+
+
+   +
+
+
+
+
+
+
Difficulty
+ +
+
+
+

{$NETWORK.difficulty|number_format:"8"}

+
+
+   +
+
+
+
+
+
+
Est. Next Difficulty
+ +
+
+
+

{if $GLOBAL.nethashrate > 0}{$NETWORK.EstNextDifficulty|number_format:"8"}{else}n/a{/if}

+
+
+ {if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if} +
+
+
+
+
+
+
{$GLOBAL.config.currency} Est. Earnings
+ {if $GLOBAL.fees > 0} +
{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}%
+ {/if} +
+
+
+

{$GLOBAL.userdata.estimates.payout|number_format:$PRECISION}

+
+
+ + {if $GLOBAL.userdata.no_fees} + No pool fee and + {else if $GLOBAL.fees > 0} + {if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}% pool fee and + {else} + No pool fee and + {/if} + {if $GLOBAL.userdata.donate_percent > 0} + {$GLOBAL.userdata.donate_percent|escape}% donation + {else} + no donation + {/if} + +
+
+
+
+
+
+
Of Expected Shares
+ +
+
+
+

{$ESTIMATES.percent|number_format:"2"} %

+
+
+ Difficulty{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if} +
+
+
+
+
+
+
Est. Avg. Time per Block
+ +
+
+
+

{$NETWORK.EstTimePerBlock|seconds_to_hhmmss}

+
+
+ Last Block found {$LASTBLOCKTIME|seconds_to_hhmmss} ago +
+
+
+ + + + +
+
+
+
valid Shares (Own)
+
{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}%
+
+
+
+

valid: {$GLOBAL.userdata.shares.valid|number_format:$GLOBAL.config.sharediffprecision}

+
+
+ Invalid Shares: {$GLOBAL.userdata.shares.invalid|number_format:$GLOBAL.config.sharediffprecision} +
+
+
+ + +
+
+
+
valid Shares (Pool)
+
{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}{else}0.00{/if}%
+
+
+
+

{$GLOBAL.roundshares.valid|number_format:$GLOBAL.config.sharediffprecision}

+
+
+ Invalid shares: {$GLOBAL.roundshares.invalid|number_format:$GLOBAL.config.sharediffprecision} +
+
+
+
\ No newline at end of file diff --git a/templates/bluemoon/dashboard/round_statistics/prop/shares.tpl b/templates/bluemoon/dashboard/round_statistics/prop/shares.tpl deleted file mode 100644 index 3540d9da..00000000 --- a/templates/bluemoon/dashboard/round_statistics/prop/shares.tpl +++ /dev/null @@ -1,61 +0,0 @@ -
-
-
-
- Share Information -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - -
Own
Pool
Valid
 -
-
{$GLOBAL.userdata.shares.valid|number_format:$GLOBAL.config.sharediffprecision}
-
- 		-
-
{$GLOBAL.roundshares.valid|number_format:$GLOBAL.config.sharediffprecision}
-
-
Invalid
 -
-
{$GLOBAL.userdata.shares.invalid|number_format:$GLOBAL.config.sharediffprecision}
-
- 		-
-
{$GLOBAL.roundshares.invalid|number_format:$GLOBAL.config.sharediffprecision}
-
-
Efficiency
 -
-
{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}
-
- 		-
-
{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}
-
-
-
-
-
diff --git a/templates/bluemoon/dashboard/worker_information/default.tpl b/templates/bluemoon/dashboard/worker_information/default.tpl index 93bf34b0..78b16210 100644 --- a/templates/bluemoon/dashboard/worker_information/default.tpl +++ b/templates/bluemoon/dashboard/worker_information/default.tpl @@ -1,29 +1,27 @@ {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} -
-
-
-
- Worker Information -
- - - +
+
+
+ Worker Information
-
-
- - - - - - - - - - - -
WorkerHashrateDifficulty
No worker information available
-
+ + + +
+
+
+ + + + + + + + + + + +
WorkerHashrateDifficulty
No worker information available