Compact export options

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@587 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/dump.inc.php b/dump.inc.php
index 786440132e434308ed44f83f9ea25b1eb7c1e470..c01a8074a37164364c7b25fb7058c5e10fcd6995 100644 (file)
--- a/dump.inc.php
+++ b/dump.inc.php
@@ -142,7 +142,7 @@ function check(td, name, value) {
 </script>
 
 <form action="" method="post">
-<p><?php echo $dump_options; ?></p>
+<p><?php echo lang('Output') . ": $dump_output " . lang('Format') . ": $dump_format"; ?> <input type="submit" value="<?php echo lang('Export'); ?>" /></p>
 
 <?php
 echo "<table border='1' cellspacing='0' cellpadding='2'>\n<thead><tr><th>" . lang('Database') . "</th>";
@@ -187,5 +187,4 @@ while ($row = $result->fetch_assoc()) {
 }
 echo "$views</table>\n";
 ?>
-<p><input type="submit" value="<?php echo lang('Export'); ?>" /></p>
 </form>

diff --git a/export.inc.php b/export.inc.php
index b404add39a9f20a9c6867b09c2980d305e0d9b17..25c0d6aaabe68398aa0899cad74a0b1f0f45e69b 100644 (file)
--- a/export.inc.php
+++ b/export.inc.php
@@ -171,5 +171,6 @@ function dump_headers($identifier, $multi_table = false) {
        return $ext;
 }
 
-$dump_options = lang('Output') . ": <select name='output'><option value='text'>" . lang('open') . "</option><option value='file'>" . lang('save') . "</option></select> " . lang('Format') . ": <select name='format'><option value='sql'>" . lang('SQL') . "</option><option value='csv'>" . lang('CSV') . "</option></select>";
+$dump_output = "<select name='output'><option value='text'>" . lang('open') . "</option><option value='file'>" . lang('save') . "</option></select>";
+$dump_format = "<select name='format'><option value='sql'>" . lang('SQL') . "</option><option value='csv'>" . lang('CSV') . "</option></select>";
 $max_packet = 0;

diff --git a/select.inc.php b/select.inc.php
index 51ab6826eadb0caf0cc2756a8e08e671325faa8c..b00068b3a7c0b2b42b8ac635aba2c29c51197aab 100644 (file)
--- a/select.inc.php
+++ b/select.inc.php
@@ -334,7 +334,7 @@ for (var i=0; <?php echo $i; ?> > i; i++) {
                        echo " (" . lang('%d row(s)', $found_rows) . ")</p>\n";
                        
                        echo ($_GET["db"] != "information_schema" ? "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' value='" . lang('Edit') . "' /> <input type='submit' name='clone' value='" . lang('Clone') . "' /> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm /></div></fieldset>\n" : "");
-                       echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_options <input type='submit' name='export' value='" . lang('Export') . "' /></div></fieldset>\n";
+                       echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output $dump_format <input type='submit' name='export' value='" . lang('Export') . "' /></div></fieldset>\n";
                }
                $result->free();
                echo "<fieldset><legend>" . lang('CSV Import') . "</legend><div><input type='hidden' name='token' value='$token' /><input type='file' name='csv_file' /> <input type='submit' name='import' value='" . lang('Import') . "' /></div></fieldset>\n";