3 Jun
2010
3 Jun
'10
3:14 p.m.
The branch, master has been updated
via f1f3b2a54ea1b7f695971f0e4a6a6db239f0121e (commit)
from fd7452915c8617e9eecf71dffd0b5293cd754674 (commit)
- Log -----------------------------------------------------------------
commit f1f3b2a54ea1b7f695971f0e4a6a6db239f0121e
Author: Lorikeet Lee <leelorik(a)gmail.com>
Date: Thu Jun 3 14:12:02 2010 +0200
patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
These things do not bring much added value and just take space.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
navigation.php | 14 --------------
2 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1c34496..2be237a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@ $Id$
+ [doc] Incorporate synchronisation docs into main document.
+ [core] Include Content Security Policy HTTP headers.
- bug #3004216 [CSS] Field attributes use inline CSS
+- patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value
diff --git a/navigation.php b/navigation.php
index 21ef320..909bc00 100644
--- a/navigation.php
+++ b/navigation.php
@@ -230,7 +230,6 @@ if (! $GLOBALS['server']) {
<div id="databaseList">
<form method="post" action="index.php"
target="_parent" id="left">
- <label for="lightm_db"><?php echo __('Database');
?></label>
<?php
echo PMA_generate_common_hidden_inputs() . "\n";
echo $GLOBALS['pma']->databases->getHtmlSelectGrouped(true,
$_SESSION['tmp_user_values']['navi_limit_offset'],
$GLOBALS['cfg']['MaxDbList']) . "\n";
@@ -299,19 +298,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] &&
strlen($GLOBALS['db'])) {
$db_tooltip = $GLOBALS['db'];
}
- ?>
- <p><a class="item"
- href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] .
'?' . $common_url_query; ?>"
- title="<?php echo htmlspecialchars($db_tooltip); ?>" >
- <?php
- if ($GLOBALS['text_dir'] === 'rtl') {
- echo ' <bdo dir="ltr">(' . $table_count .
')</bdo> ';
- }
- echo '<span class="navi_dbName">' .
htmlspecialchars($disp_name) . '</span>';
- if ($GLOBALS['text_dir'] === 'ltr') {
- echo ' <bdo dir="ltr">(' . $table_count .
')</bdo> ';
- }
- echo '</a></p>';
if ($table_count) {
?>
<span id="NavFilter">
hooks/post-receive
--
phpMyAdmin