[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2956-gc16138f

[Marc Delisle]

The branch, master has been updated
       via  c16138f9fd9b7c88ee412c0ef43419ef100ad0d8 (commit)
      from  c6493e39d36885d419d9cb8b930ccc8aedbf548d (commit)


- Log -----------------------------------------------------------------
commit c16138f9fd9b7c88ee412c0ef43419ef100ad0d8
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Jun 3 13:00:56 2011 -0400

    bug #3311170 [sync] Missing helper icons in Synchronize

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    1 +
 server_synchronize.php |   18 +++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30b414c..f6cea74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
 + rfe #3310562 Wording about Column
 
 3.4.3.0 (not yet released)
+- bug #3311170 [sync] Missing helper icons in Synchronize
 
 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/server_synchronize.php b/server_synchronize.php
index fa3a959..9ff9cd4 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -253,22 +253,18 @@ 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 id="serverstatustraffic" class="data" width = "60%">
+            echo '<table id="serverstatustraffic" class="data" width = "40%">
             <tr>
-            <td> <h2>'
-            . ($GLOBALS['cfg']['MainPageIconic']
-            ? '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"'
+            <td>'
+            . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"'
             . ' height="32" alt="" />'
-            : '')
             . __('Structure Synchronization')
-            .'</h2>' .'</td>';
-            echo '<td> <h2>'
-            . ($GLOBALS['cfg']['MainPageIconic']
-            ? '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"'
+            .'</td>';
+            echo '<td>'
+            . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"'
             . ' height="32" alt="" />'
-            : '')
             . __('Data Synchronization')
-            . '</h2>' .'</td>';
+            . '</td>';
             echo '</tr>
             </table>';
 


hooks/post-receive
-- 
phpMyAdmin