Remember state of navigation panel

The NavigationPanel width is now 0 when panel should be collapsed.

Issue #13466
Fixes #13397

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-11-28 16:06:26 +01:00
parent d76606a869
commit 48c0a1081d
6 changed files with 8 additions and 4 deletions

View File

@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
- issue #13722 DisableIS is not fully honored
- issue #6197 Added support for authentication using U2F and 2FA
- issue #13480 Avoid removing cookies on upgrade
- issue #13397 Remember state of navigation panel
4.7.6 (not yet released)
- issue #13517 Fixed check all interaction with filtering

View File

@ -2094,12 +2094,12 @@ Navigation panel setup
Whether to show events under database in the navigation panel.
.. config:option:: $cfg['NavigationWdith']
.. config:option:: $cfg['NavigationWidth']
:type: integer
:default: 240
Navigation panel width.
Navigation panel width, set to 0 to collapse it by default.
Main panel

View File

@ -1253,6 +1253,7 @@ var ResizeHandler = function () {
if (width === 0 && panel_width === 0) {
panel_width = 240;
}
configSet('NavigationWidth', panel_width);
event.data.resize_handler.setWidth(panel_width);
event.data.resize_handler.panel_width = width;
};

View File

@ -770,6 +770,8 @@ class Descriptions
return __('Show databases navigation as tree');
case 'NavigationWidth_name':
return __('Navigation panel width');
case 'NavigationWidth_desc':
return __('Set to 0 to collapse navigation panel.');
case 'NavigationLinkWithMainPanel_desc':
return __('Link with main panel by highlighting the current database or table.');
case 'NavigationLinkWithMainPanel_name':

View File

@ -1048,7 +1048,7 @@ $cfg['NavigationTreeShowEvents'] = true;
/**
* Width of navigation panel
*
* @global boolean $cfg['NavigationWidth']
* @global integer $cfg['NavigationWidth']
*/
$cfg['NavigationWidth'] = 240;

View File

@ -256,7 +256,7 @@ $cfg_db['_validators'] = array(
'MaxTableList' => 'validatePositiveNumber',
'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')),
'NavigationTreeTableLevel' => 'validatePositiveNumber',
'NavigationWidth' => 'validatePositiveNumber',
'NavigationWidth' => 'validateNonNegativeNumber',
'QueryHistoryMax' => 'validatePositiveNumber',
'RepeatCells' => 'validateNonNegativeNumber',
'Server' => 'validateServer',