diff --git a/queryframe.php b/queryframe.php index 085a8e93d..a468ef334 100644 --- a/queryframe.php +++ b/queryframe.php @@ -155,110 +155,86 @@ function set_focus_to_nav() { > -
+
+
- - - -
- phpMyAdmin -
- ' . "\n"; + echo ' '; + if (@file_exists($GLOBALS['pmaThemeImage'] . 'logo_left.png')) { + echo 'phpMyAdmin'; + } else if (@file_exists($GLOBALS['pmaThemeImage'] . 'pma_logo2.png')) { + echo 'phpMyAdmin'; } else { - echo ' ' - . '
' - . 'phpMyAdmin' - . '
' . "\n"; + echo 'phpMyAdmin'; } - echo '
'; + echo '' . "\n"; + echo '
' . "\n"; } // end of display logo -if ($cfg['MainPageIconic']) { - $str_spacer_links=''; -} else{ - $str_spacer_links=' - '; -} - ?> +?> -
' + echo ' ' . "\n" . ($cfg['MainPageIconic'] - ? '' . $strHome . '' - : '' . $strHome . '') - . ''; + : ' ' . $strHome . '') . "\n" + . ' ' . "\n"; // if we have chosen server if ($server != 0) { // Logout for advanced authentication if ($cfg['Server']['auth_type'] != 'config') { - echo $str_spacer_links; - echo '' + echo ($cfg['MainPageIconic'] ? '' : ' - '); + echo '' . "\n" . ($cfg['MainPageIconic'] ? '' . $strLogout . '' - : '' . $strLogout . '') - . ''; - } // end if + : '' . $strLogout . '') . "\n" + . '' . "\n"; + } // end if ($cfg['Server']['auth_type'] != 'config' - $anchor = 'querywindow.php?' . PMA_generate_common_url('', ''); - if ($cfg['QueryFrameJS']) { - $href = $anchor; - $target = ''; - $onclick = 'onclick="javascript:open_querywindow(this.href); return false;"'; - } else { - $href = $anchor; - $target = 'target="phpmain' . $hash . '"'; - $onclick = ''; - } - if ($cfg['MainPageIconic']) { - $query_frame_link_text = '' . $strQueryFrame . ''; - } else { - echo ($str_spacer_links != '' ? '
' : ''); - $query_frame_link_text = '' . $strQueryFrame . ''; - } - ?> - - - '; + } else { + echo '
' . "\n"; + $query_frame_link_text = '' . $strQueryFrame . ''; + } +?> + > + + +' - . '' - . '' . $strPmaDocumentation . '' - . ''; - echo '' - . '' - . 'MySQL - ' . $strDocu . '' - . ''; + echo ' ' . "\n" + . ' ' . $strPmaDocumentation . '' . "\n" + . ' ' . "\n"; + echo ' ' . "\n" + . ' MySQL - ' . $strDocu . '' . "\n" + . ' ' . "\n"; } +?> +
+
- ?> -
-
- - +?> -