nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #3055886 [config] update, changed boolean to integer for more precise control

Browse Source
This commit is contained in:
Herman van Rink
2010-12-02 16:31:49 +01:00
parent 2081a44d23
commit 8017a61253
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation.html
View File

@@ -1485,10 +1485,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are
linking to <tt>phpmyadmin.net</tt>.</dd>
<dt id="cfg_LeftDisplayTableFilter">$cfg['LeftDisplayTableFilter'] boolean</dt>
<dd>Defines whether or not to display a JavaScript filter box above the
<dt id="cfg_LeftDisplayTableFilterMinimum">$cfg['LeftDisplayTableFilterMinimum']
integer</dt>
<dd>Defines the minimum number of tables to display a JavaScript filter box above the
list of tables in the left frame.
Defaults to <tt>TRUE</tt>.</dd>
Defaults to <tt>30</tt>. To disable the filter completely some high number
can he used (e.g. 9999)</dd>
<dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
<dd>Defines whether or not to display a server choice at the top of the left frame.

5
libraries/config.default.php
View File

@@ -775,10 +775,11 @@ $cfg['LeftLogoLinkWindow'] = 'main';
/**
* display a JavaScript table filter in the left frame
* when more then x tables are present
*
* @global boolean $cfg['LeftDisplayTableFilter']
* @global boolean $cfg['LeftDisplayTableFilterMinimum']
*/
$cfg['LeftDisplayTableFilter'] = true;
$cfg['LeftDisplayTableFilterMinimum'] = 30;
/**
* display server choice at top of left frame

2
libraries/config/messages.inc.php
View File

@@ -264,7 +264,7 @@ $strConfigLeftDisplayLogo_desc = __('Show logo in left frame');
$strConfigLeftDisplayLogo_name = __('Display logo');
$strConfigLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
$strConfigLeftDisplayServers_name = __('Display servers selection');
$strConfigLeftDisplayTableFilter_name = __('Display table filter');
$strConfigLeftDisplayTableFilterMinimum_name = __('Mimimum number of tables to display table filter');
$strConfigLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels');
$strConfigLeftFrameDBSeparator_name = __('Database tree separator');
$strConfigLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)');

2
libraries/config/setup.forms.php
View File

@@ -170,7 +170,7 @@ $forms['Left_frame']['Left_databases'] = array(
'LeftFrameDBSeparator',
'ShowTooltipAliasDB');
$forms['Left_frame']['Left_tables'] = array(
'LeftDisplayTableFilter',
'LeftDisplayTableFilterMinimum',
'LeftDefaultTabTable',
'LeftFrameTableSeparator',
'LeftFrameTableLevel',

2
libraries/config/user_preferences.forms.php
View File

@@ -82,7 +82,7 @@ $forms['Left_frame']['Left_databases'] = array(
'LeftFrameDBSeparator',
'ShowTooltipAliasDB');
$forms['Left_frame']['Left_tables'] = array(
'LeftDisplayTableFilter',
'LeftDisplayTableFilterMinimum',
'LeftDefaultTabTable',
'LeftFrameTableSeparator',
'LeftFrameTableLevel',

2
navigation.php
View File

@@ -286,7 +286,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
$db_tooltip = $GLOBALS['db'];
}
if ($table_count && $GLOBALS['cfg']['LeftDisplayTableFilter']) {
if ($table_count >= $GLOBALS['cfg']['LeftDisplayTableFilterMinimum']) {
?>
<span id="NavFilter">
<input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" />