Browse code

We don't claim to do XML anymore, but at least our HTML now validates

Peter Palfrader authored on 08/02/2006 13:05:06
Showing 7 changed files
... ...
@@ -82,7 +82,7 @@ eintr
82 82
 <td><kbd>apt-get install tor</kbd></td>
83 83
 <td><ul>
84 84
 <li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Anweisungen f�r UNIX/Linux/BSD</a></li>
85
-<li><a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorOnDebian">Backports f�r Woody und Sarge, Pakete f�r Ubuntu und experimentelle Torversionen</li>
85
+<li><a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorOnDebian">Backports f�r Woody und Sarge, Pakete f�r Ubuntu und experimentelle Torversionen</a></li>
86 86
 </ul></td>
87 87
 </tr>
88 88
 
... ...
@@ -22,7 +22,8 @@ latest development release is <b><version-alpha></b>.</p>
22 22
 <p><b>Subscribe</b> to the
23 23
 <a href="http://archives.seul.org/or/announce/">or-announce mailing list</a>
24 24
 to keep informed of security advisories and new stable releases (you will
25
-need to confirm via email):
25
+need to confirm via email):</p>
26
+
26 27
 <form action="http://freehaven.net/cgi-bin/majordomo.cgi">
27 28
 <input type="hidden" name="mlist" value="or-announce">
28 29
 <input type="hidden" name="subscribe" value="1">
... ...
@@ -30,7 +31,6 @@ need to confirm via email):
30 31
 <input name="email" size="15">
31 32
 <input type="submit" value="subscribe">
32 33
 </form>
33
-</p>
34 34
 
35 35
 <table border="1" cellspacing="0" cellpadding="2">
36 36
 <thead>
... ...
@@ -38,20 +38,34 @@ sub do_status($$) {
38 38
 	print "<th>File</th>\n";
39 39
 	printf("<th>%s (%s)</th>\n", $_, $LANGUAGES{$_}) for (@LANGUAGES);
40 40
 	print "</tr>\n";
41
+	my $HTMLBASE = (defined $ENV{'HTMLBASE'} ? $ENV{'HTMLBASE'} : 'http://tor.eff.org/') . ($dir eq '.' ? '' : $dir.'/');
42
+	
41 43
 	for my $file (sort {$a cmp $b} keys %{$files{'en'}}) {
42 44
 		my $obs = file_is_obsolete($dir, 'en', $file);
45
+		my $validatorlink = '';
46
+		my $htmlfile = $file;
47
+		if ($htmlfile =~ s/\.wml/.html/) {
48
+			$validatorlink = sprintf '<br><a href="http://validator.w3.org/check?uri=%s%s.en">validator</a>',
49
+				$HTMLBASE, $htmlfile;
50
+		}
43 51
 		print "<tr>";
44 52
 		printf "<th>%s</th>", $file;
45 53
 		printf '<td%s>Revision %s%s<br>
46
-		        <a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/en/%s?root=tor&view=markup">HEAD</a></td>',
54
+		        <a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/en/%s?root=tor&amp;view=markup">HEAD</a>
55
+			%s',
47 56
 			($obs ? ' bgcolor="lightgrey"' : ''),
48 57
 			$files{'en'}->{$file}->{'rev'},
49 58
 			($obs ? ' (obsolete)' :''),
50
-			$file;
59
+			$file,
60
+			$validatorlink;
51 61
 		for my $lang (@LANGUAGES) {
52 62
 			next if $lang eq 'en';
53 63
 			my $color;
54 64
 			my $status;
65
+			if ($validatorlink) {
66
+				$validatorlink = sprintf '<br><a href="http://validator.w3.org/check?uri=%s%s.%s">validator</a>',
67
+					$HTMLBASE, $htmlfile, $lang;
68
+			};
55 69
 			if (exists $files{$lang}->{$file}) {
56 70
 				my $all_info = '';
57 71
 				for my $key (sort {$a cmp $b} keys %{$files{$lang}->{$file}->{'all'}}) {
... ...
@@ -66,7 +80,7 @@ sub do_status($$) {
66 80
 				} else {
67 81
 					$status='not current';
68 82
 					if ($files{$lang}->{$file}->{'based'} ne 'unknown') {
69
-						$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>',
83
+						$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>',
70 84
 							$file, $files{$lang}->{$file}->{'based'}, $files{'en'}->{$file}->{'rev'};
71 85
 						$color='yellow';
72 86
 					} else {
... ...
@@ -75,14 +89,16 @@ sub do_status($$) {
75 89
 					};
76 90
 				};
77 91
 				printf '<td bgcolor="%s">%s<br>
78
-					<a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/%s/%s?root=tor&view=markup">HEAD</a><br>
92
+					<a href="http://cvs.seul.org/viewcvs/viewcvs.cgi/website/%s/%s?root=tor&amp;view=markup">HEAD</a><br>
93
+					%s
79 94
 					%s
80 95
 					%s</td>',
81 96
 					$color,
82 97
 					$status,
83 98
 					$lang, $file,
84 99
 					$all_info,
85
-					$difflink;
100
+					$difflink,
101
+					$validatorlink;
86 102
 			} else {
87 103
 				$color=($obs ? 'lightgreen' : 'red');
88 104
 				$status='missing';
... ...
@@ -6,8 +6,10 @@
6 6
 #use "versions.wmi"
7 7
 #use "navigation.wmi"
8 8
 
9
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
10
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
9
+#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
10
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
11
+#<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
12
+<html>
11 13
 <head>
12 14
   <title>Tor: $(TITLE)</title>
13 15
   <meta name="Author" content="Roger Dingledine" />
... ...
@@ -36,7 +36,6 @@ Si raccomanda la lettura delle <a href="<cvssandbox>tor/doc/tor-doc-osx.html">is
36 36
 <li><b>Mac OS X Panther/Jaguar</b> installer:
37 37
 <a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a href="<package-oldosx-stable-sig>">sig</a>),
38 38
 <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a href="<package-oldosx-alpha-sig>">sig</a>).
39
-</td>
40 39
 
41 40
 Si raccomanda la lettura delle <a href="<cvssandbox>tor/doc/tor-doc-osx.html">istruzioni per OS X</a>.</li>
42 41
 
... ...
@@ -25,7 +25,7 @@ senaste utvecklingsversionen &auml;r <b><version-alpha></b>.</p>
25 25
 <a href="http://archives.seul.org/or/announce/">e-postlistan or-announce</a>
26 26
 f&ouml;r att vara uppdaterad med vad som g&auml;ller ang&aring;ende 
27 27
 s&auml;kerhet och nya stabila releaser (du kommer att beh&ouml;va 
28
-bekr&auml;fta via e-post):
28
+bekr&auml;fta via e-post):</p>
29 29
 <form action="http://freehaven.net/cgi-bin/majordomo.cgi">
30 30
 <input type="hidden" name="mlist" value="or-announce">
31 31
 <input type="hidden" name="subscribe" value="1">
... ...
@@ -33,7 +33,6 @@ bekr&auml;fta via e-post):
33 33
 <input name="email" size="15">
34 34
 <input type="submit" value="subscribe">
35 35
 </form>
36
-</p>
37 36
 
38 37
 <table border="1" cellspacing="0" cellpadding="2">
39 38
 <thead>
... ...
@@ -42,7 +42,7 @@ och s&auml;kerhet p&aring; Internet. Aktivistgrupper som Electronic Frontier Fou
42 42
 st&ouml;der Tors utveckling som ett verktyg f&ouml;r att uppr&auml;tth&aring;lla m&auml;nskliga r&auml;ttigheter 
43 43
 p&aring; n&auml;tet. F&ouml;retag anv&auml;nder Tor som ett s&auml;kert s&auml;tt att genomf&ouml;ra 
44 44
 konkurrentanalyser och f&ouml;r att skydda k&auml;nsliga ink&ouml;psm&ouml;nster fr&aring;n obeh&ouml;riga.
45
-De anv&auml;nder det ocks&aring; f&ouml;r att ers&auml;tta traditionella VPN-n&aumlt;,
45
+De anv&auml;nder det ocks&aring; f&ouml;r att ers&auml;tta traditionella VPN-n&auml;,
46 46
 som avsl&ouml;jar den exakt datam&auml;ngd och tidpunkt f&ouml;r kommunikation. P&aring; vilka orter jobbar 
47 47
 de anst&auml;llda sent? P&aring; vilka orter g&aring;r de anst&auml;llda in p&aring; jobbs&ouml;karwebbplatser? 
48 48
 Vilka utvecklingsavdelningar diskuterar med f&ouml;retagets patentadvokater?
... ...
@@ -84,7 +84,7 @@ och ett huvud som anv&auml;nds f&ouml;r dirigering av trafiken. Datan &auml;r de
84 84
 oavsett om det &auml;r ett e-postmeddelande, en webbsida eller en ljudfil. 
85 85
 &Auml;ven om du krypterar datan i din trafik kommer trafikanalys att avsl&ouml;ja en hel 
86 86
 del om vad du g&ouml;r och m&ouml;jligen vad du s&auml;ger. Det &auml;r m&ouml;jligt d&auml;rf&ouml;r att det fokuserar
87
-p&aring: huvudet som talar om k&auml;llan, m&aring;let, storlek, tidpunkt osv. 
87
+p&aring; huvudet som talar om k&auml;llan, m&aring;let, storlek, tidpunkt osv. 
88 88
 </p>
89 89
 
90 90
 <p>