nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move server selection in main to the 'right' (below 'phpMyAdmin')

Browse Source
This commit is contained in:
Sebastian Mendel
2006-07-09 10:29:28 +00:00
parent ab281b2835
commit 5304e6330d
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -6,6 +6,10 @@ $Id$
$Source$ $Source$
2006-07-09 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/select_server.lib.php, main.php, libraries/left_header.inc.php:
move server selection in main to the 'right' (below 'phpMyAdmin')
2006-07-08 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-07-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* left.php, libraries/header_meta_style.inc.php, libraries/header.inc.php: * left.php, libraries/header_meta_style.inc.php, libraries/header.inc.php:
fix to remove scrollbar bug in IE without quirks mode fix to remove scrollbar bug in IE without quirks mode

3
libraries/left_header.inc.php
View File

@@ -85,6 +85,7 @@ echo '</div>' . "\n";
*/ */
if ($GLOBALS['cfg']['LeftDisplayServers'] && (count($GLOBALS['cfg']['Servers']) > 1 || $server == 0 && count($GLOBALS['cfg']['Servers']) == 1)) { if ($GLOBALS['cfg']['LeftDisplayServers'] && (count($GLOBALS['cfg']['Servers']) > 1 || $server == 0 && count($GLOBALS['cfg']['Servers']) == 1)) {
include('./libraries/select_server.lib.php'); include('./libraries/select_server.lib.php');
PMA_select_server(TRUE, TRUE); PMA_select_server(true, true);
echo '<hr />';
} // end if LeftDisplayServers } // end if LeftDisplayServers
?> ?>

4
libraries/select_server.lib.php
View File

@@ -99,9 +99,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
echo '<noscript>'; echo '<noscript>';
echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />'; echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
echo '</noscript>'; echo '</noscript>';
if ($ommit_fieldset) { if (! $ommit_fieldset) {
echo '<hr />';
} else {
echo '</fieldset>'; echo '</fieldset>';
} }
echo '</form>'; echo '</form>';

19
main.php
View File

@@ -54,15 +54,6 @@ if ($server > 0) {
<div id="mysqlmaininformation"> <div id="mysqlmaininformation">
<?php <?php
/**
* Displays the MySQL servers choice form
*/
if (!$cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
require_once './libraries/select_server.lib.php';
PMA_select_server(true, false);
}
if ($server > 0) { if ($server > 0) {
// robbat2: Use the verbose name of the server instead of the hostname // robbat2: Use the verbose name of the server instead of the hostname
// if a value is set // if a value is set
@@ -223,6 +214,16 @@ echo '<h1 xml:lang="en" dir="ltr">phpMyAdmin - ' . PMA_VERSION . '</h1>'
echo '<ul>' . "\n"; echo '<ul>' . "\n";
/**
* Displays the MySQL servers choice form
*/
if (!$cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
echo '<li id="li_select_server">';
require_once './libraries/select_server.lib.php';
PMA_select_server(true, true);
echo '</li>';
}
if ($server > 0) { if ($server > 0) {
PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(), PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(),
'li_mysql_client_version'); 'li_mysql_client_version');