diff options
Diffstat (limited to 'libraries/navigation_header.inc.php')
-rw-r--r-- | libraries/navigation_header.inc.php | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 24f2f78eb7..21f74e2dbb 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -55,57 +55,34 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { <?php echo '<a href="main.php?' . $query_url . '"' .' title="' . __('Home') . '">' - .($GLOBALS['cfg']['MainPageIconic'] - ? PMA_getImage('b_home.png', __('Home')) - : __('Home')) + . PMA_getImage('b_home.png', __('Home')) .'</a>' . "\n"; // if we have chosen server if ($server != 0) { // Logout for advanced authentication if ($GLOBALS['cfg']['Server']['auth_type'] != 'config') { - echo ($GLOBALS['cfg']['MainPageIconic'] ? '' : ' - '); echo '<a href="index.php?' . $query_url . '&old_usr=' .urlencode($PHP_AUTH_USER) . '" target="_parent"' .' title="' . __('Log out') . '" >' - .($GLOBALS['cfg']['MainPageIconic'] - ? PMA_getImage('s_loggoff.png', __('Log out')) - : __('Log out')) + . PMA_getImage('s_loggoff.png', __('Log out')) .'</a>' . "\n"; } // end if ($GLOBALS['cfg']['Server']['auth_type'] != 'config' $anchor = 'querywindow.php?' . PMA_generate_common_url($db, $table); - if ($GLOBALS['cfg']['MainPageIconic']) { - $query_frame_link_text = PMA_getImage('b_selboard.png', __('Query window')); - } else { - echo '<br />' . "\n"; - $query_frame_link_text = __('Query window'); - } echo '<a href="' . $anchor . '&no_js=true"' .' title="' . __('Query window') . '"'; echo ' onclick="if (window.parent.open_querywindow()) return false;"'; - echo '>' . $query_frame_link_text . '</a>' . "\n"; + echo '>' . PMA_getImage('b_selboard.png', __('Query window')) . '</a>' . "\n"; } // end if ($server != 0) echo ' <a href="Documentation.html" target="documentation"' .' title="' . __('phpMyAdmin documentation') . '" >'; - if ($GLOBALS['cfg']['MainPageIconic']) { - echo PMA_getImage('b_docs.png', __('phpMyAdmin documentation')); - } else { - echo '<br />' . __('phpMyAdmin documentation'); - } + echo PMA_getImage('b_docs.png', __('phpMyAdmin documentation')); echo '</a>'; - $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>'; - } + echo PMA_showMySQLDocu('', '', true) . "\n"; $params = array('uniqid' => uniqid()); if (!empty($GLOBALS['db'])) { @@ -113,11 +90,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { } 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.png', __('Reload navigation frame')); - } else { - echo '<br />' . __('Reload navigation frame'); - } + echo PMA_getImage('s_reload.png', __('Reload navigation frame')); echo '</a>'; echo '</div>' . "\n"; |