[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-46-gf7a31e5
Madhura Jayaratne
madhuracj at users.sourceforge.net
Tue Oct 4 21:05:40 CEST 2011
The branch, QA_3_4 has been updated
via f7a31e5f4c71594a053c81ebac34d91ff930c51a (commit)
from e2349585451ae8641f4f20ddc9c5bd1bc7ecee98 (commit)
- Log -----------------------------------------------------------------
commit f7a31e5f4c71594a053c81ebac34d91ff930c51a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: Wed Oct 5 00:34:56 2011 +0530
bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/navigation_header.inc.php | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a285f45..edf76a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
3.4.7.0 (not yet released)
+- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index b549a02..a892c4f 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -97,15 +97,27 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
if ($GLOBALS['cfg']['MainPageIconic']) {
echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"'
.' alt="' . __('phpMyAdmin documentation') . '" />';
+ } else {
+ echo '<br />' . __('phpMyAdmin documentation');
}
echo '</a>';
- echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n";
+
+ $documentation_link = PMA_showMySQLDocu('', '', true);
+ if ($GLOBALS['cfg']['MainPageIconic']) {
+ echo $documentation_link . "\n";
+ } else {
+ preg_match('/<a[^>]*>/', $documentation_link, $matches);
+ $link = $matches[0];
+ echo substr($link, 0, strlen($link) - 1) . ' title="' . __('Documentation') . '" >'
+ . '<br />' . __('Documentation') . '</a>';
+ }
$params = array('uniqid' => uniqid());
if (!empty($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db'];
}
- echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">';
+ echo '<a href="navigation.php?' . PMA_generate_common_url($params)
+ . '" title="' . __('Reload navigation frame') . '" target="frame_navigation">';
if ($GLOBALS['cfg']['MainPageIconic']) {
echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
. ' title="' . __('Reload navigation frame') . '"'
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list