From 80a3d602b80f86104528180ed0a50c9605cbb868 Mon Sep 17 00:00:00 2001
From: soranzo <soranzo>
Date: Tue, 24 Apr 2007 15:00:02 +0000
Subject: [PATCH] XHTML compliance. Use coherently 'select' instead of 'check'.

---
 classes/Misc.php         | 22 +++++++++++-----------
 lang/english.php         |  8 ++++----
 lang/recoded/english.php |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/classes/Misc.php b/classes/Misc.php
index 3916210c..b53b590c 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -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 {
@@ -234,7 +234,7 @@
 			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}>";
 			}
@@ -1322,7 +1322,7 @@
 			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";
@@ -1359,7 +1359,7 @@
 					$temp = str_replace('%s', $pages, $url);
 					echo "<a class=\"pagenav\" href=\"{$temp}\">{$lang['strlast']}</a>\n";
 				}
-				echo "</p></center>\n";
+				echo "</p>\n";
 			}
 		}		
 
@@ -1385,9 +1385,7 @@
 		 */
 		function setFocus($object) {
 			echo "<script type=\"text/javascript\">\n";
-			echo "<!--\n";
 			echo "   document.{$object}.focus();\n";
-			echo "-->\n";
 			echo "</script>\n";
 		}
 		
@@ -1398,9 +1396,11 @@
 		 *        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";
 		}
 
 		/**
@@ -1643,7 +1643,7 @@
 									}
 								}
 								break;
-							default;
+							default:
 								echo "<td class=\"data{$id}\">";
 								if (array_key_exists($column['field'], $tabledata->fields)) {
 									if (isset($column['url'])) {
@@ -1678,8 +1678,8 @@
 					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";
diff --git a/lang/english.php b/lang/english.php
index c602ced3..63ba3c0b 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.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
@@ -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';
@@ -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';
diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 06add374..16b77e8b 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.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
@@ -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';
@@ -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';
-- 
2.39.5