From 51b7cbdbeefd1f06b96907441396e1930a121596 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Sat, 22 Mar 2014 20:57:59 +1300 Subject: [PATCH 01/42] Update mpos.css Third time is the charm. Added width constraint, Things can't display correctly otherwise (Alerts for instance) Commented out the margin-left that was causing a issue similar to the dropdown-user --- public/site_assets/bootstrap/css/mpos.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 96422900..2e4cf30c 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -4,6 +4,8 @@ body { background-color: #f8f8f8; + min-width: 350px; + /* Design constraint */ } /* Wrappers */ @@ -90,7 +92,7 @@ } .navbar-top-links .dropdown-alerts { - margin-left: -123px; + /*#margin-left: -123px; */ } .navbar-top-links .dropdown-user { From aa63eac2ea361b6a66d788aa20030cd573ebc6eb Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Sun, 23 Mar 2014 00:45:43 +1300 Subject: [PATCH 02/42] Update global.inc.dist.php Double vision --- public/include/config/global.inc.dist.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php index cff4ba58..c6cf026a 100644 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -85,13 +85,6 @@ $config['ap_threshold']['max'] = 250; **/ $config['mp_threshold'] = 1; -/** - * Minimum manual Payout Threshold - * Minimum manual payout amount - * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-manual-payout-threshold - **/ -$config['mp_threshold'] = 1; - /** * Donation thresholds * Minimum donation amount in percent From bfd0302782f6b2b4eaec33389936f453d9fe1402 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 05:03:29 -0700 Subject: [PATCH 03/42] [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 04/42] [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 05/42] [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

From be50e8ab47823e49f071a02a8efec50ae021cef3 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sat, 22 Mar 2014 14:26:12 +0100 Subject: [PATCH 06/42] [FIX] Remove baseline conversion from PPLNS Targets --- public/include/classes/share.class.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/include/classes/share.class.php b/public/include/classes/share.class.php index 3dd0e573..9e977d71 100644 --- a/public/include/classes/share.class.php +++ b/public/include/classes/share.class.php @@ -360,8 +360,6 @@ class Share Extends Base { * Fetch the lowest needed share ID from shares **/ function getMinimumShareId($iCount, $current_upstream) { - // We don't use baseline here to be more accurate - $iCount = $iCount * pow(2, ($this->config['difficulty'] - 16)); $stmt = $this->mysqli->prepare(" SELECT MIN(b.id) AS id FROM ( From ad1db8dfca8655f4983a5dbc4c7e3950f1c6064f Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sat, 22 Mar 2014 14:39:38 +0100 Subject: [PATCH 07/42] [FIX] Same for PPLNS Archive shares --- public/include/classes/share.class.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/include/classes/share.class.php b/public/include/classes/share.class.php index 9e977d71..91f47c8f 100644 --- a/public/include/classes/share.class.php +++ b/public/include/classes/share.class.php @@ -379,8 +379,6 @@ class Share Extends Base { * Fetch the lowest needed share ID from archive **/ function getMinArchiveShareId($iCount) { - // We don't use baseline here to be more accurate - $iCount = $iCount * pow(2, ($this->config['difficulty'] - 16)); $stmt = $this->mysqli->prepare(" SELECT MIN(b.share_id) AS share_id FROM ( From bd4096bccbf3bbf541d2aa799658568ddd6bf924 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Sat, 22 Mar 2014 21:12:55 +0100 Subject: [PATCH 08/42] [UPDATE] added exchange url to price ticker --- public/include/smarty_globals.inc.php | 1 + public/site_assets/bootstrap/css/mpos.css | 4 ++++ .../bootstrap/dashboard/overview/_with_price_graph.tpl | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index e11fdea4..a304031c 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -85,6 +85,7 @@ $aGlobal = array( 'price' => $config['price'], 'targetdiff' => $config['difficulty'], 'currency' => $config['currency'], + 'exchangeurl' => $config['price']['url'], 'txfee_manual' => $config['txfee_manual'], 'txfee_auto' => $config['txfee_auto'], 'payout_system' => $config['payout_system'], diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index cc315ec9..0d2c1650 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -459,6 +459,10 @@ span.spark-25 { color: rgba(255, 255, 255, 0.7); } +.text-link { + color: #FFFFFF; +} + p.up { margin: -5px 0px -8px; } diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl index e180bf7d..e2bad762 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -90,7 +90,7 @@
- +
From 5866cbb54d16cdd68151e45ce2b0dd21c9a31a33 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Sun, 23 Mar 2014 00:37:55 +0100 Subject: [PATCH 09/42] [UPDATE] changed link behavior --- public/templates/bootstrap/admin/transactions/default.tpl | 2 +- public/templates/bootstrap/global/footer.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/bootstrap/admin/transactions/default.tpl b/public/templates/bootstrap/admin/transactions/default.tpl index d7f15295..7e10b4f7 100644 --- a/public/templates/bootstrap/admin/transactions/default.tpl +++ b/public/templates/bootstrap/admin/transactions/default.tpl @@ -115,7 +115,7 @@ {$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true} {if ! $GLOBAL.website.transactionexplorer.disabled} - {$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true} + {$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true} {else} {$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true} {/if} diff --git a/public/templates/bootstrap/global/footer.tpl b/public/templates/bootstrap/global/footer.tpl index 213e41bc..90fb345f 100644 --- a/public/templates/bootstrap/global/footer.tpl +++ b/public/templates/bootstrap/global/footer.tpl @@ -2,7 +2,7 @@
- Powered by MPOS | Donate to Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8 + Powered by MPOS | Donate to Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8
From c785af95c383c22cb83d94a09e7492a790f5b2fd Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Sun, 23 Mar 2014 00:42:11 +0100 Subject: [PATCH 10/42] [UPDATE] changed link behavior --- public/templates/bootstrap/account/transactions/default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/public/templates/bootstrap/account/transactions/default.tpl index b5635569..9c1bc2b2 100644 --- a/public/templates/bootstrap/account/transactions/default.tpl +++ b/public/templates/bootstrap/account/transactions/default.tpl @@ -75,7 +75,7 @@ {$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true} {if ! $GLOBAL.website.transactionexplorer.disabled} - {$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true} + {$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true} {else} {$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true} {/if} From 48a34c49824e60a18cafc9616cc13b9fcd4d9391 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 17:07:08 -0700 Subject: [PATCH 11/42] [FIX] HTML Errors --- public/templates/bootstrap/dashboard/default.tpl | 2 +- .../bootstrap/dashboard/round_statistics/pplns/shares.tpl | 8 ++++---- .../bootstrap/dashboard/round_statistics/prop/shares.tpl | 8 ++++---- .../bootstrap/dashboard/worker_information/default.tpl | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/public/templates/bootstrap/dashboard/default.tpl b/public/templates/bootstrap/dashboard/default.tpl index 40a4ac87..1bb1993d 100644 --- a/public/templates/bootstrap/dashboard/default.tpl +++ b/public/templates/bootstrap/dashboard/default.tpl @@ -3,7 +3,7 @@
-

Overview

+

Overview

diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl index 043df82d..55775392 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl @@ -2,11 +2,11 @@ -
Own
-
Pool
 +
Own
 +
Pool
 -
Valid
+
Valid
{$GLOBAL.userdata.shares.valid|number_format}
@@ -19,7 +19,7 @@ -
Invalid
+
Invalid
{$GLOBAL.userdata.shares.invalid|number_format}
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl index 043df82d..55775392 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl @@ -2,11 +2,11 @@ -
Own
-
Pool
 +
Own
 +
Pool
 -
Valid
+
Valid
{$GLOBAL.userdata.shares.valid|number_format}
@@ -19,7 +19,7 @@ -
Invalid
+
Invalid
{$GLOBAL.userdata.shares.invalid|number_format}
diff --git a/public/templates/bootstrap/dashboard/worker_information/default.tpl b/public/templates/bootstrap/dashboard/worker_information/default.tpl index 3bedcb74..499e7360 100644 --- a/public/templates/bootstrap/dashboard/worker_information/default.tpl +++ b/public/templates/bootstrap/dashboard/worker_information/default.tpl @@ -16,7 +16,6 @@ No worker information available -
From ab96fcf85f00cb6fc8d739e149437d4ec382aae7 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 17:36:40 -0700 Subject: [PATCH 12/42] [FIX] More HTML Errors [FIX] contributors share/hashrate highlight --- public/templates/bootstrap/home/news_all.tpl | 4 ++-- .../statistics/pool/contributors_hashrate.tpl | 6 ++--- .../statistics/pool/contributors_shares.tpl | 4 ++-- .../statistics/pool/general_stats.tpl | 22 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/templates/bootstrap/home/news_all.tpl b/public/templates/bootstrap/home/news_all.tpl index 780a6996..af229f98 100644 --- a/public/templates/bootstrap/home/news_all.tpl +++ b/public/templates/bootstrap/home/news_all.tpl @@ -3,7 +3,7 @@
- {$NEWS[news].header} + {$NEWS[news].header}
posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by {$NEWS[news].author}{/if}
@@ -13,4 +13,4 @@
-{/section} \ No newline at end of file +{/section} diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl index bb49912e..1606da37 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl @@ -22,9 +22,9 @@ {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} + {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].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} {$CONTRIBHASHES[contrib].hashrate|number_format} {$estday|number_format:"3"} @@ -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} - + {else}{/if}> 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 06661e03..525a1cc9 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl @@ -17,9 +17,9 @@ {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} + {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].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} {$CONTRIBSHARES[shares].shares|number_format} diff --git a/public/templates/bootstrap/statistics/pool/general_stats.tpl b/public/templates/bootstrap/statistics/pool/general_stats.tpl index d1ef22b3..ee589a5f 100644 --- a/public/templates/bootstrap/statistics/pool/general_stats.tpl +++ b/public/templates/bootstrap/statistics/pool/general_stats.tpl @@ -11,15 +11,15 @@ {$GLOBAL.hashrate|number_format:"3"} {$GLOBAL.hashunits.pool} - Pool Efficiency + Pool Efficiency {if $GLOBAL.roundshares.valid > 0}{($GLOBAL.roundshares.valid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%{else}0%{/if} - Current Active Workers + Current Active Workers {$GLOBAL.workers} - Current Difficulty + Current Difficulty {if ! $GLOBAL.website.chaininfo.disabled} {$NETWORK.difficulty} {else} @@ -27,7 +27,7 @@ {/if} - Est. Next Difficulty + Est. Next Difficulty {if ! $GLOBAL.website.chaininfo.disabled} {$NETWORK.EstNextDifficulty|number_format:"8"} (Change in {$NETWORK.BlocksUntilDiffChange} Blocks) {else} @@ -35,34 +35,34 @@ {/if} - Est. Avg. Time per Round (Network) + Est. Avg. Time per Round (Network) {$NETWORK.EstTimePerBlock|seconds_to_words} - Est. Avg. Time per Round (Pool) + Est. Avg. Time per Round (Pool) {$ESTTIME|seconds_to_words} - Est. Shares this Round + Est. Shares this Round {$ESTIMATES.shares} (done: {$ESTIMATES.percent}%) {if ! $GLOBAL.website.blockexplorer.disabled} - Next Network Block + Next Network Block {$CURRENTBLOCK + 1}    (Current: {$CURRENTBLOCK}) {else} - Next Network Block + Next Network Block {$CURRENTBLOCK + 1}    (Current: {$CURRENTBLOCK}) {/if} - Last Block Found + Last Block Found {$LASTBLOCK|default:"0"} - Time Since Last Block + Time Since Last Block {$TIMESINCELAST|seconds_to_words} From a9f23862a884fd8fb35b8dddfaba26c4dc044aa9 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sat, 22 Mar 2014 17:41:04 -0700 Subject: [PATCH 13/42] [FIX] contributors share/hashrate highlight --- .../bootstrap/statistics/pool/contributors_hashrate.tpl | 2 +- .../templates/bootstrap/statistics/pool/contributors_shares.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl index 1606da37..fdbb0565 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl @@ -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} - {else}{/if}> + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if}> 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 525a1cc9..374ea223 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl @@ -25,7 +25,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0} - + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if}> 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} From 13590f65204f25a16aa95170f0934fb95c725c47 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Sun, 23 Mar 2014 01:14:08 -0700 Subject: [PATCH 14/42] [UPDATE] Teal Backgrond for Pool Information Round Information Not so harsh on the eyes --- public/site_assets/bootstrap/css/mpos.css | 4 ++++ .../dashboard/overview/_with_price_graph.tpl | 24 +++++++++---------- .../overview/_without_price_graph.tpl | 20 ++++++++-------- .../round_statistics/pplns/round.tpl | 24 +++++++++---------- .../dashboard/round_statistics/prop/round.tpl | 24 +++++++++---------- 5 files changed, 50 insertions(+), 46 deletions(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 0d2c1650..ebf9acea 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -455,6 +455,10 @@ span.spark-25 { background-color: #428BCA; } +.teal { + background-color: #008080 +} + .text-faded { color: rgba(255, 255, 255, 0.7); } diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl index e2bad762..cea7546a 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -1,9 +1,9 @@
-
+
-
+

My Hashrate

@@ -18,10 +18,10 @@
-
+
-
+

Pool Hashrate

@@ -36,10 +36,10 @@
-
+
-
+

My Sharerate

@@ -54,10 +54,10 @@
-
+
-
+

Pool Workers

@@ -71,10 +71,10 @@
-
+
-
+

Net Hashrate

@@ -89,10 +89,10 @@
-
+
-
+

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

diff --git a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl index 67d7002e..c914e238 100644 --- a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl @@ -1,9 +1,9 @@
-
+
-
+

My Hashrate

@@ -18,10 +18,10 @@
-
+
-
+

Pool Hashrate

@@ -36,10 +36,10 @@
-
+
-
+

My Sharerate

@@ -54,10 +54,10 @@
-
+
-
+

Pool Workers

@@ -71,10 +71,10 @@
-
+
-
+

Net Hashrate

diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl index 608fbebe..7a6606f4 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -2,10 +2,10 @@
-
+
-
+

{$NETWORK.block}

@@ -17,10 +17,10 @@
-
+
-
+

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

@@ -32,10 +32,10 @@
-
+
-
+

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

@@ -47,10 +47,10 @@
-
+
-
+

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

@@ -62,10 +62,10 @@
-
+
-
+

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

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

@@ -78,10 +78,10 @@
-
+
-
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl index fa396da2..76da83cd 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl @@ -2,10 +2,10 @@
-
+
-
+

{$NETWORK.block}

@@ -17,10 +17,10 @@
-
+
-
+

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

@@ -32,10 +32,10 @@
-
+
-
+

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

@@ -47,10 +47,10 @@
-
+
-
+

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

@@ -62,10 +62,10 @@
-
+
-
+

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

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

@@ -78,10 +78,10 @@
-
+
-
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

From 94035b58f722416125d91eccbb5d2442c3e7a86a Mon Sep 17 00:00:00 2001 From: Shawn Read Date: Sun, 23 Mar 2014 11:52:13 -0400 Subject: [PATCH 15/42] Update bootstrap.php Add in a more user friendly error that tells the user WHERE the script is looking for the file (in case the base path or other variable is wrong) --- public/include/bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/include/bootstrap.php b/public/include/bootstrap.php index c63ad5fa..1ecaca1a 100644 --- a/public/include/bootstrap.php +++ b/public/include/bootstrap.php @@ -11,11 +11,11 @@ define('THEME_DIR', BASEPATH . 'templates'); $quickstartlink = "Quick Start Guide"; // Include our configuration (holding defines for the requires) -if (!include_once(BASEPATH . 'include/config/global.inc.dist.php')) die('Unable to load base global config - '.$quickstartlink); -if (!@include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load your global config - '.$quickstartlink); +if (!include_once(BASEPATH . 'include/config/global.inc.dist.php')) die('Unable to load base global config from ['.BASEPATH . 'include/config/global.inc.dist.php' . '] - '.$quickstartlink); +if (!@include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load your global config from ['.BASEPATH . 'include/config/global.inc.php' . '] - '.$quickstartlink); // load our security configs -if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unable to load base security config - '.$quickstartlink); +if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unable to load base security config from ['.BASEPATH . 'include/config/security.inc.dist.php' . '] - '.$quickstartlink); if (@file_exists(BASEPATH . 'include/config/security.inc.php')) include_once(BASEPATH . 'include/config/security.inc.php'); // start our session, we need it for smarty caching From 1de50786ae7b4b507fadb41774cb83de10a6f419 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sun, 23 Mar 2014 14:05:45 -0600 Subject: [PATCH 16/42] Fix Typo --- public/include/config/error_codes.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/config/error_codes.inc.php b/public/include/config/error_codes.inc.php index 7d24bdae..36a40b0f 100644 --- a/public/include/config/error_codes.inc.php +++ b/public/include/config/error_codes.inc.php @@ -35,7 +35,7 @@ $aErrorCodes['E0030'] = 'Unable to fetch a valid token for this invitation'; $aErrorCodes['E0031'] = 'Failed to send e-mail via mail() function'; $aErrorCodes['E0032'] = 'Failed to run API call: %s'; $aErrorCodes['E0033'] = 'Failed to store uptime status: %s'; -$aErrorCodes['E0034'] = 'Subjcet may only contain alphanumeric characters'; +$aErrorCodes['E0034'] = 'Subject may only contain alphanumeric characters'; $aErrorCodes['E0035'] = 'Failed to add news record'; $aErrorCodes['E0036'] = 'Failed to delete news record'; $aErrorCodes['E0037'] = 'Failed to update news record'; From c89b8075d10ce360f54ff3161d84340f5e847c9c Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sun, 23 Mar 2014 22:31:06 +0100 Subject: [PATCH 17/42] [CLEANUP] Number formatting --- .../bootstrap/statistics/pool/general_stats.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/templates/bootstrap/statistics/pool/general_stats.tpl b/public/templates/bootstrap/statistics/pool/general_stats.tpl index ee589a5f..b55eddec 100644 --- a/public/templates/bootstrap/statistics/pool/general_stats.tpl +++ b/public/templates/bootstrap/statistics/pool/general_stats.tpl @@ -16,7 +16,7 @@ Current Active Workers - {$GLOBAL.workers} + {$GLOBAL.workers|number_format} Current Difficulty @@ -44,22 +44,22 @@ Est. Shares this Round - {$ESTIMATES.shares} (done: {$ESTIMATES.percent}%) + {$ESTIMATES.shares|number_format} (done: {$ESTIMATES.percent}%) {if ! $GLOBAL.website.blockexplorer.disabled} Next Network Block - {$CURRENTBLOCK + 1}    (Current: {$CURRENTBLOCK}) + {($CURRENTBLOCK + 1)|number_format}    (Current: {$CURRENTBLOCK|number_format}) {else} Next Network Block - {$CURRENTBLOCK + 1}    (Current: {$CURRENTBLOCK}) + {($CURRENTBLOCK + 1)|number_format}    (Current: {$CURRENTBLOCK|number_format}) {/if} Last Block Found - {$LASTBLOCK|default:"0"} + {$LASTBLOCK|default:"0"|number_format} Time Since Last Block From 9d0700ee4b0962990b98b1823934c33e80589500 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 24 Mar 2014 10:30:24 +0100 Subject: [PATCH 18/42] [UPDATE] added Pool Navigation to header and admin settings --- public/include/config/admin_settings.inc.php | 15 ++++++++++++++ public/include/smarty_globals.inc.php | 2 ++ public/templates/bootstrap/global/header.tpl | 21 ++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) mode change 100755 => 100644 public/templates/bootstrap/global/header.tpl diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index 7d2b8f14..42fe350d 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -439,3 +439,18 @@ $aSettings['notifications'][] = array( 'name' => 'notifications_disable_idle_worker', 'value' => $setting->getValue('notifications_disable_idle_worker'), 'tooltip' => 'Enable/Disable IDLE worker notifications globally. Will remove the user option too.' ); +$aSettings['pools'][] = array( + 'display' => 'Enable Pool Navigation', 'type' => 'select', + 'options' => array( 0 => 'No', 1 => 'Yes' ), + 'default' => 0, + 'name' => 'poolnav_enabled', 'value' => $setting->getValue('poolnav_enabled'), + 'tooltip' => 'Enable or Disable Pool Navigation.' +); +$aSettings['pools'][] = array( + 'display' => 'Pools for Pool Navigation', 'type' => 'textarea', + 'size' => 20, + 'height' => 12, + 'default' => 'Pool Name|Pool URL', + 'name' => 'poolnav_pools', 'value' => $setting->getValue('poolnav_pools'), + 'tooltip' => '.' +); \ No newline at end of file diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index a304031c..26b6e2e8 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -65,6 +65,8 @@ $aGlobal = array( 'twofactor' => $config['twofactor'], 'csrf' => $config['csrf'], 'config' => array( + 'poolnav_enabled' => $setting->getValue('poolnav_enabled'), + 'poolnav_pools' => $setting->getValue('poolnav_pools'), 'recaptcha_enabled' => $setting->getValue('recaptcha_enabled'), 'recaptcha_enabled_logins' => $setting->getValue('recaptcha_enabled_logins'), 'disable_navbar' => $setting->getValue('disable_navbar'), diff --git a/public/templates/bootstrap/global/header.tpl b/public/templates/bootstrap/global/header.tpl old mode 100755 new mode 100644 index d89e809c..69970f43 --- a/public/templates/bootstrap/global/header.tpl +++ b/public/templates/bootstrap/global/header.tpl @@ -1,12 +1,29 @@ -