Skip to content

Commit

Permalink
XHTML compliance. Use coherently 'select' instead of 'check'.
Browse files Browse the repository at this point in the history
  • Loading branch information
soranzo committed Apr 24, 2007
1 parent e92d18f commit 80a3d60
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
22 changes: 11 additions & 11 deletions classes/Misc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Class to hold various commonly used functions
*
* $Id: Misc.php,v 1.145 2007/04/22 00:41:58 mr-russ Exp $
* $Id: Misc.php,v 1.146 2007/04/24 15:00:02 soranzo Exp $
*/

class Misc {
Expand Down Expand Up @@ -234,7 +234,7 @@ function printVal($str, $type = null, $params = array()) {
if (!isset($tag) && (isset($class) || isset($align))) $tag = 'div';

if (isset($tag)) {
$alignattr = isset($align) ? " style=\"text-align: {$align};\"" : '';
$alignattr = isset($align) ? " style=\"text-align: {$align}\"" : '';
$classattr = isset($class) ? " class=\"{$class}\"" : '';
$out = "<{$tag}{$alignattr}{$classattr}>{$out}</{$tag}>";
}
Expand Down Expand Up @@ -1322,7 +1322,7 @@ function printPages($page, $pages, $url, $max_width = 20) {
if ($max_width <= 0) return;

if ($pages > 1) {
echo "<center><p>\n";
echo "<p style=\"text-align: center\">\n";
if ($page != 1) {
$temp = str_replace('%s', 1, $url);
echo "<a class=\"pagenav\" href=\"{$temp}\">{$lang['strfirst']}</a>\n";
Expand Down Expand Up @@ -1359,7 +1359,7 @@ function printPages($page, $pages, $url, $max_width = 20) {
$temp = str_replace('%s', $pages, $url);
echo "<a class=\"pagenav\" href=\"{$temp}\">{$lang['strlast']}</a>\n";
}
echo "</p></center>\n";
echo "</p>\n";
}
}

Expand All @@ -1385,9 +1385,7 @@ function printHelp($str, $help) {
*/
function setFocus($object) {
echo "<script type=\"text/javascript\">\n";
echo "<!--\n";
echo " document.{$object}.focus();\n";
echo "-->\n";
echo "</script>\n";
}

Expand All @@ -1398,9 +1396,11 @@ function setFocus($object) {
* attached to the name.
*/
function setWindowName($name, $addServer = true) {
echo "<script type=\"text/javascript\">\n<!--\n";
echo "<script type=\"text/javascript\">\n";
echo "//<![CDATA[\n";
echo " window.name = '{$name}", ($addServer ? ':'.htmlspecialchars($_REQUEST['server']) : ''), "';\n";
echo "-->\n</script>\n";
echo "//]]>\n";
echo "</script>\n";
}

/**
Expand Down Expand Up @@ -1643,7 +1643,7 @@ function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn =
}
}
break;
default;
default:
echo "<td class=\"data{$id}\">";
if (array_key_exists($column['field'], $tabledata->fields)) {
if (isset($column['url'])) {
Expand Down Expand Up @@ -1678,8 +1678,8 @@ function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn =
echo "</tr>\n";
echo "<tr>\n";
echo "<td class=\"data1\">";
echo "<a href=\"#\" onclick=\"javascript:checkAll(true);\">{$lang['strcheckall']}</a> / ";
echo "<a href=\"#\" onclick=\"javascript:checkAll(false);\">{$lang['struncheckall']}</a></td>\n";
echo "<a href=\"#\" onclick=\"javascript:checkAll(true);\">{$lang['strselectall']}</a> / ";
echo "<a href=\"#\" onclick=\"javascript:checkAll(false);\">{$lang['strunselectall']}</a></td>\n";
echo "<td class=\"data1\">&nbsp;--->&nbsp;</td>\n";
echo "<td class=\"data1\">\n";
echo "\t<select name=\"action\">\n";
Expand Down
8 changes: 4 additions & 4 deletions lang/english.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* English language file for phpPgAdmin. Use this as a basis
* for new translations.
*
* $Id: english.php,v 1.206 2007/04/24 11:13:01 soranzo Exp $
* $Id: english.php,v 1.207 2007/04/24 15:00:03 soranzo Exp $
*/

// Language and character set
Expand Down Expand Up @@ -137,8 +137,8 @@
$lang['strfileimported'] = 'File imported.';
$lang['strtrycred'] = 'Use these credentials for all servers';
$lang['stractionsonmultiplelines'] = 'Actions on multiple lines';
$lang['strcheckall'] = 'Check All';
$lang['struncheckall'] = 'Uncheck All';
$lang['strselectall'] = 'Select all';
$lang['strunselectall'] = 'Unselect all';

// Database sizes
$lang['strsize'] = 'Size';
Expand Down Expand Up @@ -349,7 +349,7 @@
$lang['strallobjects'] = 'All objects';
$lang['strdatabasealtered'] = 'Database altered.';
$lang['strdatabasealteredbad'] = 'Database alter failed.';
$lang['strspecifydatabasetodrop'] = 'You must specify at least one database to drop';
$lang['strspecifydatabasetodrop'] = 'You must specify at least one database to drop';

// Views
$lang['strview'] = 'View';
Expand Down
8 changes: 4 additions & 4 deletions lang/recoded/english.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* English language file for phpPgAdmin. Use this as a basis
* for new translations.
*
* $Id: english.php,v 1.158 2007/04/24 11:13:02 soranzo Exp $
* $Id: english.php,v 1.159 2007/04/24 15:00:03 soranzo Exp $
*/

// Language and character set
Expand Down Expand Up @@ -137,8 +137,8 @@
$lang['strfileimported'] = 'File imported.';
$lang['strtrycred'] = 'Use these credentials for all servers';
$lang['stractionsonmultiplelines'] = 'Actions on multiple lines';
$lang['strcheckall'] = 'Check All';
$lang['struncheckall'] = 'Uncheck All';
$lang['strselectall'] = 'Select all';
$lang['strunselectall'] = 'Unselect all';

// Database sizes
$lang['strsize'] = 'Size';
Expand Down Expand Up @@ -349,7 +349,7 @@
$lang['strallobjects'] = 'All objects';
$lang['strdatabasealtered'] = 'Database altered.';
$lang['strdatabasealteredbad'] = 'Database alter failed.';
$lang['strspecifydatabasetodrop'] = 'You must specify at least one database to drop';
$lang['strspecifydatabasetodrop'] = 'You must specify at least one database to drop';

// Views
$lang['strview'] = 'View';
Expand Down

0 comments on commit 80a3d60

Please sign in to comment.