From f3c7ba930ac65e0ec053d42a7882d4143a779920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Sun, 5 May 2002 15:28:40 +0000
Subject: [PATCH] Nicer display

---
 ChangeLog                  |  2 +-
 tbl_properties_export.php3 | 63 ++++++++++++++++++++++++++++++--------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 327f8ff8a8..17210aa98b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@ $Source$
       Warit Wanasathian.
     * tbl_dump.php3; libraries/build_dump.lib.php3: enabled the ability to
       export only some records in xml format.
-    * tbl_properties_export.php3: xhtml fixes.
+    * tbl_properties_export.php3: nicer display.
     * ldi_table.php3; tbl_select.php3: added top menu.
 
 2002-05-05 Alexander M. Turek  <rabus@users.sourceforge.net>
diff --git a/tbl_properties_export.php3 b/tbl_properties_export.php3
index 400c278e74..0d590d8f08 100755
--- a/tbl_properties_export.php3
+++ b/tbl_properties_export.php3
@@ -10,23 +10,33 @@ require('./tbl_properties_table_info.php3');
 ?>
 
 <!-- Dump of a table -->
+<p align="center">
+    <?php echo $strViewDump . "\n"; ?>
+</p>
+
 <form method="post" action="tbl_dump.php3" name="tbl_dump">
     <input type="hidden" name="server" value="<?php echo $server; ?>" />
     <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
     <input type="hidden" name="db" value="<?php echo $db; ?>" />
     <input type="hidden" name="table" value="<?php echo $table; ?>" />
-    <?php echo $strViewDump; ?><br />
-    <table cellpadding="5" border="2">
+    <table cellpadding="5" border="2" align="center">
     <tr>
+
+        <!-- Formats to export to -->
         <td nowrap="nowrap">
+            <!-- SQL -->
             <input type="radio" name="what" value="structure" id="radio_dump_structure" checked="checked" />
             <label for="radio_dump_structure"><?php echo $strStrucOnly; ?></label>&nbsp;&nbsp;<br />
             <input type="radio" name="what" value="data" id="radio_dump_data" />
             <label for="radio_dump_data"><?php echo $strStrucData; ?></label>&nbsp;&nbsp;<br />
             <input type="radio" name="what" value="dataonly" id="radio_dump_dataonly" />
             <label for="radio_dump_dataonly"><?php echo $strDataOnly; ?></label>&nbsp;&nbsp;<br />
+            <br />
+            <!-- Excel CSV -->
             <input type="radio" name="what" value="excel" id="radio_dump_excel" />
             <label for="radio_dump_excel"><?php echo $strStrucExcelCSV; ?></label>&nbsp;&nbsp;<br />
+            <br />
+            <!-- General CSV -->
             <input type="radio" name="what" value="csv" id="radio_dump_csv" />
             <label for="radio_dump_csv"><?php echo $strStrucCSV;?></label>&nbsp;:<br />
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFieldsTerminatedBy; ?>&nbsp;
@@ -37,20 +47,24 @@ require('./tbl_properties_table_info.php3');
             <input type="text" name="escaped" size="2" value="\" class="textfield" />&nbsp;&nbsp;<br />
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strLinesTerminatedBy; ?>&nbsp;
             <input type="text" name="add_character" size="2" value="<?php echo ((PMA_whichCrlf() == "\n") ? '\n' : '\r\n'); ?>" class="textfield" />&nbsp;&nbsp;<br />
+            <br />
+            <!-- XML -->
             <input type="radio" name="what" value="xml" id="radio_dump_xml" />
             <label for="radio_dump_xml"><?php echo $strExportToXML; ?></label>&nbsp;&nbsp;
         </td>
+
+        <!-- Options -->
         <td valign="middle">
+            <!-- For structure -->
+            <?php echo $strStructure; ?><br />
+            &nbsp;&nbsp;
             <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" />
             <label for="checkbox_dump_drop"><?php echo $strStrucDrop; ?></label><br />
-            <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" />
-            <label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label><br />
-            <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" />
-            <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br />
 <?php
 // Add backquotes checkbox
 if (PMA_MYSQL_INT_VERSION >= 32306) {
     ?>
+            &nbsp;&nbsp;
             <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" />
             <label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label><br />
     <?php
@@ -58,6 +72,22 @@ if (PMA_MYSQL_INT_VERSION >= 32306) {
 echo "\n";
 ?>
             <br />
+            <!-- For data -->
+            <?php echo $strData; ?><br />
+            &nbsp;&nbsp;
+            <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" />
+            <label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label><br />
+            &nbsp;&nbsp;
+            <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" />
+            <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br />
+            &nbsp;&nbsp;
+            <?php echo sprintf($strDumpXRows , '<input type="text" name="limit_to" size="5" value="' . PMA_countRecords($db, $table, TRUE) . '" class="textfield" style="vertical-align: middle" onfocus="this.select()" />' , '<input type="text" name="limit_from" value="0" size="5" class="textfield" style="vertical-align: middle" onfocus="this.select()" />') . "\n"; ?>
+        </td>
+    </tr>
+
+    <tr>
+        <!-- Export to screen or to file -->
+        <td colspan="2" align="center">
             <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" onclick="return checkTransmitDump(this.form, 'transmit')" />
             <label for="checkbox_dump_asfile"><?php echo $strSend; ?></label>
 <?php
@@ -92,20 +122,27 @@ if (PMA_PHP_INT_VERSION >= 40004) {
     }
 }
 echo "\n";
-
-// Encoding setting form appended by Y.Kawada
-if (function_exists('PMA_set_enc_form')) {
-    echo '<br />' . "\n"
-         . PMA_set_enc_form('            ');
-}
 ?>
         </td>
     </tr>
+
+<?php
+// Encoding setting form appended by Y.Kawada
+if (function_exists('PMA_set_enc_form')) {
+    ?>
     <tr>
+        <!-- Japanese encoding setting -->
         <td colspan="2">
-            &nbsp;<?php echo sprintf($strDumpXRows , '<input type="text" name="limit_to" size="5" value="' . PMA_countRecords($db, $table, TRUE) . '" class="textfield" style="vertical-align: middle" onfocus="this.select()" />' , '<input type="text" name="limit_from" value="0" size="5" class="textfield" style="vertical-align: middle" onfocus="this.select()" />') . "\n"; ?>
+    <?php
+    echo PMA_set_enc_form('            ');
+    ?>
         </td>
     </tr>
+    <?php
+}
+echo "\n";
+?>
+
     <tr>
         <td colspan="2" align="center">
             <input type="submit" value="<?php echo $strGo; ?>" />