Add configuration option ShowNavigationAsTree with true as default

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
phpmyadmin · Jan 15, 2015 · 2abe91a · 2abe91a
1 parent ca62fa6
commit 2abe91a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
@@ -237,6 +237,7 @@ public function getJsParams()
             'db'    => $db,
             'token' => $_SESSION[' PMA_token '],
             'text_dir' => $GLOBALS['text_dir'],
+            'show_navigation_as_tree'=> $GLOBALS['cfg']['ShowNavigationAsTree'],
             'pma_absolute_uri' => $GLOBALS['cfg']['PmaAbsoluteUri'],
             'pma_text_default_tab' => PMA_Util::getTitleForTarget(
                 $GLOBALS['cfg']['DefaultTabTable']

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -810,6 +810,13 @@
  * Navigation panel setup
  */
 
+/**
+ * Whether to display navigation panel as tree or as pre-4.0 style
+ *
+ * @global boolean $cfg['ShowNavigationAsTree']
+ */
+$cfg['ShowNavigationAsTree'] = true;
+
 /**
  * maximum number of first level databases displayed in navigation panel
  *

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
@@ -415,6 +415,8 @@
     . '([kbd]0[/kbd] for no limit).'
 );
 $strConfigMemoryLimit_name = __('Memory limit');
+$strConfigShowNavigationAsTree_desc = __('Whether to display navigation panel in tree style or in pre-4.0 style');
+$strConfigShowNavigationAsTree_name = __('Show Navigation as tree');
 $strConfigNavigationLinkWithMainPanel_desc = __('Link with main panel by highlighting the current database or table.');
 $strConfigNavigationLinkWithMainPanel_name = __('Link with main panel');
 $strConfigNavigationDisplayLogo_desc = __('Show logo in navigation panel.');

diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
@@ -162,6 +162,7 @@
     'ShowAsPHP',
     'Refresh'));
 $forms['Navi_panel']['Navi_panel'] = array(
+    'ShowNavigationAsTree',
     'NavigationLinkWithMainPanel',
     'NavigationDisplayLogo',
     'NavigationLogoLink',

diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
@@ -73,6 +73,7 @@
     'SQLQuery/ShowAsPHP',
     'SQLQuery/Refresh');
 $forms['Navi_panel']['Navi_panel'] = array(
+    'ShowNavigationAsTree',
     'NavigationLinkWithMainPanel',
     'NavigationDisplayLogo',
     'NavigationLogoLink',