diff --git a/public/templates/bootstrap/dashboard/account_data.tpl b/public/templates/bootstrap/dashboard/account_data.tpl index 76f058b9..133ad245 100644 --- a/public/templates/bootstrap/dashboard/account_data.tpl +++ b/public/templates/bootstrap/dashboard/account_data.tpl @@ -1,55 +1,55 @@ -
-
-
-

Account Information

-
-
- - - - -
-{if $GLOBAL.userdata.no_fees} - You are mining without any pool fees applied and -{else if $GLOBAL.fees > 0} - You are mining at {if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}% pool fee and -{else} - This pool does not apply fees and -{/if} -{if $GLOBAL.userdata.donate_percent > 0} - you donate {$GLOBAL.userdata.donate_percent|escape}%. -{else} - you are not donating. -{/if} -
- - - - - - - - - - - - -
{$GLOBAL.config.currency} Account Balance
Confirmed{$GLOBAL.userdata.balance.confirmed|number_format:"6"}
Unconfirmed{$GLOBAL.userdata.balance.unconfirmed|number_format:"6"}
- {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} - - - - - - - - - - - - -
WorkerHashrateDifficulty
No worker information available
- {/if} +
+
+
+

Account Information

+
+
+ + + + +
+ {if $GLOBAL.userdata.no_fees} + You are mining without any pool fees applied and + {else if $GLOBAL.fees > 0} + You are mining at {if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}% pool fee and + {else} + This pool does not apply fees and + {/if} + {if $GLOBAL.userdata.donate_percent > 0} + you donate {$GLOBAL.userdata.donate_percent|escape}%. + {else} + you are not donating. + {/if} +
+ + + + + + + + + + + + +
{$GLOBAL.config.currency} Account Balance
Confirmed{$GLOBAL.userdata.balance.confirmed|number_format:"6"}
Unconfirmed{$GLOBAL.userdata.balance.unconfirmed|number_format:"6"}
+ {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} + + + + + + + + + + + + +
WorkerHashrateDifficulty
No worker information available
+ {/if} +
-
\ No newline at end of file diff --git a/public/templates/bootstrap/dashboard/default.tpl b/public/templates/bootstrap/dashboard/default.tpl index 3c736d31..d67039a4 100644 --- a/public/templates/bootstrap/dashboard/default.tpl +++ b/public/templates/bootstrap/dashboard/default.tpl @@ -2,6 +2,7 @@
{include file="dashboard/overview.tpl"} {include file="dashboard/system_stats.tpl"} + {include file="dashboard/account_data.tpl"}
{if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} {include file="dashboard/js_api.tpl"} diff --git a/public/templates/bootstrap/dashboard/js_api.tpl b/public/templates/bootstrap/dashboard/js_api.tpl index 07c9d31e..279034e4 100644 --- a/public/templates/bootstrap/dashboard/js_api.tpl +++ b/public/templates/bootstrap/dashboard/js_api.tpl @@ -9,10 +9,10 @@ $(document).ready(function(){ var url_balance = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getuserbalance&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}{literal}"; // Load initial sparkline values - var storedPersonalHashrate = [ 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"2"}{literal} ]; - var storedPersonalSharerate = [ 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.sharerate|number_format:"2"}{literal} ]; - var storedPoolHashrate = [ 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ]; - var storedPoolWorkers = [ 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{literal} ]; + var storedPersonalHashrate = [ 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"2"}{literal} ]; + var storedPersonalSharerate = [ 0, 0,0, 0, {/literal}{$GLOBAL.userdata.sharerate|number_format:"2"}{literal} ]; + var storedPoolHashrate = [ 0, 0,0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ]; + var storedPoolWorkers = [ 0, 0,0, 0, {/literal}{$GLOBAL.workers}{literal} ]; // Sparkline options applied to all graphs var sparklineOptions = { @@ -49,7 +49,7 @@ $(document).ready(function(){ // Refresh other static numbers on the template function refreshStaticData(data) { $('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8))); - $('#b-dworkers').html(data.getdashboarddata.data.pool.workers); + $('#b-poolworkers').html(data.getdashboarddata.data.pool.workers); $('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2))); $('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(2))); $('#b-sharerate').html((parseFloat(data.getdashboarddata.data.personal.sharerate).toFixed(2))); diff --git a/public/templates/bootstrap/dashboard/network_info.tpl b/public/templates/bootstrap/dashboard/network_info.tpl index 68019a10..64be721d 100644 --- a/public/templates/bootstrap/dashboard/network_info.tpl +++ b/public/templates/bootstrap/dashboard/network_info.tpl @@ -1,19 +1,15 @@ - Network Info + Network Info - Difficulty - {$NETWORK.difficulty|number_format:"8"} + Difficulty + {$NETWORK.difficulty|number_format:"8"} + Est Next Difficulty + {$NETWORK.EstNextDifficulty|number_format:"8"} (Change in {$NETWORK.BlocksUntilDiffChange} Blocks) - Est Next Difficulty - {$NETWORK.EstNextDifficulty|number_format:"8"} (Change in {$NETWORK.BlocksUntilDiffChange} Blocks) - - - Est. Avg. Time per Block - {$NETWORK.EstTimePerBlock|seconds_to_words} - - - Current Block - {$NETWORK.block} + Est. Avg. Time per Block + {$NETWORK.EstTimePerBlock|seconds_to_words} + Current Block + {$NETWORK.block} diff --git a/public/templates/bootstrap/dashboard/overview.tpl b/public/templates/bootstrap/dashboard/overview.tpl index d4645f94..13325d5d 100644 --- a/public/templates/bootstrap/dashboard/overview.tpl +++ b/public/templates/bootstrap/dashboard/overview.tpl @@ -1,22 +1,30 @@ -
+
-

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"|default:"0"}{/if} / Pool Workers: {$GLOBAL.workers}

+

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"|default:"0"}{/if}

-
My Hashrate {$GLOBAL.userdata.hashrate|number_format:"2"}  
-
-
My Sharerate {$GLOBAL.userdata.sharerate|number_format:"2"}  
-
-
Pool Hashrate {$GLOBAL.hashrate|number_format:"2"}  
-
-
Pool Workers {$GLOBAL.workers}  
+ + + + + + + + + + + + + + + + + +
My Hashrate{$GLOBAL.userdata.hashrate|number_format:"2"}My Sharerate{$GLOBAL.userdata.sharerate|number_format:"2"}
Pool Hashrate{$GLOBAL.hashrate|number_format:"2"}Pool Workers{$GLOBAL.workers}
Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.
-
- {include file="dashboard/account_data.tpl"} -
diff --git a/public/templates/bootstrap/dashboard/payout_estimates.tpl b/public/templates/bootstrap/dashboard/payout_estimates.tpl index 7e94ce84..d1dd7c01 100644 --- a/public/templates/bootstrap/dashboard/payout_estimates.tpl +++ b/public/templates/bootstrap/dashboard/payout_estimates.tpl @@ -1,43 +1,36 @@ - - {$GLOBAL.config.currency} Estimates + {$GLOBAL.config.currency} Estimates {if $GLOBAL.config.payout_system != 'pps'} - Block - {$GLOBAL.userdata.estimates.block|number_format:"8"} + Block + {$GLOBAL.userdata.estimates.block|number_format:"8"} + Fees + {$GLOBAL.userdata.estimates.fee|number_format:"8"} - Fees - {$GLOBAL.userdata.estimates.fee|number_format:"8"} - - - Donation - {$GLOBAL.userdata.estimates.donation|number_format:"8"} - - - Payout - {$GLOBAL.userdata.estimates.payout|number_format:"8"} + Donation + {$GLOBAL.userdata.estimates.donation|number_format:"8"} + Payout + {$GLOBAL.userdata.estimates.payout|number_format:"8"} {else} - in 1 hour - {$GLOBAL.userdata.estimates.hours1|number_format:"8"} + in 1 hour + {$GLOBAL.userdata.estimates.hours1|number_format:"8"} + in 24 hours + {($GLOBAL.userdata.estimates.hours24)|number_format:"8"} - in 24 hours - {($GLOBAL.userdata.estimates.hours24)|number_format:"8"} + in 7 days + {($GLOBAL.userdata.estimates.days7)|number_format:"8"} + in 14 days + {($GLOBAL.userdata.estimates.days14)|number_format:"8"} + {/if} diff --git a/public/templates/bootstrap/dashboard/round_data.tpl b/public/templates/bootstrap/dashboard/round_data.tpl deleted file mode 100644 index 56475323..00000000 --- a/public/templates/bootstrap/dashboard/round_data.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
-
-
-

Round Information

-
-
-
-
-
-
\ No newline at end of file diff --git a/public/templates/bootstrap/dashboard/round_shares.tpl b/public/templates/bootstrap/dashboard/round_shares.tpl index 8386345d..4c93708e 100644 --- a/public/templates/bootstrap/dashboard/round_shares.tpl +++ b/public/templates/bootstrap/dashboard/round_shares.tpl @@ -1,23 +1,19 @@ - Round Shares + Round Shares - Est. Shares - {$ESTIMATES.shares|number_format} (done: {$ESTIMATES.percent}%) + Est. Shares + {$ESTIMATES.shares|number_format} (done: {$ESTIMATES.percent}%) - Pool Valid - {$GLOBAL.roundshares.valid|number_format} + Pool Valid + {$GLOBAL.roundshares.valid|number_format} + Your Valid + {$GLOBAL.userdata.shares.valid|number_format} - Your Valid - {$GLOBAL.userdata.shares.valid|number_format} - - - Pool Invalid - {$GLOBAL.roundshares.invalid|number_format} {if $GLOBAL.roundshares.valid > 0}({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){else}(0.00%){/if} - - - Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format} {if $GLOBAL.userdata.shares.valid > 0}({($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100)|number_format:"2"}%){else}(0.00%){/if} + Pool Invalid + {$GLOBAL.roundshares.invalid|number_format} {if $GLOBAL.roundshares.valid > 0}({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){else}(0.00%){/if} + Your Invalid + {$GLOBAL.userdata.shares.invalid|number_format} {if $GLOBAL.userdata.shares.valid > 0}({($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100)|number_format:"2"}%){else}(0.00%){/if} diff --git a/public/templates/bootstrap/dashboard/system_stats.tpl b/public/templates/bootstrap/dashboard/system_stats.tpl index 35a68bf7..e385ae7e 100644 --- a/public/templates/bootstrap/dashboard/system_stats.tpl +++ b/public/templates/bootstrap/dashboard/system_stats.tpl @@ -1,39 +1,39 @@ -
-
-
-

{$GLOBAL.config.payout_system|capitalize} Stats

-
-
- - -{if $GLOBAL.config.payout_system == 'pplns'} - - - - -{elseif $GLOBAL.config.payout_system == 'pps'} - - - - - - - - - - - - - - - - -{/if} - {include file="dashboard/round_shares.tpl"} - {include file="dashboard/payout_estimates.tpl"} - {include file="dashboard/network_info.tpl"} - -
PPLNS Target{$GLOBAL.pplns.target}
Unpaid Shares{$GLOBAL.userdata.pps.unpaidshares}
Baseline PPS Rate{$GLOBAL.ppsvalue|number_format:"12"} {$GLOBAL.config.currency}
Pools PPS Rate{$GLOBAL.poolppsvalue|number_format:"12"} {$GLOBAL.config.currency}
PPS Difficulty{$GLOBAL.userdata.sharedifficulty|number_format:"2"}
+
+
+
+

Round Statistics

+
+
+ + + {if $GLOBAL.config.payout_system == 'pplns'} + + + + + {elseif $GLOBAL.config.payout_system == 'pps'} + + + + + + + + + + + + + + + + + {/if} + {include file="dashboard/round_shares.tpl"} + {include file="dashboard/payout_estimates.tpl"} + {include file="dashboard/network_info.tpl"} + +
PPLNS Target{$GLOBAL.pplns.target}
Unpaid Shares{$GLOBAL.userdata.pps.unpaidshares}
Baseline PPS Rate{$GLOBAL.ppsvalue|number_format:"12"} {$GLOBAL.config.currency}
Pools PPS Rate{$GLOBAL.poolppsvalue|number_format:"12"} {$GLOBAL.config.currency}
PPS Difficulty{$GLOBAL.userdata.sharedifficulty|number_format:"2"}
+
-
\ No newline at end of file