From ad1ae9541568b772eb2372673cd8acb2115d2f58 Mon Sep 17 00:00:00 2001 From: reliberate Date: Wed, 1 Jun 2016 22:04:00 -0600 Subject: [PATCH] Theme: Additional settings to control domain name (selector), menu toggle icon, and logout icon color and hover colors separately. Adminer: Added ability to login automatically. --- app/adminer/app_menu.php | 2 +- app/adminer/index.php | 21 +++--- themes/default/app_defaults.php | 37 ++++++++++- themes/default/css.php | 109 ++++++++++++-------------------- themes/default/template.php | 36 +++++------ 5 files changed, 107 insertions(+), 98 deletions(-) diff --git a/app/adminer/app_menu.php b/app/adminer/app_menu.php index 8758f7ecbf..43625e723e 100644 --- a/app/adminer/app_menu.php +++ b/app/adminer/app_menu.php @@ -14,7 +14,7 @@ $apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][0]['category'] = "external"; $apps[$x]['menu'][0]['icon'] = "glyphicon-new-window"; - $apps[$x]['menu'][0]['path'] = "/app/adminer/index.php"; + $apps[$x]['menu'][0]['path'] = "/app/adminer/index.php".(($_SESSION['adminer']['auto_login']['boolean'] == 'true') ? '?'.$_SESSION['adminer']['database_type']['text']."=&username=auto&db=fusionpbx&ns=public" : null); $apps[$x]['menu'][0]['groups'][] = "superadmin"; ?> \ No newline at end of file diff --git a/app/adminer/index.php b/app/adminer/index.php index f79242b1fb..b475c2cdd6 100644 --- a/app/adminer/index.php +++ b/app/adminer/index.php @@ -31,29 +31,34 @@ function adminer_object() { // custom name in title and heading return 'Adminer'; } - /* + function permanentLogin() { // key used for permanent login - return "7bebc76d8680196752c6b961ef13c360"; + if ($_SESSION['adminer']['auto_login']['boolean'] == 'true') { + return "7bebc76d8680196752c6b961ef13c360"; + } } function credentials() { - global $db_host, $db_username, $db_password; // server, username and password for connecting to database - return array($db_host.':'.$db_port, $db_username, $db_password); + if ($_SESSION['adminer']['auto_login']['boolean'] == 'true') { + global $db_host, $db_username, $db_password; + return array($db_host.':'.$db_port, $db_username, $db_password); + } } function database() { - global $db_name; // database name, will be escaped by Adminer - return $db_name; + if ($_SESSION['adminer']['auto_login']['boolean'] == 'true') { + global $db_name; + return $db_name; + } } function login($login, $password) { // validate user submitted credentials - return ($login == 'admin' && $password == ''); + return ($_SESSION['adminer']['auto_login']['boolean'] == 'true') ? true : false; } - */ } diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php index b124bab81e..14582ed4b5 100644 --- a/themes/default/app_defaults.php +++ b/themes/default/app_defaults.php @@ -88,11 +88,46 @@ if ($domains_processed == 1) { $array[$x]['default_setting_category'] = 'theme'; $array[$x]['default_setting_subcategory'] = 'domain_color'; $array[$x]['default_setting_name'] = 'text'; - $array[$x]['default_setting_value'] = '#69e5ff'; + $array[$x]['default_setting_value'] = '#ffffff'; $array[$x]['default_setting_enabled'] = 'false'; $array[$x]['default_setting_description'] = 'Set the text color (and opacity) for domain name.'; $x++; $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'domain_color_hover'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#69e5ff'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text hover color (and opacity) for domain name.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'logout_icon_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#ffffff'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the color (and opacity) for the logout icon (if visible).'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'logout_icon_color_hover'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#69e5ff'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the hover color (and opacity) for the logout icon (if visible).'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'menu_main_toggle_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#ffffff'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the color (and opacity) for the menu toggle icon (in mobile view).'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'menu_main_toggle_color_hover'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#69e5ff'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the hover color (and opacity) for the menu toggle icon (in mobile view).'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; $array[$x]['default_setting_subcategory'] = 'footer_background_color'; $array[$x]['default_setting_name'] = 'text'; $array[$x]['default_setting_value'] = 'rgba(0,0,0,0.1)'; diff --git a/themes/default/css.php b/themes/default/css.php index 2813e77e85..27dae22d54 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -320,25 +320,6 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; } } - /* xs menu toggle button */ - .navbar-inverse .navbar-toggle { - border: none; - } - - .navbar-inverse .navbar-toggle:hover, - .navbar-inverse .navbar-toggle:focus, - .navbar-inverse .navbar-toggle:active { - background: ; - } - - .navbar-inverse .navbar-toggle .icon-bar { - background: ; - } - - .navbar-inverse .navbar-toggle:hover > .icon-bar { - background: ; - } - /* sub menu container */ .navbar-nav > li > .dropdown-menu { margin-top: 0; @@ -380,72 +361,63 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; .dropdown-menu > li > a > span.glyphicon { display: inline-block; font-size: 8pt; - margin: 0px 0 8px 8px; + margin: 0 0 8px 8px; opacity: 0.30; text-align: top; } - /* menu toggle button */ - .navbar-header > button.navbar-toggle { - margin-left: 20px; + /* domain name/selector */ + a.domain_selector_domain { + display: inline-block; + white-space: nowrap; + font-size: 9.5pt; + color: ; + padding: 16px 0 14px 0; } - #logout_icon { - color: ; + a.domain_selector_domain:hover, + a.domain_selector_domain:focus, + a.domain_selector_domain:active { + color: ; + text-decoration: none; + } + + /* logout icon */ + a.logout_icon { + display: inline-block; + color: ; font-size: 11pt; - margin: 16px 19px 0 5px; - filter: alpha(opacity=80); - opacity: 0.80; - -moz-opacity: 0.80; - -khtml-opacity: 0.80; + padding: 16px 10px 13px 10px; + margin-left: 10px; } - #logout_icon:hover { - filter: alpha(opacity=100); - opacity: 1; - -moz-opacity: 1; - -khtml-opacity: 1; - cursor: pointer; + a.logout_icon:hover, + a.logout_icon:focus, + a.logout_icon:active { + color: ; + text-decoration: none; } - /* domain name: xs only */ - .navbar-inverse .navbar-header .navbar-nav .domain_selector_domain { - display: none; - white-space: nowrap; - opacity: 0.8; - -moz-opacity: 0.8; - -khtml-opacity: 0.8; - font-size: 9.5pt; - color: ; + /* xs menu toggle button */ + .navbar-inverse .navbar-toggle { + background: transparent; + border: none; + padding: 16px 7px 17px 20px; + margin: 0 8px; } - .navbar-inverse .navbar-header .navbar-nav .domain_selector_domain:hover, - .navbar-inverse .navbar-header .navbar-nav .domain_selector_domain:focus, - .navbar-inverse .navbar-header .navbar-nav .domain_selector_domain:active { - opacity: 1; - -moz-opacity: 1; - -khtml-opacity: 1; - cursor: pointer; + .navbar-inverse .navbar-toggle:hover, + .navbar-inverse .navbar-toggle:focus, + .navbar-inverse .navbar-toggle:active { + background: transparent; } - /* domain name: sm and larger */ - .navbar-inverse .navbar-collapse .navbar-nav > li > a.domain_selector_domain { - display: none; - white-space: nowrap; - opacity: 0.8; - -moz-opacity: 0.8; - -khtml-opacity: 0.8; - font-size: 9.5pt; - color: ; + .navbar-inverse .navbar-toggle .icon-bar { + background: ; } - .navbar-inverse .navbar-collapse .navbar-nav > li > a.domain_selector_domain:hover, - .navbar-inverse .navbar-collapse .navbar-nav > li > a.domain_selector_domain:focus, - .navbar-inverse .navbar-collapse .navbar-nav > li > a.domain_selector_domain:active { - opacity: 1; - -moz-opacity: 1; - -khtml-opacity: 1; - cursor: pointer; + .navbar-inverse .navbar-toggle:hover > .icon-bar { + background: ; } /* BUTTONS ********************************************************************/ @@ -784,7 +756,6 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; } a { - width: 100%; color: ; text-decoration: none; } diff --git a/themes/default/template.php b/themes/default/template.php index bd2f05b464..7534f0a304 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -360,7 +360,7 @@ default: $menu_position = ($menu_position != '') ? $menu_position : 'top'; $menu_type = 'fixed-'.$menu_position; - $menu_width = 'calc(90% - 40px)'; + $menu_width = 'calc(90% - 20px)'; $menu_brand = true; } ?> @@ -398,11 +398,9 @@ echo "
".$menu_brand_text."
\n"; } } - //domain name/selector + //domain name/selector (xs) if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) { - echo "\n"; + echo "".$_SESSION['domain_name']."\n"; } ?> @@ -461,20 +459,20 @@ } ?> - + "; + //domain name/selector (sm+) + if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') { + echo "".$_SESSION['domain_name'].""; + } + //logout icon + if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") { + $username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null); + echo ""; + unset($username_full); + } + echo ""; + ?>