From 02c70740ed43bf7c72c6f4d84c0c441d8389f882 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 01:12:22 -0700 Subject: [PATCH 01/10] New Test Setout Round Props --- .../round_statistics/pplns/default.tpl | 22 ---- .../dashboard/round_statistics/prop/round.tpl | 114 +++++++++++++----- 2 files changed, 87 insertions(+), 49 deletions(-) delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl deleted file mode 100644 index d5c4927a..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl +++ /dev/null @@ -1,22 +0,0 @@ -
-
-
-

- Round Information -

-
- {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} -
-
-
-
-
-

- Share Information -

-
- {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} -
-
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl index 4b694e61..ee942095 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl @@ -1,35 +1,95 @@
-
-
- -

{$NETWORK.block}

-

Current Block

+
+
+
+
+ +
+
+
+

{$NETWORK.block}

+
+
+

Current Block

+
+
+
-
- -

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

-

Of Expected Shares

+
+
+
+ +
+
+
+

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

+
+
+

Of Expected Shares

+
+
+
-
- -

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
+ +
+
+
+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+
+
+

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
-
- -

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

-

Difficulty

+
+
+
+ +
+
+
+

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

+
+
+

Difficulty

+
+
+
-
- -

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

-

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

-

Est Next Difficulty

-
-
- -

{$NETWORK.EstTimePerBlock|seconds_to_words}

-

Est. Avg. Time per Block

+
+
+
+ +
+
+
+

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

+

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

+
+
+

Est Next Difficulty

+
+
+
+
+
+
+
+ +
+
+
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

+
+
+

Est. Avg. Time per Block

+
+
+
From 3e6854095e989d799650c75f7d4f818a95c0c7c5 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 01:12:59 -0700 Subject: [PATCH 02/10] New Test Setout Round Props --- .../round_statistics/pplns/default.tpl | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl new file mode 100644 index 00000000..aae9fb2c --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl @@ -0,0 +1,22 @@ +
+
+
+

+ Round Information +

+
+{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} +{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} +
+
+
+
+
+

+ Share Information +

+
+{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} +{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} +
+
From f0e0bf27a9ecfd309393a352bdfc5cdd475d2adc Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 02:03:32 -0700 Subject: [PATCH 03/10] [UPDATE] Overview Icons --- .../dashboard/overview/_with_price_graph.tpl | 157 +++++++++--------- .../round_statistics/pplns/default.tpl | 44 ++--- 2 files changed, 100 insertions(+), 101 deletions(-) diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl index accaceab..97dd578a 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -1,103 +1,102 @@
-
- -
-
-
-

My Hashrate

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

My Hashrate

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

Pool Hashrate

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

Pool Hashrate

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

My Sharerate

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

My Sharerate

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

Pool Workers

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

Pool Workers

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

Net Hashrate

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

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/round_statistics/pplns/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl index aae9fb2c..d5c4927a 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl @@ -1,22 +1,22 @@ -
-
-
-

- Round Information -

-
-{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} -{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} -
-
-
-
-
-

- Share Information -

-
-{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} -{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} -
-
+
+
+
+

+ Round Information +

+
+ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} +
+
+
+
+
+

+ Share Information +

+
+ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} +
+
From 7350178f48c421577b779251f05fe6f03ffb01e2 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 02:21:07 -0700 Subject: [PATCH 04/10] [UPDATE] Pool Info Without Price --- .../overview/_without_price_graph.tpl | 106 +++++++++++++----- 1 file changed, 80 insertions(+), 26 deletions(-) diff --git a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl index 806dbbf7..a72e481e 100644 --- a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl @@ -1,31 +1,85 @@ -
-

My Hashrate

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

My Hashrate

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

My Sharerate

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

Pool Hashrate

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

Pool Hashrate

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

My Sharerate

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

Pool Workers

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

Pool Workers

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

Net Hashrate

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

Net Hashrate

+
+ {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} +
+ +
+
+
+
- From cddb929e22b23ac9f8ebfb136c022af6ea7fb05d Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 02:39:40 -0700 Subject: [PATCH 05/10] [FIX] HTML Fixes --- .../round_statistics/pplns/round.tpl | 134 ++++++++--------- .../dashboard/round_statistics/prop/round.tpl | 136 +++++++++--------- 2 files changed, 135 insertions(+), 135 deletions(-) diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl index 3c3bb2e2..893d8695 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -2,93 +2,93 @@
-
- -
-
-
-

{$NETWORK.block}

-
-
-

Current Block

-
-
+
+ +
+
+
+

{$NETWORK.block}

+
+
+

Current Block

+
+
-
- -
-
-
-

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

-
-
-

Of Expected Shares

-
-
+
+ +
+
+
+

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

+
+
+

Of Expected Shares

+
+
-
- -
-
-
-

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-
-
-

{$GLOBAL.config.currency} Estimated Earnings

-
-
+
+ +
+
+
+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+
+
+

{$GLOBAL.config.currency} Estimated Earnings

+
+
-
- -
-
-
-

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

-
-
-

Difficulty

-
-
+
+ +
+
+
+

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

+
+
+

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 Next Difficulty

+
+
-
- -
-
-
-

{$NETWORK.EstTimePerBlock|seconds_to_words}

-
-
-

Est. Avg. Time per Block

-
-
+
+ +
+
+
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

+
+
+

Est. Avg. Time per Block

+
+
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl index ee942095..dfce41e0 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl @@ -2,93 +2,93 @@
-
- -
-
-
-

{$NETWORK.block}

-
-
-

Current Block

-
-
+
+ +
+
+
+

{$NETWORK.block}

+
+
+

Current Block

+
+
-
- -
-
-
-

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

-
-
-

Of Expected Shares

-
-
+
+ +
+
+
+

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

+
+
+

Of Expected Shares

+
+
-
- -
-
-
-

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-
-
-

{$GLOBAL.config.currency} Estimated Earnings

-
-
+
+ +
+
+
+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+
+
+

{$GLOBAL.config.currency} Estimated Earnings

+
+
-
- -
-
-
-

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

-
-
-

Difficulty

-
-
+
+ +
+
+
+

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

+
+
+

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 Next Difficulty

-
-
-
-
+
-
- -
-
-
-

{$NETWORK.EstTimePerBlock|seconds_to_words}

-
-
-

Est. Avg. Time per Block

-
-
+
+ +
+
+
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

+
+
+

Est. Avg. Time per Block

+
+
From bd57e048e6b2df26a6dab1f7bd6fd49b89b30910 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Sat, 22 Mar 2014 12:31:37 +0100 Subject: [PATCH 06/10] [UPDATE] style fixes --- public/site_assets/bootstrap/css/mpos.css | 4 +- .../admin/reports/earnings_report.tpl | 78 +++++++++---------- .../bootstrap/admin/transactions/default.tpl | 38 ++++----- .../bootstrap/admin/user/default.tpl | 56 ++++++------- .../templates/bootstrap/dashboard/js/api.tpl | 4 +- .../dashboard/overview/_with_price_graph.tpl | 38 +++++---- .../overview/_without_price_graph.tpl | 32 ++++---- .../round_statistics/pplns/round.tpl | 38 ++++----- .../dashboard/round_statistics/pps/round.tpl | 16 ++-- .../dashboard/round_statistics/prop/round.tpl | 38 ++++----- scripts/51_percent_check.php | 0 11 files changed, 176 insertions(+), 166 deletions(-) mode change 100755 => 100644 scripts/51_percent_check.php diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 96422900..9309a496 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -354,7 +354,7 @@ p.overview { } span.overview { - font-size: 20px; + font-size: 14px; font-weight: bold; } @@ -460,7 +460,7 @@ span.spark-25 { } p.up { - margin: -14px 0px 0px 0px; + margin: -10px 0px 0px 0px; } div.up { diff --git a/public/templates/bootstrap/admin/reports/earnings_report.tpl b/public/templates/bootstrap/admin/reports/earnings_report.tpl index b3e7b6ba..00cab4f4 100644 --- a/public/templates/bootstrap/admin/reports/earnings_report.tpl +++ b/public/templates/bootstrap/admin/reports/earnings_report.tpl @@ -9,21 +9,21 @@ - - - - - - + + + + + + {if $GLOBAL.config.payout_system == 'pplns'} - - - - - - + + + + + + {/if} - + @@ -55,42 +55,42 @@ {assign var="usertotalshares" value=$usertotalshares+$REPORTDATA[txs].shares} {/if} - - - - - - + + + + + + {if $GLOBAL.config.payout_system == 'pplns'} - - - - - - + + + + + {/if} - + {assign var=percentage1 value=0} {/section} - - - - - - + + + + + + {if $GLOBAL.config.payout_system == 'pplns'} - - - - - - + + + + + {/if} - + {assign var=percentage2 value=0} diff --git a/public/templates/bootstrap/admin/transactions/default.tpl b/public/templates/bootstrap/admin/transactions/default.tpl index 88d7dfdc..d7f15295 100644 --- a/public/templates/bootstrap/admin/transactions/default.tpl +++ b/public/templates/bootstrap/admin/transactions/default.tpl @@ -83,25 +83,25 @@
BlockRound SharesRound ValidInvalidInvalid %Round %BlockRound SharesRound ValidInvalidInvalid %Round %PPLNS SharesPPLNS ValidInvalidInvalid %PPLNS %VariancePPLNS SharesPPLNS ValidInvalidInvalid %PPLNS %VarianceAmountAmount
{$REPORTDATA[txs].height|default:"0"}{$REPORTDATA[txs].shares|default:"0"}{$REPORTDATA[txs]['user'].valid|number_format|default:"0"}{$REPORTDATA[txs]['user'].invalid|number_format|default:"0"}{if $REPORTDATA[txs]['user'].invalid > 0 }{($REPORTDATA[txs]['user'].invalid / $REPORTDATA[txs]['user'].valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $REPORTDATA[txs]['user'].valid > 0 }{(( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid)|number_format:"2"}{else}0.00{/if}{$REPORTDATA[txs].height|default:"0"}{$REPORTDATA[txs].shares|default:"0"}{$REPORTDATA[txs]['user'].valid|number_format|default:"0"}{$REPORTDATA[txs]['user'].invalid|number_format|default:"0"}{if $REPORTDATA[txs]['user'].invalid > 0 }{($REPORTDATA[txs]['user'].invalid / $REPORTDATA[txs]['user'].valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $REPORTDATA[txs]['user'].valid > 0 }{(( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid)|number_format:"2"}{else}0.00{/if}{$REPORTDATA[txs].pplns_shares|number_format|default:"0"}{$REPORTDATA[txs]['user'].pplns_valid|number_format|default:"0"}{$REPORTDATA[txs]['user'].pplns_invalid|number_format|default:"0"}{if $REPORTDATA[txs]['user'].pplns_invalid > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0 }{($REPORTDATA[txs]['user'].pplns_invalid / $REPORTDATA[txs]['user'].pplns_valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $REPORTDATA[txs].shares > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{(( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)|number_format:"2"|default:"0"}{else}0.00{/if}{if $REPORTDATA[txs]['user'].valid > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{math assign="percentage1" equation=(100 / ((( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid) / (( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)))}{else if $REPORTDATA[txs]['user'].pplns_valid == 0}{assign var=percentage1 value=0}{else}{assign var=percentage1 value=100}{/if} + {$REPORTDATA[txs].pplns_shares|number_format|default:"0"}{$REPORTDATA[txs]['user'].pplns_valid|number_format|default:"0"}{$REPORTDATA[txs]['user'].pplns_invalid|number_format|default:"0"}{if $REPORTDATA[txs]['user'].pplns_invalid > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0 }{($REPORTDATA[txs]['user'].pplns_invalid / $REPORTDATA[txs]['user'].pplns_valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $REPORTDATA[txs].shares > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{(( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)|number_format:"2"|default:"0"}{else}0.00{/if}{if $REPORTDATA[txs]['user'].valid > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{math assign="percentage1" equation=(100 / ((( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid) / (( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)))}{else if $REPORTDATA[txs]['user'].pplns_valid == 0}{assign var=percentage1 value=0}{else}{assign var=percentage1 value=100}{/if} {$percentage1|number_format:"2"|default:"0"}{$REPORTDATA[txs].user_credit|default:"0"|number_format:"8"}{$REPORTDATA[txs].user_credit|default:"0"|number_format:"8"}
Totals{$totalshares|number_format}{$totalvalid|number_format}{$totalinvalid|number_format}{if $totalinvalid > 0 && $totalvalid > 0 }{($totalinvalid / $totalvalid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $usertotalshares > 0 && $totalvalid > 0}{(( 100 / $usertotalshares) * $totalvalid)|number_format:"2"|default:"0"}{else}0.00{/if}Totals{$totalshares|number_format}{$totalvalid|number_format}{$totalinvalid|number_format}{if $totalinvalid > 0 && $totalvalid > 0 }{($totalinvalid / $totalvalid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $usertotalshares > 0 && $totalvalid > 0}{(( 100 / $usertotalshares) * $totalvalid)|number_format:"2"|default:"0"}{else}0.00{/if}{$pplnsshares|number_format}{$pplnsvalid|number_format}{$pplnsinvalid|number_format}{if $pplnsinvalid > 0 && $pplnsvalid > 0 }{($pplnsinvalid / $pplnsvalid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $userpplnsshares > 0 && $pplnsvalid > 0}{(( 100 / $userpplnsshares) * $pplnsvalid)|number_format:"2"|default:"0"}{else}0.00{/if}{if $totalvalid > 0 && $pplnsvalid > 0}{math assign="percentage2" equation=(100 / ((( 100 / $usertotalshares) * $totalvalid) / (( 100 / $userpplnsshares) * $pplnsvalid)))}{else if $pplnsvalid == 0}{assign var=percentage2 value=0}{else}{assign var=percentage2 value=100}{/if} + {$pplnsshares|number_format}{$pplnsvalid|number_format}{$pplnsinvalid|number_format}{if $pplnsinvalid > 0 && $pplnsvalid > 0 }{($pplnsinvalid / $pplnsvalid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}{if $userpplnsshares > 0 && $pplnsvalid > 0}{(( 100 / $userpplnsshares) * $pplnsvalid)|number_format:"2"|default:"0"}{else}0.00{/if}{if $totalvalid > 0 && $pplnsvalid > 0}{math assign="percentage2" equation=(100 / ((( 100 / $usertotalshares) * $totalvalid) / (( 100 / $userpplnsshares) * $pplnsvalid)))}{else if $pplnsvalid == 0}{assign var=percentage2 value=0}{else}{assign var=percentage2 value=100}{/if} {$percentage2|number_format:"2"|default:"0"}{$amount|default:"0"|number_format:"8"}{$amount|default:"0"|number_format:"8"}
- - - - - - - - - + + + + + + + + + {section transaction $TRANSACTIONS} - - - - - + + + + - + {if ! $GLOBAL.website.transactionexplorer.disabled} - + {else} - + {/if} - - + + {/section} diff --git a/public/templates/bootstrap/admin/user/default.tpl b/public/templates/bootstrap/admin/user/default.tpl index 404cc7c1..6b0f532f 100644 --- a/public/templates/bootstrap/admin/user/default.tpl +++ b/public/templates/bootstrap/admin/user/default.tpl @@ -86,54 +86,54 @@
IDAccountDateTX TypeStatusPayment AddressTX #Block #AmountIDAccountDateTX TypeStatusPayment AddressTX #Block #Amount
{$TRANSACTIONS[transaction].id}{$TRANSACTIONS[transaction].username}{$TRANSACTIONS[transaction].timestamp}{$TRANSACTIONS[transaction].type} + {$TRANSACTIONS[transaction].id}{$TRANSACTIONS[transaction].username}{$TRANSACTIONS[transaction].timestamp}{$TRANSACTIONS[transaction].type} {if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR $TRANSACTIONS[transaction].type == 'Fee_PPS' OR $TRANSACTIONS[transaction].type == 'Donation_PPS' OR @@ -113,14 +113,14 @@ {else if $TRANSACTIONS[transaction].confirmations == -1}Orphaned {else}Unconfirmed{/if} {$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{if $TRANSACTIONS[transaction].height == 0}n/a{else}{/if}{$TRANSACTIONS[transaction].height}{$TRANSACTIONS[transaction].amount|number_format:"8"}{if $TRANSACTIONS[transaction].height == 0}n/a{else}{/if}{$TRANSACTIONS[transaction].height}{$TRANSACTIONS[transaction].amount|number_format:"8"}
- - - - - + + + + + {if $GLOBAL.config.payout_system != 'pps'} - - + + {else} - + {/if} - - - - - - + + + + + + {nocache} {section name=user loop=$USERS|default} - - - - - + + + + + {if $GLOBAL.config.payout_system != 'pps'} - - + + {else} - + {/if} - - - - + + + - -
IDUsernameE-MailSharesHashrateIDUsernameE-MailSharesHashrateEst. DonationEst. PayoutEst. DonationEst. PayoutEst. 24 HoursEst. 24 HoursBalanceReg. DateLast LoginAdminLockedNo FeesBalanceReg. DateLast LoginAdminLockedNo Fees
{$USERS[user].id}{$USERS[user].username|escape}{$USERS[user].email|escape}{$USERS[user].shares.valid}{$USERS[user].hashrate}{$USERS[user].id}{$USERS[user].username|escape}{$USERS[user].email|escape}{$USERS[user].shares.valid}{$USERS[user].hashrate}{$USERS[user].estimates.donation|number_format:"8"}{$USERS[user].estimates.payout|number_format:"8"}{$USERS[user].estimates.donation|number_format:"8"}{$USERS[user].estimates.payout|number_format:"8"}{$USERS[user].estimates.hours24|number_format:"8"}{$USERS[user].estimates.hours24|number_format:"8"}{$USERS[user].balance|number_format:"8"}{$USERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}{$USERS[user].last_login|date_format:"%d/%m %H:%M:%S"} + {$USERS[user].balance|number_format:"8"}{$USERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}{$USERS[user].last_login|date_format:"%d/%m %H:%M:%S"} + + diff --git a/public/templates/bootstrap/dashboard/js/api.tpl b/public/templates/bootstrap/dashboard/js/api.tpl index 817ef322..d030403c 100644 --- a/public/templates/bootstrap/dashboard/js/api.tpl +++ b/public/templates/bootstrap/dashboard/js/api.tpl @@ -25,7 +25,8 @@ $(document).ready(function(){ height: '35', barWidth: 6, barSpacing: 2, - chartRangeMin: 0 + chartRangeMin: 0, + barColor: '#41fc41' }; // Sparkline options applied to line graphs @@ -35,6 +36,7 @@ $(document).ready(function(){ chartRangeMax: {/literal}{$GLOBAL.price}{literal} + 5, composite: false, lineColor: 'black', + fillColor: '#41fc41', chartRangeClip: true }; diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl index 97dd578a..bb709c46 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -1,13 +1,14 @@
- +
-

My Hashrate

+

My Hashrate

- {$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal} + {$GLOBAL.userdata.hashrate|number_format:"2"} + {$GLOBAL.hashunits.personal}
@@ -18,13 +19,14 @@
- +
-

Pool Hashrate

+

Pool Hashrate

- {$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} + {$GLOBAL.hashrate|number_format:"2"} + {$GLOBAL.hashunits.pool}
@@ -35,13 +37,14 @@
- +
-

My Sharerate

+

My Sharerate

- {$GLOBAL.userdata.sharerate|number_format:"2"} S/s + {$GLOBAL.userdata.sharerate|number_format:"2"} + S/s
@@ -52,11 +55,11 @@
- +
-

Pool Workers

+

Pool Workers

{$GLOBAL.workers}
@@ -69,13 +72,14 @@
- +
-

Net Hashrate

+

Net Hashrate

- {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} + {$GLOBAL.nethashrate|number_format:"2"} + {$GLOBAL.hashunits.network}
@@ -86,13 +90,13 @@
- +
-

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

+

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

- {$GLOBAL.price|default:"0"|number_format:"8"} + {$GLOBAL.price|default:"0"|number_format:"8"}
diff --git a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl index a72e481e..3e9edfdd 100644 --- a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl @@ -1,13 +1,14 @@
- +
-

My Hashrate

+

My Hashrate

- {$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal} + {$GLOBAL.userdata.hashrate|number_format:"2"} + {$GLOBAL.hashunits.personal}
@@ -18,13 +19,14 @@
- +
-

Pool Hashrate

+

Pool Hashrate

- {$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} + {$GLOBAL.hashrate|number_format:"2"} + {$GLOBAL.hashunits.pool}
@@ -35,13 +37,14 @@
- +
-

My Sharerate

+

My Sharerate

- {$GLOBAL.userdata.sharerate|number_format:"2"} S/s + {$GLOBAL.userdata.sharerate|number_format:"2"} + S/s
@@ -52,11 +55,11 @@
- +
-

Pool Workers

+

Pool Workers

{$GLOBAL.workers}
@@ -69,13 +72,14 @@
- +
-

Net Hashrate

+

Net Hashrate

- {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} + {$GLOBAL.nethashrate|number_format:"2"} + {$GLOBAL.hashunits.network}
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl index 893d8695..5cac279a 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -3,14 +3,14 @@
- +
-

{$NETWORK.block}

+

{$NETWORK.block}

-

Current Block

+

Current Block

@@ -18,14 +18,14 @@
- +
-

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

+

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

-

Of Expected Shares

+

Of Expected Shares

@@ -33,14 +33,14 @@
- +
-

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-

{$GLOBAL.config.currency} Estimated Earnings

+

{$GLOBAL.config.currency} Estimated Earnings

@@ -48,14 +48,14 @@
- +
-

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

+

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

-

Difficulty

+

Difficulty

@@ -63,15 +63,15 @@
- +
-

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

-

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

+

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

+

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

-

Est Next Difficulty

+

Est Next Difficulty

@@ -79,14 +79,14 @@
- +
-

{$NETWORK.EstTimePerBlock|seconds_to_words}

+

{$NETWORK.EstTimePerBlock|seconds_to_words}

-

Est. Avg. Time per Block

+

Est. Avg. Time per Block

diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl index aef81206..51dc6e01 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl @@ -2,7 +2,7 @@
-

{$GLOBAL.userdata.estimates.hours1|number_format:"12"}

+

{$GLOBAL.userdata.estimates.hours1|number_format:"12"}

{$GLOBAL.config.currency} 1 Hour Estimated Earnings

@@ -12,22 +12,22 @@
-

{$GLOBAL.userdata.estimates.days7|number_format:"12"}

+

{$GLOBAL.userdata.estimates.days7|number_format:"12"}

{$GLOBAL.config.currency} 7 Days Estimated Earnings

-

{$GLOBAL.userdata.estimates.days14|number_format:"12"}

+

{$GLOBAL.userdata.estimates.days14|number_format:"12"}

{$GLOBAL.config.currency} 14 Days Estimated Earnings

-

{$GLOBAL.userdata.estimates.days30|number_format:"12"}

+

{$GLOBAL.userdata.estimates.days30|number_format:"12"}

{$GLOBAL.config.currency} 30 Days Estimated Earnings

-

{$GLOBAL.ppsvalue}

+

{$GLOBAL.ppsvalue}

PPS Value

@@ -37,18 +37,18 @@
-

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

+

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

Difficulty

-

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

+

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

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

Est Next Difficulty

-

{$NETWORK.EstTimePerBlock|seconds_to_words}

+

{$NETWORK.EstTimePerBlock|seconds_to_words}

Est. Avg. Time per Block

diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl index dfce41e0..fa396da2 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl @@ -3,14 +3,14 @@
- +
-

{$NETWORK.block}

+

{$NETWORK.block}

-

Current Block

+

Current Block

@@ -18,14 +18,14 @@
- +
-

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

+

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

-

Of Expected Shares

+

Of Expected Shares

@@ -33,14 +33,14 @@
- +
-

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-

{$GLOBAL.config.currency} Estimated Earnings

+

{$GLOBAL.config.currency} Estimated Earnings

@@ -48,14 +48,14 @@
- +
-

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

+

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

-

Difficulty

+

Difficulty

@@ -63,15 +63,15 @@
- +
-

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

-

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

+

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

+

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

-

Est Next Difficulty

+

Est Next Difficulty

@@ -79,14 +79,14 @@
- +
-

{$NETWORK.EstTimePerBlock|seconds_to_words}

+

{$NETWORK.EstTimePerBlock|seconds_to_words}

-

Est. Avg. Time per Block

+

Est. Avg. Time per Block

diff --git a/scripts/51_percent_check.php b/scripts/51_percent_check.php old mode 100755 new mode 100644 From ca163a4fde7c555f205766a8279e8544082cfecd Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Sat, 22 Mar 2014 12:31:56 +0100 Subject: [PATCH 07/10] [UPDATE] style fixes --- scripts/51_percent_check.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/51_percent_check.php diff --git a/scripts/51_percent_check.php b/scripts/51_percent_check.php old mode 100644 new mode 100755 From bfd0302782f6b2b4eaec33389936f453d9fe1402 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 05:03:29 -0700 Subject: [PATCH 08/10] [FIX] Style Margin --- public/site_assets/bootstrap/css/mpos.css | 7 ++++++- .../dashboard/overview/_with_price_graph.tpl | 12 ++++++------ .../dashboard/overview/_without_price_graph.tpl | 10 +++++----- .../dashboard/round_statistics/pplns/round.tpl | 10 +++++----- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 9309a496..87fe7f34 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -460,10 +460,15 @@ span.spark-25 { } p.up { - margin: -10px 0px 0px 0px; + margin: -5px 0px -8px; } div.up { margin: -10px 0px 6px 0px; } + +p.up-more { + margin: -6px 0px 10px; +} + /* 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 bb709c46..e180bf7d 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -5,7 +5,7 @@
-

My Hashrate

+

My Hashrate

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

Pool Hashrate

+

Pool Hashrate

{$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} @@ -41,7 +41,7 @@
-

My Sharerate

+

My Sharerate

{$GLOBAL.userdata.sharerate|number_format:"2"} S/s @@ -59,7 +59,7 @@
-

Pool Workers

+

Pool Workers

{$GLOBAL.workers}
@@ -76,7 +76,7 @@
-

Net Hashrate

+

Net Hashrate

{$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} @@ -94,7 +94,7 @@
-

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

+

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

{$GLOBAL.price|default:"0"|number_format:"8"}
diff --git a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl index 3e9edfdd..67d7002e 100644 --- a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl @@ -5,7 +5,7 @@
-

My Hashrate

+

My Hashrate

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

Pool Hashrate

+

Pool Hashrate

{$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} @@ -41,7 +41,7 @@
-

My Sharerate

+

My Sharerate

{$GLOBAL.userdata.sharerate|number_format:"2"} S/s @@ -59,7 +59,7 @@
-

Pool Workers

+

Pool Workers

{$GLOBAL.workers}
@@ -76,7 +76,7 @@
-

Net Hashrate

+

Net Hashrate

{$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl index 5cac279a..4e28db5d 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -7,7 +7,7 @@
-

{$NETWORK.block}

+

{$NETWORK.block}

Current Block

@@ -22,7 +22,7 @@
-

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

+

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

Of Expected Shares

@@ -37,7 +37,7 @@
-

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

{$GLOBAL.config.currency} Estimated Earnings

@@ -52,7 +52,7 @@
-

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

+

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

Difficulty

@@ -83,7 +83,7 @@
-

{$NETWORK.EstTimePerBlock|seconds_to_words}

+

{$NETWORK.EstTimePerBlock|seconds_to_words}

Est. Avg. Time per Block

From 0aa75bd1d4cc3929fc8c09ae0d97420fae553062 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 05:11:41 -0700 Subject: [PATCH 09/10] [FIX] More Style Margin --- public/site_assets/bootstrap/css/mpos.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 87fe7f34..cc315ec9 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -471,4 +471,8 @@ p.up-more { margin: -6px 0px 10px; } +p.up-more2 { + margin: -6px 0px 0px; +} + /* End Test */ From 948fe892ebe5730268b2767258e850ffdac7e0e5 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 05:12:36 -0700 Subject: [PATCH 10/10] [FIX] More Style Margin --- .../bootstrap/dashboard/round_statistics/pplns/round.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl index 4e28db5d..608fbebe 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -71,7 +71,7 @@

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

-

Est Next Difficulty

+

Est Next Difficulty