From 5304e6330de58313fa481cae0f0ebb86c9800d6c Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Sun, 9 Jul 2006 10:29:28 +0000
Subject: [PATCH] move server selection in main to the 'right' (below
 'phpMyAdmin')

---
 ChangeLog                       |  4 ++++
 libraries/left_header.inc.php   |  3 ++-
 libraries/select_server.lib.php |  4 +---
 main.php                        | 19 ++++++++++---------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50786ed46..636e92e08 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ $Id$
 $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>
     * left.php, libraries/header_meta_style.inc.php, libraries/header.inc.php:
       fix to remove scrollbar bug in IE without quirks mode
diff --git a/libraries/left_header.inc.php b/libraries/left_header.inc.php
index cbcf37523..4499adb06 100644
--- a/libraries/left_header.inc.php
+++ b/libraries/left_header.inc.php
@@ -85,6 +85,7 @@ echo '</div>' . "\n";
  */
 if ($GLOBALS['cfg']['LeftDisplayServers'] && (count($GLOBALS['cfg']['Servers']) > 1 || $server == 0 && count($GLOBALS['cfg']['Servers']) == 1)) {
     include('./libraries/select_server.lib.php');
-    PMA_select_server(TRUE, TRUE);
+    PMA_select_server(true, true);
+    echo '<hr />';
 } // end if LeftDisplayServers
 ?>
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 82ca6abd3..0be2de6f5 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -99,9 +99,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
         echo '<noscript>';
         echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
         echo '</noscript>';
-        if ($ommit_fieldset) {
-            echo '<hr />';
-        } else {
+        if (! $ommit_fieldset) {
             echo '</fieldset>';
         }
         echo '</form>';
diff --git a/main.php b/main.php
index e120b3cab..bb587f8d5 100644
--- a/main.php
+++ b/main.php
@@ -54,15 +54,6 @@ if ($server > 0) {
 
     <div id="mysqlmaininformation">
 <?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) {
     // robbat2: Use the verbose name of the server instead of the hostname
     //          if a value is set
@@ -223,6 +214,16 @@ echo '<h1 xml:lang="en" dir="ltr">phpMyAdmin - ' . PMA_VERSION . '</h1>'
 
 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) {
     PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(),
         'li_mysql_client_version');