[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20731-g0cacdc7 - Git

4 Oct 2011

The branch, master has been updated
       via  0cacdc7fca2b1a080987cb111ff14eaa9a0617ef (commit)
       via  f7a31e5f4c71594a053c81ebac34d91ff930c51a (commit)
      from  306901394e3e8960d3f212234ee99589a5311fed (commit)
- Log -----------------------------------------------------------------
commit 0cacdc7fca2b1a080987cb111ff14eaa9a0617ef
Merge: 3069013 f7a31e5
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Wed Oct 5 00:42:56 2011 +0530
Merge branch 'QA_3_4'
Conflicts:
    	libraries/navigation_header.inc.php
-----------------------------------------------------------------------
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 8ced7db..69ac90e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@ phpMyAdmin - ChangeLog
 - bug #3356456 [interface] Interface problems for queries having LIMIT clauses
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 a821a63..6e5ecf2 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -92,15 +92,27 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
if ($GLOBALS['cfg']['MainPageIconic']) {
         echo PMA_getImage('b_docs.png', __('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 PMA_getImage('s_reload', __('Reload navigation frame'));
     } else {
hooks/post-receive
-- 
phpMyAdmin


    