From c89b8075d10ce360f54ff3161d84340f5e847c9c Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sun, 23 Mar 2014 22:31:06 +0100 Subject: [PATCH 1/4] [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 2/4] [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 @@ -