first found of making action/cancel buttons consistent per markus' request. also...

diff --git a/BUGS b/BUGS
index 630cf0e19e1541bc9fa3dc115196e2acb57d8073..f6903deef28e6b4fbda34e5646050e08052cee62 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -6,3 +6,6 @@
 * Add owner everywhere
 * Cancel/<Action> buttons everywhere
 * pg_dump feature!!!
+* reports - unindexed fk's
+         - slow indexes
+

diff --git a/lang/english.php b/lang/english.php
index 8bef480064d56900589e0974938ff656d3e2b8d1..2bad7977a9795b25394be64d0ce6c0c562ca0b23 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.93 2003/08/06 07:04:45 chriskl Exp $
+        * $Id: english.php,v 1.94 2003/08/07 06:19:26 chriskl Exp $
         */
 
        // Language and character set
@@ -146,14 +146,14 @@
        $lang['strconfdeleterow'] = 'Are you sure you want to delete this row?';
        $lang['strrowdeleted'] = 'Row deleted.';
        $lang['strrowdeletedbad'] = 'Row deletion failed.';
-       $lang['strsaveandrepeat'] = 'Save & Repeat';
+       $lang['strsaveandrepeat'] = 'Insert & Repeat';
        $lang['strfield'] = 'Field';
        $lang['strfields'] = 'Fields';
        $lang['strnumfields'] = 'Num. Of Fields';
        $lang['strfieldneedsname'] = 'You must name your field';
        $lang['strselectneedscol'] = 'You must show at least one column';
        $lang['straltercolumn'] = 'Alter Column';
-       $lang['strcolumnaltered'] = 'Column Altered.';
+       $lang['strcolumnaltered'] = 'Column altered.';
        $lang['strcolumnalteredbad'] = 'Column altering failed.';
        $lang['strconfdropcolumn'] = 'Are you sure you want to drop column "%s" from table "%s"?';
        $lang['strcolumndropped'] = 'Column dropped.';
@@ -232,8 +232,8 @@
        $lang['strdatabase'] = 'Database';
        $lang['strdatabases'] = 'Databases';
        $lang['strshowalldatabases'] = 'Show all databases';
-       $lang['strnodatabase'] = 'No Database found.';
-       $lang['strnodatabases'] = 'No Databases found.';
+       $lang['strnodatabase'] = 'No database found.';
+       $lang['strnodatabases'] = 'No databases found.';
        $lang['strcreatedatabase'] = 'Create database';
        $lang['strdatabasename'] = 'Database name';
        $lang['strdatabaseneedsname'] = 'You must give a name for your database.';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index b66305f1134094e903db7585f844f2213e7af720..09f09cd8598c37164fcd63d20245b98d80e87910 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.45 2003/08/06 07:04:46 chriskl Exp $
+        * $Id: english.php,v 1.46 2003/08/07 06:19:26 chriskl Exp $
         */
 
        // Language and character set
@@ -146,14 +146,14 @@
        $lang['strconfdeleterow'] = 'Are you sure you want to delete this row?';
        $lang['strrowdeleted'] = 'Row deleted.';
        $lang['strrowdeletedbad'] = 'Row deletion failed.';
-       $lang['strsaveandrepeat'] = 'Save & Repeat';
+       $lang['strsaveandrepeat'] = 'Insert & Repeat';
        $lang['strfield'] = 'Field';
        $lang['strfields'] = 'Fields';
        $lang['strnumfields'] = 'Num. Of Fields';
        $lang['strfieldneedsname'] = 'You must name your field';
        $lang['strselectneedscol'] = 'You must show at least one column';
        $lang['straltercolumn'] = 'Alter Column';
-       $lang['strcolumnaltered'] = 'Column Altered.';
+       $lang['strcolumnaltered'] = 'Column altered.';
        $lang['strcolumnalteredbad'] = 'Column altering failed.';
        $lang['strconfdropcolumn'] = 'Are you sure you want to drop column "%s" from table "%s"?';
        $lang['strcolumndropped'] = 'Column dropped.';
@@ -232,8 +232,8 @@
        $lang['strdatabase'] = 'Database';
        $lang['strdatabases'] = 'Databases';
        $lang['strshowalldatabases'] = 'Show all databases';
-       $lang['strnodatabase'] = 'No Database found.';
-       $lang['strnodatabases'] = 'No Databases found.';
+       $lang['strnodatabase'] = 'No database found.';
+       $lang['strnodatabases'] = 'No databases found.';
        $lang['strcreatedatabase'] = 'Create database';
        $lang['strdatabasename'] = 'Database name';
        $lang['strdatabaseneedsname'] = 'You must give a name for your database.';

diff --git a/tables.php b/tables.php
index 4b017947842a937bbebe4d9920e53f7659122eef..6c960484e00c61a931756e4df5b1862d0f9caec4 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.29 2003/08/06 07:04:43 chriskl Exp $
+        * $Id: tables.php,v 1.30 2003/08/07 06:19:25 chriskl Exp $
         */
 
        // Include application functions
@@ -47,7 +47,7 @@
                                echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
                                echo $misc->form;
                                echo "<input type=\"submit\" value=\"{$lang['strnext']}\" />\n";
-                               echo "<input type=\"reset\" value=\"{$lang['strreset']}\" /></p>\n";
+                               echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                                echo "</form>\n";
                                break;
                        case 2:
@@ -117,7 +117,7 @@
                                        echo "<input type=\"hidden\" name=\"withoutoids\" value=\"on\" />\n";
                                }
                                echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
-                               echo "<input type=\"reset\" value=\"{$lang['strreset']}\" /></p>\n";
+                               echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                                echo "</form>\n";
                                                                
                                break;
@@ -161,8 +161,6 @@
                                global $lang;
                                echo "<p>{$lang['strinvalidparam']}</p>\n";
                }
-                                       
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowalltables']}</a></p>\n";
        }
 
        /**
@@ -314,7 +312,7 @@
                        echo "<input type=\"hidden\" name=\"action\" value=\"insertrow\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo $misc->form;
-                       echo "<p><input type=\"submit\" name=\"save\" value=\"{$lang['strsave']}\" />\n";
+                       echo "<p><input type=\"submit\" name=\"save\" value=\"{$lang['strinsert']}\" />\n";
                        echo "<input type=\"submit\" name=\"saveandrepeat\" value=\"{$lang['strsaveandrepeat']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                        echo "</form>\n";
@@ -357,7 +355,7 @@
                        echo "<input type=hidden name=action value=empty>\n";
                        echo "<input type=hidden name=table value=\"", htmlspecialchars($_REQUEST['table']), "\">\n";
                        echo $misc->form;
-                       echo "<input type=submit name=yes value=\"{$lang['stryes']}\"> <input type=submit name=no value=\"{$lang['strno']}\">\n";
+                       echo "<input type=submit name=empty value=\"{$lang['strempty']}\"> <input type=submit name=cancel value=\"{$lang['strcancel']}\">\n";
                        echo "</form>\n";
                }
                else {
@@ -391,7 +389,8 @@
                        if ($localData->hasDropBehavior()) {
                                echo "<p><input type=\"checkbox\" name=\"cascade\"> {$lang['strcascade']}</p>\n";
                        }
-                       echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\"> <input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\">\n";
+                       echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\">\n";
+                       echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\">\n";
                        echo "</form>\n";
                }
                else {
@@ -705,7 +704,8 @@
 
        switch ($action) {
                case 'create':
-                       doCreate();
+                       if (isset($_POST['cancel'])) doDefault();
+                       else doCreate();
                        break;
                case 'selectrows':
                        if (!isset($_POST['cancel'])) doSelectRows(false);
@@ -722,14 +722,14 @@
                        doInsertRow(true);
                        break;
                case 'empty':
-                       if (isset($_POST['yes'])) doEmpty(false);
+                       if (isset($_POST['empty'])) doEmpty(false);
                        else doDefault();
                        break;
                case 'confirm_empty':
                        doEmpty(true);
                        break;
                case 'drop':
-                       if (isset($_POST['yes'])) doDrop(false);
+                       if (isset($_POST['drop'])) doDrop(false);
                        else doDefault();
                        break;
                case 'confirm_drop':

diff --git a/tblproperties.php b/tblproperties.php
index d7e8d73ede58e2b6810763582991ef658a005223..5844b25c47c82a37df7ea5f2a2123aa4b75a8510 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.18 2003/08/06 02:09:25 chriskl Exp $
+        * $Id: tblproperties.php,v 1.19 2003/08/07 06:19:25 chriskl Exp $
         */
 
        // Include application functions
@@ -130,7 +130,6 @@
                                // Fetch all available types
                                $types = &$localData->getTypes(true);
 
-                               $misc->printTableNav();
                                echo "<h2>", $misc->printVal($_REQUEST['database']), ": ",
                                        $misc->printVal($_REQUEST['table']), ": {$lang['straddcolumn']}</h2>\n";
                                $misc->printMsg($msg);
@@ -158,7 +157,8 @@
                                echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
                                echo $misc->form;
                                echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\">\n";
-                               echo "<p><input type=\"submit\" value=\"{$lang['stradd']}\" /> <input type=\"reset\" value=\"{$lang['strreset']}\" /></p>\n";
+                               echo "<p><input type=\"submit\" value=\"{$lang['stradd']}\" />\n";
+                               echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                                echo "</form>\n";
 
                                break;
@@ -200,7 +200,6 @@
                        case 1:
                                global $lang;
 
-                               $misc->printTableNav();
                                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: {$lang['straltercolumn']}: ",
                                        $misc->printVal($_REQUEST['column']), "</h2>\n";
                                $misc->printMsg($msg);
@@ -228,13 +227,14 @@
                                        htmlspecialchars($_REQUEST['default']), "\" /></td>";
                                
                                echo "</table>\n";
-                               echo "<input type=\"hidden\" name=\"action\" value=\"properties\" />\n";
+                               echo "<p><input type=\"hidden\" name=\"action\" value=\"properties\" />\n";
                                echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
                                echo $misc->form;
                                echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                                echo "<input type=\"hidden\" name=\"column\" value=\"", htmlspecialchars($_REQUEST['column']), "\" />\n";
                                echo "<input type=\"hidden\" name=\"olddefault\" value=\"", htmlspecialchars($_REQUEST['olddefault']), "\" />\n";
-                               echo "<input type=\"submit\" value=\"{$lang['stralter']}\" /> <input type=\"reset\" value=\"{$lang['strreset']}\" />\n";
+                               echo "<input type=\"submit\" value=\"{$lang['stralter']}\" />\n";
+                               echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                                echo "</form>\n";
                                                                
                                break;
@@ -287,7 +287,8 @@
                        if ($localData->hasDropBehavior()) {
                                echo "<p><input type=\"checkbox\" name=\"cascade\"> {$lang['strcascade']}</p>\n";
                        }
-                       echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" /> <input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />\n";
+                       echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
+                       echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        echo "</form>\n";
                }
                else {
@@ -329,7 +330,7 @@
                        echo "<td class=\"data{$id}\">", ($attrs->f['attnotnull'] ? 'NOT NULL' : ''), "</td>\n";
                        echo "<td class=\"data{$id}\">", $misc->printVal($attrs->f['adsrc']), "</td>\n";
                        echo "<td class=\"opbutton{$id}\"><a href=\"{$PHP_SELF}?{$misc->href}&table=", urlencode($_REQUEST['table']),
-                               "&column=", urlencode($attrs->f['attname']), "&action=properties\">{$lang['strproperties']}</a></td>\n";
+                               "&column=", urlencode($attrs->f['attname']), "&action=properties\">{$lang['stralter']}</a></td>\n";
                        if ($data->hasDropColumn()) {
                                echo "<td class=\"opbutton{$id}\"><a href=\"{$PHP_SELF}?{$misc->href}&table=", urlencode($_REQUEST['table']),
                                        "&column=", urlencode($attrs->f['attname']), "&action=confirm_drop\">{$lang['strdrop']}</a></td>\n";
@@ -366,13 +367,15 @@
                        doExport();
                        break;
                case 'add_column':
-                       doAddColumn();
+                       if (isset($_POST['cancel'])) doDefault();
+                       else doAddColumn();
                        break;
                case 'properties':
-                       doProperties();
+                       if (isset($_POST['cancel'])) doDefault();
+                       else doProperties();
                        break;
                case 'drop':
-                       if (isset($_POST['yes'])) doDrop(false);
+                       if (isset($_POST['drop'])) doDrop(false);
                        else doDefault();
                        break;
                case 'confirm_drop':