From e352f478dc62cca5dad09fa0e76416c51eb2053b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Sun, 5 May 2002 14:11:11 +0000
Subject: [PATCH] Added top menu

---
 ChangeLog       |  1 +
 ldi_table.php3  |  9 ++++++---
 tbl_select.php3 | 24 +++++++++++++-----------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7eef1daa..327f8ff8a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ $Source$
     * 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.
+    * ldi_table.php3; tbl_select.php3: added top menu.
 
 2002-05-05 Alexander M. Turek  <rabus@users.sourceforge.net>
     * db_details_links.php3, tbl_properties_links.php3, lang/*.inc.php3:
diff --git a/ldi_table.php3 b/ldi_table.php3
index ff24702b1..2ec5e4fef 100755
--- a/ldi_table.php3
+++ b/ldi_table.php3
@@ -8,10 +8,12 @@
 
 
 /**
- * Gets some core libraries
+ * Gets some core libraries and displays links
  */
-require('./libraries/grab_globals.lib.php3');
-require('./header.inc.php3');
+require('./tbl_properties_common.php3');
+$err_url   = 'ldi_table.php3' . $err_url;
+$url_query .= '&amp;back=ldi_table.php3';
+require('./tbl_properties_table_info.php3');
 
 
 /**
@@ -79,6 +81,7 @@ if (function_exists('PMA_set_enc_form')) {
             <input type="hidden" name="table" value="<?php echo $table; ?>" />
             <input type="hidden" name="zero_rows" value="<?php echo $strTheContent; ?>" />
             <input type="hidden" name="goto" value="tbl_properties.php3" />
+            <input type="hidden" name="back" value="ldi_table.php3" />
             <input type="hidden" name="into_table" value="<?php echo $table; ?>" />
             <input type="submit" name="btnLDI" value="<?php echo $strSubmit; ?>" />&nbsp;&nbsp;
             <input type="reset" value="<?php echo $strReset; ?>" />
diff --git a/tbl_select.php3 b/tbl_select.php3
index 47b5ca722..a7ee6b266 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -9,21 +9,22 @@ require('./libraries/grab_globals.lib.php3');
 require('./libraries/common.lib.php3');
 
 
-/**
- * Defines the url to return to in case of error in a sql statement
- */
-$err_url = $goto
-         . '?lang=' . $lang
-         . '&amp;server=' . $server
-         . '&amp;db=' . urlencode($db)
-         . '&amp;table=' . urlencode($table);
-
-
 /**
  * Not selection yet required -> displays the selection form
  */
 if (!isset($param) || $param[0] == '') {
-    include('./header.inc.php3');
+    // Gets some core libraries
+    include('./tbl_properties_common.php3');
+    $err_url   = 'tbl_select.php3' . $err_url;
+    $url_query .= '&amp;back=tbl_select.php3';
+    include('./tbl_properties_table_info.php3');
+
+    // Defines the url to return to in case of error in the next sql statement
+    $err_url   = $goto
+               . '?lang=' . $lang
+               . '&amp;server=' . $server
+               . '&amp;db=' . urlencode($db)
+               . '&amp;table=' . urlencode($table);
 
     // Gets the list and number of fields
     $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
@@ -59,6 +60,7 @@ if (!isset($param) || $param[0] == '') {
     <input type="hidden" name="db" value="<?php echo $db; ?>" />
     <input type="hidden" name="table" value="<?php echo $table; ?>" />
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
+    <input type="hidden" name="back" value="tbl_select.php3" />
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <?php echo $strSelectFields; ?>&nbsp;:<br />
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;