Backported remaining part of rev 13423 and 13424 to QA_3_3

libraries/display_import_ajax.lib.php

@@ -31,7 +31,7 @@ $plugins = array(
 	   "uploadprogress",
 	   "apc",
 	   "noplugin"
-	   ); // available plugins. Each plugin has own checkfunction in upload_functions.php and own file with functions in upload_#KEY#.php
+	   ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php
 
 // select available plugin
 foreach ($plugins as $plugin) {
@@ -40,8 +40,8 @@ foreach ($plugins as $plugin) {
     if ($check()) {
         $_SESSION[$SESSION_KEY]["handler"] = $plugin;
         include_once("import/upload/" . $plugin . ".php");
-    break;
-  } 
+        break;
+    } 
 }
 
 /**

libraries/server_synchronize.lib.php

@@ -1334,7 +1334,7 @@ function PMA_displayQuery($query) {
 function PMA_syncDisplayHeaderSource($src_db) {
     echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0px; margin-bottom: 1em "> ';
 
-    echo '<table id="serverstatustraffic" class="data" width="55%">';
+    echo '<table id="serverstatusconnections" class="data" width="55%">';
     echo '<tr>';
     echo '<th>' . $GLOBALS['strDatabase_src'] . ':  ' . $src_db . '<br />(';
     if ('cur' == $_SESSION['src_type']) {

server_synchronize.php

@@ -255,7 +255,7 @@ if ((isset($_REQUEST['submit_connect']))) {
             */
             echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">'
             . PMA_generate_common_hidden_inputs('', '');
-            echo '<table class="data" width = "50%">
+            echo '<table id="serverstatustraffic" class="data" width = "60%">
             <tr>
             <td> <h2>' 
             . ($GLOBALS['cfg']['MainPageIconic']
@@ -455,7 +455,7 @@ if ((isset($_REQUEST['submit_connect']))) {
             *  This fieldset displays the checkbox to confirm deletion of previous rows from target tables 
             */
             echo '<fieldset>
-            <p><input type= "checkbox" name="delete_rows" id ="delete_rows" />' . $strTableDeleteRows . ' </p>
+            <p><input type= "checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' . $strTableDeleteRows . '</label> </p>
             </fieldset> 
             <fieldset class="tblFooters">';
             echo '<input type="button" name="apply_changes" value="' . $GLOBALS['strApplyChanges']
@@ -899,7 +899,7 @@ if (isset($_REQUEST['Table_ids'])) {
     *  This fieldset displays the checkbox to confirm deletion of previous rows from target tables 
     */
     echo '<fieldset>
-    <p><input type= "checkbox" name="delete_rows" id ="delete_rows" />' . $strTableDeleteRows . ' </p>
+    <p><input type="checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' . $strTableDeleteRows . '</label> </p>
     </fieldset>'; 
     
     echo '<fieldset class="tblFooters">';