diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index 7d2b8f14..56eb5319 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 for multiple Pools in Header.' +); +$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/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 8e6004f4..40dd4acf 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -40,7 +40,7 @@ /* Top Right Navigation Dropdown Styles */ - .navbar-top-links li { +.navbar-top-links li { display: inline-block; } @@ -53,8 +53,8 @@ min-height: 50px; } -.dropdown-user { min-width:100px; - +.dropdown-user { + min-width:100px; } .navbar-top-links .dropdown-menu li { diff --git a/public/templates/bootstrap/global/header.tpl b/public/templates/bootstrap/global/header.tpl old mode 100755 new mode 100644 index d89e809c..3d4098e0 --- a/public/templates/bootstrap/global/header.tpl +++ b/public/templates/bootstrap/global/header.tpl @@ -1,12 +1,29 @@ -