Skip to content

Commit 8cff8fe

Browse files
iAmShortyiAmShorty
committed
- changed dashboard layout
- added shares to overview
1 parent e3dcc72 commit 8cff8fe

File tree

6 files changed

+200
-215
lines changed

6 files changed

+200
-215
lines changed

‎public/site_assets/bluemoon/css/new.css‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,26 @@ ul.appointments {
13541354
top: 2px;
13551355
display: none; }
13561356

1357+
1358+
1359+
1360+
.mini-widget-orange .mini-widget-heading {
1361+
background: #FAB20A;
1362+
color: black; }
1363+
.mini-widget-orange .mini-widget-heading .pull-right {
1364+
color: white; }
1365+
.mini-widget-orange .mini-widget-body {
1366+
background: #EBAD1C; }
1367+
.mini-widget-orange .mini-widget-body i {
1368+
color: #FCCD60; }
1369+
.mini-widget-orange .mini-widget-body .number {
1370+
color: white; }
1371+
.mini-widget-orange .mini-widget-footer {
1372+
color: white;
1373+
background: #CC930E; }
1374+
1375+
1376+
13571377
.mini-widget-yellow .mini-widget-heading {
13581378
background: #ffff00;
13591379
color: black; }

‎templates/bluemoon/dashboard/account_data/_workers.tpl‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎templates/bluemoon/dashboard/default.tpl‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,22 @@
1818
<div class="col-lg-12">
1919
{* Load our payout system so we can load some payout specific templates *}
2020
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
21-
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"}
22-
{include file="dashboard/blocks/default.tpl"}
23-
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"}
21+
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"}
2422
{if !$DISABLED_API}
25-
{include file="dashboard/worker_information/default.tpl"}
23+
<div class="row">
24+
<div class="col-lg-8">
25+
{include file="dashboard/blocks/default.tpl"}
26+
</div>
27+
<div class="col-lg-4">
28+
{include file="dashboard/worker_information/default.tpl"}
29+
</div>
30+
</div>
31+
{else}
32+
<div class="row">
33+
<div class="col-lg-12">
34+
{include file="dashboard/blocks/default.tpl"}
35+
</div>
36+
</div>
2637
{/if}
2738
</div>
2839
</div>

templates/bluemoon/dashboard/round_statistics/prop/round.tpl renamed to templates/bluemoon/dashboard/round_statistics/prop/default.tpl

Lines changed: 143 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,144 @@
1-
<div class="row">
2-
<div class="col-lg-2 col-md-2 col-sm-4">
3-
<div class="mini-widget">
4-
<div class="mini-widget-heading clearfix">
5-
<div class="pull-left">Current Block</div>
6-
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
7-
</div>
8-
<div class="mini-widget-body clearfix">
9-
<div class="pull-left"><i class="fa fa-th-large"></i></div>
10-
<div class="pull-right number"><p class="h5" id="b-nblock">{$NETWORK.block}</p></div>
11-
</div>
12-
<div class="mini-widget-footer center-align-text">
13-
<span class="small">Better than last week</span>
14-
</div>
15-
</div>
16-
</div>
17-
18-
<div class="col-lg-2 col-md-2 col-sm-4">
19-
<div class="mini-widget">
20-
<div class="mini-widget-heading clearfix">
21-
<div class="pull-left">Difficulty</div>
22-
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
23-
</div>
24-
<div class="mini-widget-body clearfix">
25-
<div class="pull-left"><i class="fa fa-map-marker"></i></div>
26-
<div class="pull-right number"><p class="h5" id="b-diff">{$NETWORK.difficulty|number_format:"8"}</p></div>
27-
</div>
28-
<div class="mini-widget-footer center-align-text">
29-
<span class="small">Better than last week</span>
30-
</div>
31-
</div>
32-
</div>
33-
34-
<div class="col-lg-2 col-md-2 col-sm-4">
35-
<div class="mini-widget">
36-
<div class="mini-widget-heading clearfix">
37-
<div class="pull-left">Est. Next Difficulty</div>
38-
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
39-
</div>
40-
<div class="mini-widget-body clearfix">
41-
<div class="pull-left"><i class="fa fa-sitemap"></i></div>
42-
<div class="pull-right number"><p class="h5" id="b-nextdiff">{if $GLOBAL.nethashrate > 0}{$NETWORK.EstNextDifficulty|number_format:"8"}{else}n/a{/if}</p></div>
43-
</div>
44-
<div class="mini-widget-footer center-align-text">
45-
<span class="small">{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span>
46-
</div>
47-
</div>
48-
</div>
49-
50-
<div class="col-lg-2 col-md-2 col-sm-4">
51-
<div id="widgetblockpercent" class="mini-widget {if $ESTIMATES.percent|number_format:"2" <= 100}mini-widget-green{else}mini-widget-red{/if}">
52-
<div class="mini-widget-heading clearfix">
53-
<div class="pull-left">Of Expected Shares</div>
54-
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
55-
</div>
56-
<div class="mini-widget-body clearfix">
57-
<div class="pull-left"><i class="fa fa-bar-chart"></i></div>
58-
<div class="pull-right number"><p class="h5" id="b-roundprogress">{$ESTIMATES.percent|number_format:"2"} %</p></div>
59-
</div>
60-
<div class="mini-widget-footer center-align-text">
61-
<span class="small">Difficulty{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span>
62-
</div>
63-
</div>
64-
</div>
65-
66-
<div class="col-lg-2 col-md-2 col-sm-4">
67-
<div id="widgetblocktime" class="mini-widget {if $NETWORK.EstTimePerBlock > $LASTBLOCKTIME}mini-widget-green{else}mini-widget-red{/if}">
68-
<div class="mini-widget-heading clearfix">
69-
<div class="pull-left">Est. Avg. Time per Block</div>
70-
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
71-
</div>
72-
<div class="mini-widget-body clearfix">
73-
<div class="pull-left"><i class="fa fa-clock-o"></i></div>
74-
<div class="pull-right number"><p class="h5" id="b-esttimeperblock">{$NETWORK.EstTimePerBlock|seconds_to_hhmmss}</p></div>
75-
</div>
76-
<div class="mini-widget-footer center-align-text">
77-
<span class="small">Last Block found <span id="b-timesincelastblock">{$LASTBLOCKTIME|seconds_to_hhmmss}</span> ago</span>
78-
</div>
79-
</div>
80-
</div>
81-
82-
<div class="col-lg-2 col-md-2 col-sm-4">
83-
<div class="mini-widget mini-widget-grey">
84-
<div class="mini-widget-heading clearfix">
85-
<div class="pull-left">{$GLOBAL.config.currency} Est. Earnings</div>
86-
{if $GLOBAL.fees > 0}
87-
<div class="pull-right">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}<sup>%</sup></div>
88-
{/if}
89-
</div>
90-
<div class="mini-widget-body clearfix">
91-
<div class="pull-left"><i class="fa fa-money"></i></div>
92-
<div class="pull-right number"><p class="h5" id="b-payout">{$GLOBAL.userdata.estimates.payout|number_format:$PRECISION}</p></div>
93-
</div>
94-
<div class="mini-widget-footer center-align-text">
95-
<span class="small">
96-
{if $GLOBAL.userdata.no_fees}
97-
No pool fee and
98-
{else if $GLOBAL.fees > 0}
99-
<font color="orange">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}%</font> pool fee and
100-
{else}
101-
No pool fee and
102-
{/if}
103-
{if $GLOBAL.userdata.donate_percent > 0}
104-
<font color="green">{$GLOBAL.userdata.donate_percent|escape}%</font> donation.
105-
{else}
106-
no <a href="{$smarty.server.SCRIPT_NAME}?page=account&action=edit">donation</a>.
107-
{/if}
108-
</span>
109-
</div>
110-
</div>
111-
</div>
1+
<div class="row">
2+
<div class="col-lg-3 col-md-3 col-sm-6">
3+
<div class="mini-widget">
4+
<div class="mini-widget-heading clearfix">
5+
<div class="pull-left">Current Block</div>
6+
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
7+
</div>
8+
<div class="mini-widget-body clearfix">
9+
<div class="pull-left"><i class="fa fa-th-large"></i></div>
10+
<div class="pull-right number"><p class="h3" id="b-nblock">{$NETWORK.block}</p></div>
11+
</div>
12+
<div class="mini-widget-footer center-align-text">
13+
<span class="small">&nbsp;</span>
14+
</div>
15+
</div>
16+
</div>
17+
<div class="col-lg-3 col-md-3 col-sm-6">
18+
<div class="mini-widget">
19+
<div class="mini-widget-heading clearfix">
20+
<div class="pull-left">Difficulty</div>
21+
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
22+
</div>
23+
<div class="mini-widget-body clearfix">
24+
<div class="pull-left"><i class="fa fa-map-marker"></i></div>
25+
<div class="pull-right number"><p class="h3" id="b-diff">{$NETWORK.difficulty|number_format:"8"}</p></div>
26+
</div>
27+
<div class="mini-widget-footer center-align-text">
28+
<span class="small">&nbsp;</span>
29+
</div>
30+
</div>
31+
</div>
32+
<div class="col-lg-3 col-md-3 col-sm-6">
33+
<div class="mini-widget">
34+
<div class="mini-widget-heading clearfix">
35+
<div class="pull-left">Est. Next Difficulty</div>
36+
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
37+
</div>
38+
<div class="mini-widget-body clearfix">
39+
<div class="pull-left"><i class="fa fa-sitemap"></i></div>
40+
<div class="pull-right number"><p class="h3" id="b-nextdiff">{if $GLOBAL.nethashrate > 0}{$NETWORK.EstNextDifficulty|number_format:"8"}{else}n/a{/if}</p></div>
41+
</div>
42+
<div class="mini-widget-footer center-align-text">
43+
<span class="small">{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span>
44+
</div>
45+
</div>
46+
</div>
47+
<div class="col-lg-3 col-md-3 col-sm-6">
48+
<div class="mini-widget mini-widget-grey">
49+
<div class="mini-widget-heading clearfix">
50+
<div class="pull-left">{$GLOBAL.config.currency} Est. Earnings</div>
51+
{if $GLOBAL.fees > 0}
52+
<div class="pull-right">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}<sup>%</sup></div>
53+
{/if}
54+
</div>
55+
<div class="mini-widget-body clearfix">
56+
<div class="pull-left"><i class="fa fa-money"></i></div>
57+
<div class="pull-right number"><p class="h3" id="b-payout">{$GLOBAL.userdata.estimates.payout|number_format:$PRECISION}</p></div>
58+
</div>
59+
<div class="mini-widget-footer center-align-text">
60+
<span class="small">
61+
{if $GLOBAL.userdata.no_fees}
62+
No pool fee and
63+
{else if $GLOBAL.fees > 0}
64+
<font color="orange">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}%</font> pool fee and
65+
{else}
66+
No pool fee and
67+
{/if}
68+
{if $GLOBAL.userdata.donate_percent > 0}
69+
<font color="green">{$GLOBAL.userdata.donate_percent|escape}%</font> donation
70+
{else}
71+
no <a href="{$smarty.server.SCRIPT_NAME}?page=account&action=edit">donation</a>
72+
{/if}
73+
</span>
74+
</div>
75+
</div>
76+
</div>
77+
<div class="col-lg-3 col-md-3 col-sm-6">
78+
<div id="widgetblockpercent" class="mini-widget {if $ESTIMATES.percent|number_format:"2" <= 100}mini-widget-green{else}mini-widget-red{/if}">
79+
<div class="mini-widget-heading clearfix">
80+
<div class="pull-left">Of Expected Shares</div>
81+
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
82+
</div>
83+
<div class="mini-widget-body clearfix">
84+
<div class="pull-left"><i class="fa fa-bar-chart"></i></div>
85+
<div class="pull-right number"><p class="h3" id="b-roundprogress">{$ESTIMATES.percent|number_format:"2"} %</p></div>
86+
</div>
87+
<div class="mini-widget-footer center-align-text">
88+
<span class="small">Difficulty{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span>
89+
</div>
90+
</div>
91+
</div>
92+
<div class="col-lg-3 col-md-3 col-sm-6">
93+
<div id="widgetblocktime" class="mini-widget {if $NETWORK.EstTimePerBlock > $LASTBLOCKTIME}mini-widget-green{else}mini-widget-red{/if}">
94+
<div class="mini-widget-heading clearfix">
95+
<div class="pull-left">Est. Avg. Time per Block</div>
96+
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
97+
</div>
98+
<div class="mini-widget-body clearfix">
99+
<div class="pull-left"><i class="fa fa-clock-o"></i></div>
100+
<div class="pull-right number"><p class="h3" id="b-esttimeperblock">{$NETWORK.EstTimePerBlock|seconds_to_hhmmss}</p></div>
101+
</div>
102+
<div class="mini-widget-footer center-align-text">
103+
<span class="small">Last Block found <span id="b-timesincelastblock">{$LASTBLOCKTIME|seconds_to_hhmmss}</span> ago</span>
104+
</div>
105+
</div>
106+
</div>
107+
108+
109+
110+
111+
<div class="col-lg-3 col-md-3 col-sm-6">
112+
<div id="ownshares" class="mini-widget mini-widget-orange">
113+
<div class="mini-widget-heading clearfix">
114+
<div class="pull-left">valid Shares (Own)</div>
115+
<div class="pull-right">{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}<sup>%</sup></div>
116+
</div>
117+
<div class="mini-widget-body clearfix">
118+
<div class="pull-left"><i class="fa fa-cloud"></i></div>
119+
<div class="pull-right number"><p class="h3" id="b-yvalid">valid: {$GLOBAL.userdata.shares.valid|number_format:$GLOBAL.config.sharediffprecision}</p></div>
120+
</div>
121+
<div class="mini-widget-footer center-align-text">
122+
<span class="small">Invalid Shares: {$GLOBAL.userdata.shares.invalid|number_format:$GLOBAL.config.sharediffprecision}</span>
123+
</div>
124+
</div>
125+
</div>
126+
127+
128+
<div class="col-lg-3 col-md-3 col-sm-6">
129+
<div id="poolshares" class="mini-widget mini-widget-orange">
130+
<div class="mini-widget-heading clearfix">
131+
<div class="pull-left">valid Shares (Pool)</div>
132+
<div class="pull-right">{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}{else}0.00{/if}<sup>%</sup></div>
133+
</div>
134+
<div class="mini-widget-body clearfix">
135+
<div class="pull-left"><i class="fa fa-cloud"></i></div>
136+
<div class="pull-right number"><p class="h3" id="b-pvalid">{$GLOBAL.roundshares.valid|number_format:$GLOBAL.config.sharediffprecision}</p></div>
137+
</div>
138+
<div class="mini-widget-footer center-align-text">
139+
<span class="small">Invalid shares: {$GLOBAL.roundshares.invalid|number_format:$GLOBAL.config.sharediffprecision}</span>
140+
</div>
141+
</div>
142+
</div>
143+
112144
</div>

0 commit comments

Comments
 (0)