diff options
author | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-06-27 20:23:59 +0400 |
---|---|---|
committer | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-06-27 20:23:59 +0400 |
commit | 39d37fafcce29160c4dfe6ef7696de19bebb1d18 (patch) | |
tree | 3f6b5030d805fb3d5ccbdcf10ab680e7cd12dffa /navigation.php | |
parent | 1cc49d32d94d8981e427a32900dc61ae6ec90149 (diff) | |
parent | f2057c47511c6b3c7d75b167c5abcaab1695675b (diff) |
Resolved conflicts
Diffstat (limited to 'navigation.php')
-rw-r--r-- | navigation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/navigation.php b/navigation.php index d7a77593c2..c418fd5607 100644 --- a/navigation.php +++ b/navigation.php @@ -168,8 +168,8 @@ if (! $GLOBALS['server']) { if (count($GLOBALS['pma']->databases) >= $GLOBALS['cfg']['LeftDisplayDatabaseFilterMinimum']) { ?> <span id="NavDbFilter"> - <span id="clear_fast_db_filter" title="<?php echo __('Clear'); ?>">X</span> <input type="text" class="gray" name="fast_db_filter" id="fast_db_filter" title="<?php echo __('Filter databases by name'); ?>" value="<?php echo __('Filter databases by name'); ?>" /> + <span id="clear_fast_db_filter" title="<?php echo __('Clear'); ?>">X</span> </span> <?php } @@ -240,8 +240,8 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { if ($table_count >= $GLOBALS['cfg']['LeftDisplayTableFilterMinimum']) { ?> <span id="NavFilter"> - <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span> <input type="text" class="gray" name="fast_filter" id="fast_filter" title="<?php echo __('Filter tables by name'); ?>" value="<?php echo __('Filter tables by name'); ?>" /> + <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span> </span> <?php } |