From: chriskl Date: Thu, 7 Aug 2003 06:19:25 +0000 (+0000) Subject: first found of making action/cancel buttons consistent per markus' request. also... X-Git-Tag: REL_3-0-1~15 X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=82e8538a8045132221b6414ef8b482e567e3819e;p=phppgadmin.git first found of making action/cancel buttons consistent per markus' request. also fix some english strings --- diff --git a/BUGS b/BUGS index 630cf0e1..f6903dee 100644 --- a/BUGS +++ b/BUGS @@ -6,3 +6,6 @@ * Add owner everywhere * Cancel/ buttons everywhere * pg_dump feature!!! +* reports - unindexed fk's + - slow indexes + diff --git a/lang/english.php b/lang/english.php index 8bef4800..2bad7977 100755 --- 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 b66305f1..09f09cd8 100644 --- 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 4b017947..6c960484 100644 --- 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 "\n"; echo $misc->form; echo "\n"; - echo "

\n"; + echo "

\n"; echo "\n"; break; case 2: @@ -117,7 +117,7 @@ echo "\n"; } echo "\n"; - echo "

\n"; + echo "

\n"; echo "\n"; break; @@ -161,8 +161,6 @@ global $lang; echo "

{$lang['strinvalidparam']}

\n"; } - - echo "

href}\">{$lang['strshowalltables']}

\n"; } /** @@ -314,7 +312,7 @@ echo "\n"; echo "\n"; echo $misc->form; - echo "

\n"; + echo "

\n"; echo "\n"; echo "

\n"; echo "\n"; @@ -357,7 +355,7 @@ echo "\n"; echo "\n"; echo $misc->form; - echo " \n"; + echo " \n"; echo "\n"; } else { @@ -391,7 +389,8 @@ if ($localData->hasDropBehavior()) { echo "

{$lang['strcascade']}

\n"; } - echo " \n"; + echo "\n"; + echo "\n"; echo "\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 d7e8d73e..5844b25c 100644 --- 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 "

", $misc->printVal($_REQUEST['database']), ": ", $misc->printVal($_REQUEST['table']), ": {$lang['straddcolumn']}

\n"; $misc->printMsg($msg); @@ -158,7 +157,8 @@ echo "\n"; echo $misc->form; echo "\n"; - echo "

\n"; + echo "

\n"; + echo "

\n"; echo "\n"; break; @@ -200,7 +200,6 @@ case 1: global $lang; - $misc->printTableNav(); echo "

", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: {$lang['straltercolumn']}: ", $misc->printVal($_REQUEST['column']), "

\n"; $misc->printMsg($msg); @@ -228,13 +227,14 @@ htmlspecialchars($_REQUEST['default']), "\" />"; echo "\n"; - echo "\n"; + echo "

\n"; echo "\n"; echo $misc->form; echo "\n"; echo "\n"; echo "\n"; - echo " \n"; + echo "\n"; + echo "

\n"; echo "\n"; break; @@ -287,7 +287,8 @@ if ($localData->hasDropBehavior()) { echo "

{$lang['strcascade']}

\n"; } - echo " \n"; + echo "\n"; + echo "\n"; echo "\n"; } else { @@ -329,7 +330,7 @@ echo "", ($attrs->f['attnotnull'] ? 'NOT NULL' : ''), "\n"; echo "", $misc->printVal($attrs->f['adsrc']), "\n"; echo "href}&table=", urlencode($_REQUEST['table']), - "&column=", urlencode($attrs->f['attname']), "&action=properties\">{$lang['strproperties']}\n"; + "&column=", urlencode($attrs->f['attname']), "&action=properties\">{$lang['stralter']}\n"; if ($data->hasDropColumn()) { echo "href}&table=", urlencode($_REQUEST['table']), "&column=", urlencode($attrs->f['attname']), "&action=confirm_drop\">{$lang['strdrop']}\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':