[or-cvs] We don"t claim to do XML anymore, but at least our HTML now...

[Peter Palfrader]

Update of /home/or/cvsroot/website/en
In directory moria:/tmp/cvs-serv30916/en

Modified Files:
	download.wml translation-status.wml 
Log Message:
We don't claim to do XML anymore, but at least our HTML now validates

Index: download.wml
===================================================================
RCS file: /home/or/cvsroot/website/en/download.wml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- download.wml	18 Jan 2006 23:38:30 -0000	1.30
+++ download.wml	8 Feb 2006 12:05:06 -0000	1.31
@@ -22,7 +22,8 @@ latest development release is <b><versio
 <p><b>Subscribe</b> to the
 <a href="http://archives.seul.org/or/announce/">or-announce mailing list</a>
 to keep informed of security advisories and new stable releases (you will
-need to confirm via email):
+need to confirm via email):</p>
+
 <form action="http://freehaven.net/cgi-bin/majordomo.cgi">
 <input type="hidden" name="mlist" value="or-announce">
 <input type="hidden" name="subscribe" value="1">
@@ -30,7 +31,6 @@ need to confirm via email):
 <input name="email" size="15">
 <input type="submit" value="subscribe">
 </form>
-</p>
 
 <table border="1" cellspacing="0" cellpadding="2">
 <thead>

Index: translation-status.wml
===================================================================
RCS file: /home/or/cvsroot/website/en/translation-status.wml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- translation-status.wml	27 Jan 2006 00:16:59 -0000	1.6
+++ translation-status.wml	8 Feb 2006 12:05:06 -0000	1.7
@@ -38,20 +38,34 @@ sub do_status($$) {
 	print "<th>File</th>\n";
 	printf("<th>%s (%s)</th>\n", $_, $LANGUAGES{$_}) for (@LANGUAGES);
 	print "</tr>\n";
+	my $HTMLBASE = (defined $ENV{'HTMLBASE'} ? $ENV{'HTMLBASE'} : 'http://tor.eff.org/') . ($dir eq '.' ? '' : $dir.'/');
+	
 	for my $file (sort {$a cmp $b} keys %{$files{'en'}}) {
 		my $obs = file_is_obsolete($dir, 'en', $file);
+		my $validatorlink = '';
+		my $htmlfile = $file;
+		if ($htmlfile =~ s/\.wml/.html/) {
+			$validatorlink = sprintf '<br><a href="http://validator.w3.org/check?uri=%s%s.en">validator</a>',
+				$HTMLBASE, $htmlfile;
+		}
 		print "<tr>";
 		printf "<th>%s</th>", $file;
 		printf '<td%s>Revision %s%s<br>
-		        <a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/en/%s?root=tor&view=markup">HEAD</a></td>',
+		        <a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/en/%s?root=tor&amp;view=markup">HEAD</a>
+			%s',
 			($obs ? ' bgcolor="lightgrey"' : ''),
 			$files{'en'}->{$file}->{'rev'},
 			($obs ? ' (obsolete)' :''),
-			$file;
+			$file,
+			$validatorlink;
 		for my $lang (@LANGUAGES) {
 			next if $lang eq 'en';
 			my $color;
 			my $status;
+			if ($validatorlink) {
+				$validatorlink = sprintf '<br><a href="http://validator.w3.org/check?uri=%s%s.%s">validator</a>',
+					$HTMLBASE, $htmlfile, $lang;
+			};
 			if (exists $files{$lang}->{$file}) {
 				my $all_info = '';
 				for my $key (sort {$a cmp $b} keys %{$files{$lang}->{$file}->{'all'}}) {
@@ -66,7 +80,7 @@ sub do_status($$) {
 				} else {
 					$status='not current';
 					if ($files{$lang}->{$file}->{'based'} ne 'unknown') {
-						$difflink=sprintf '<br><a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/en/%s?root=tor&r1=%s&r2=%s">changes in original</a>',
+						$difflink=sprintf '<br><a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/en/%s?root=tor&amp;r1=%s&amp;r2=%s">changes in original</a>',
 							$file, $files{$lang}->{$file}->{'based'}, $files{'en'}->{$file}->{'rev'};
 						$color='yellow';
 					} else {
@@ -75,14 +89,16 @@ sub do_status($$) {
 					};
 				};
 				printf '<td bgcolor="%s">%s<br>
-					<a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/%s/%s?root=tor&view=markup">HEAD</a><br>
+					<a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/%s/%s?root=tor&amp;view=markup">HEAD</a><br>
+					%s
 					%s
 					%s</td>',
 					$color,
 					$status,
 					$lang, $file,
 					$all_info,
-					$difflink;
+					$difflink,
+					$validatorlink;
 			} else {
 				$color=($obs ? 'lightgreen' : 'red');
 				$status='missing';