From 41d9e77a5b65d3bbedcf585f7f2db722f51dea9a Mon Sep 17 00:00:00 2001 From: Nettika Date: Mon, 21 Apr 2025 20:40:48 -0700 Subject: [PATCH] Expand navigation bar Gray out trivial database names --- libraries/List_Database.class.php | 13 +++++++++++++ navigation.php | 27 +------------------------- themes/original/css/theme_left.css.php | 23 ++++++++++++++++++---- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index c29cc9dce..de7c71493 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -27,6 +27,16 @@ require_once './libraries/List.class.php'; */ /*public*/ class PMA_List_Database extends PMA_List { + /** + * @var array list of trivial database names + */ + protected $_trivial_db_names = array( + 'information_schema', + 'mysql', + 'performance_schema', + 'sys', + ); + /** * @var mixed database link resource|object to be used */ @@ -387,6 +397,9 @@ require_once './libraries/List.class.php'; if (! empty($db['comment'])) { $return .= ' title="' . htmlspecialchars($db['comment']) . '"'; } + if (in_array($db['name'], $this->_trivial_db_names)) { + $return .= ' class="trivial"'; + } $return .= ' href="index.php?' . PMA_generate_common_url($db['name']) . '" target="_parent">'; if ($cut) { diff --git a/navigation.php b/navigation.php index 5177d01bd..ce1855247 100644 --- a/navigation.php +++ b/navigation.php @@ -187,37 +187,12 @@ if (! $GLOBALS['server']) { echo '

' . __('No databases') . '

'; PMA_exitNavigationFrame(); } elseif ($GLOBALS['cfg']['LeftFrameLight'] && count($GLOBALS['pma']->databases) > 1) { - $list = $cfg['DisplayDatabasesList']; - if ($list === 'auto') { - if (empty($GLOBALS['db'])) { - $list = true; - } else { - $list = false; - } - } - if (!$list) { - // more than one database available and LeftFrameLight is true - // display db selectbox - // - // Light mode -> beginning of the select combo for databases - // Note: When javascript is active, the frameset will be changed from - // within navigation.php. With no JS (