Revert compact dump output (r1012)

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

diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
index 963cae821cc559633679dfdd9c841811c4a74763..89f874f14123a52450a9f58377608a138f24891f 100644 (file)
--- a/adminer/include/export.inc.php
+++ b/adminer/include/export.inc.php
@@ -154,7 +154,6 @@ function dump_headers($identifier, $multi_table = false) {
        return $ext;
 }
 
-$dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>"
-       . " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>"
-;
+$dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>";
+$dump_format = "<select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>";
 $max_packet = 1048576; // default, minimum is 1024

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 12ae373e13d3f8758eff922159bc377aff12d5c0..65e9119b36dd1c276de1b1efbc02802623b11b2f 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Výstup',
        'open' => 'otevřít',
        'save' => 'uložit',
+       'Format' => 'Formát',
        'Tables' => 'Tabulky',
        'Data' => 'Data',
        'Event has been dropped.' => 'Událost byla odstraněna.',

diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 257b7728b6884de0de1cb2f9516b5280909075eb..209133a783461b6cf9d6c854ddcd99b7e7935046 100644 (file)
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Ergebnis',
        'open' => 'anzeigen',
        'save' => 'Datei',
+       'Format' => 'Format',
        'Tables' => 'Tabellen',
        'Data' => 'Daten',
        'Event has been dropped.' => 'Ereignis entfernt.',

diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index 9e5ac875e23ff80e6ec8f62a55d0e1e659ad89f6..f8b89fec145fb33e43912c503e96ed67f5f26ac3 100644 (file)
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Salida',
        'open' => 'mostrar',
        'save' => 'archivo',
+       'Format' => 'Formato',
        'Tables' => 'Tablas',
        'Data' => 'Datos',
        'Event has been dropped.' => 'Evento eliminado.',

diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index 1a630c0bfe0f1dd922fe0000da249fe8ff31a278..1076d0e59d2e7333233ed71f092dfbb14ec1ee44 100644 (file)
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Väljund',
        'open' => 'näita brauseris',
        'save' => 'salvesta failina',
+       'Format' => 'Formaat',
        'Functions' => 'Funktsioonid',
        'Aggregation' => 'Liitmine',
        'Event has been dropped.' => 'Sündmus on edukalt kustutatud.',

diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index 32ac31c91d83c5db31730b3b1ce48d7635fb0249..e1b79ccc9b4ce86fe17d40027b1c06eff45a5f27 100644 (file)
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Sortie',
        'open' => 'ouvrir',
        'save' => 'sauvegarder',
+       'Format' => 'Formatter',
        'Functions' => 'Fonctions',
        'Aggregation' => 'Agrégation',
        'Event has been dropped.' => 'L\'évènement a été supprimé.',

diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index f7b9719d819db8c047115eddd417101fabe3edcc..5855011f58d90e0442b59a6f963a98b20c16c253 100644 (file)
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Risultato',
        'open' => 'apri',
        'save' => 'salva',
+       'Format' => 'Formato',
        'Tables' => 'Tabelle',
        'Data' => 'Dati',
        'Event has been dropped.' => 'Evento eliminato.',

diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 3860d4953cdd5af77b82e376a8bae4eac7f3ee8b..91d4eff2fa4348f3a7262c296fac2ac63778d2d9 100644 (file)
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Uitvoer',
        'open' => 'openen',
        'save' => 'opslaan',
+       'Format' => 'Formaat',
        'Functions' => 'Functies',
        'Aggregation' => 'Totalen',
        'Event has been dropped.' => 'Event werd verwijderd.',

diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index ed4a662a4da1aacfb8b3161b6869db0e7c06395e..925db8fcd54d2d629ef4e644b32372e05ea49276 100644 (file)
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Выходные данные',
        'open' => 'открыть',
        'save' => 'сохранить',
+       'Format' => 'Формат',
        'Tables' => 'Таблицы',
        'Data' => 'Данные',
        'Event has been dropped.' => 'Событие было удалено.',

diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index 9ff4cfdc79a516304028a76c46380629e2730df9..c90dfcb9fdfd0e5e27348b3d2ba05257a4496fe2 100644 (file)
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => 'Výstup',
        'open' => 'otvoriť',
        'save' => 'uložiť',
+       'Format' => 'Formát',
        'Tables' => 'Tabuľky',
        'Data' => 'Dáta',
        'Event has been dropped.' => 'Udalosť bola odstránená.',

diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php
index a1a2258634ff1a16c15575bb8f1a40afabd2a2b5..4c00d15b40f21bf31c9e3099b88ef41697f7fd06 100644 (file)
--- a/adminer/lang/zh-tw.inc.php
+++ b/adminer/lang/zh-tw.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => '輸出',
        'open' => '打開',
        'save' => '儲存',
+       'Format' => '格式',
        'Functions' => '函數',
        'Aggregation' => '集合',
        'Event has been dropped.' => '已丟棄事件。',

diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index 57f9756d45b190d8bd6f0ccc18e5e99b233ceee7..fe6e6d4839552f4b36c4ee26c37dca7def815412 100644 (file)
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -151,6 +151,7 @@ $translations = array(
        'Output' => '输出',
        'open' => '打开',
        'save' => '保存',
+       'Format' => '格式',
        'Functions' => '函数',
        'Aggregation' => '集合',
        'Event has been dropped.' => '已丢弃事件。',

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 9a7ebe9aeb5efa28078313daa8398cf69f8a91e0..aa2a7068a34243f693c74ed979efb7cb6bb0bd8c 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -297,7 +297,7 @@ if (!$columns) {
                        echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";
                        
                        echo (information_schema($_GET["db"]) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' name='edit' 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_output <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";
                }
                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";
                

diff --git a/editor/include/export.inc.php b/editor/include/export.inc.php
index cc52b224187797684000320d9e867280eaf249c0..063835ecdabed8bedf91244a6c7750f2292aab7e 100644 (file)
--- a/editor/include/export.inc.php
+++ b/editor/include/export.inc.php
@@ -21,4 +21,5 @@ function dump_headers($identifier) {
        return $ext;
 }
 
-$dump_output = "CSV";
+$dump_output = "";
+$dump_format = "CSV";