[or-cvs] r19459: {website} head.wmi changes (website/branches/zed/include)

phobos at seul.org phobos at seul.org
Wed May 6 10:34:31 UTC 2009


Author: phobos
Date: 2009-05-06 06:34:31 -0400 (Wed, 06 May 2009)
New Revision: 19459

Modified:
   website/branches/zed/include/head.wmi
Log:
head.wmi changes


Modified: website/branches/zed/include/head.wmi
===================================================================
--- website/branches/zed/include/head.wmi	2009-05-06 10:19:24 UTC (rev 19458)
+++ website/branches/zed/include/head.wmi	2009-05-06 10:34:31 UTC (rev 19459)
@@ -6,75 +6,256 @@
 #use "versions.wmi"
 #use "navigation.wmi"
 
-#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+"http://www.w3.org/TR/REC-html40/loose.dtd">
 #<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <html>
 <head>
   <title>$(TITLE)</title>
-  <meta name="Author" content="Roger Dingledine" />
+  <meta name="Author" content="The Tor Project, Inc" />
   <ifneq "$(CHARSET)" "" "<meta http-equiv="content-type" content="text/html; charset=$(CHARSET)" />">
   <ifeq "$(CHARSET)" "" "<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />">
   <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)" />">
   <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/stylesheet-ltr.css" />">
+  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/navbar.css" />">
   <link rel="shortcut icon" type="image/x-icon" href="$(DOCROOT)/favicon.ico" />
   <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)" />">
 </head>
-
 <body>
-
 <div class="center">
-<table class="banner" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td class="banner-left"><a href="https://www.torproject.org/"><img src="$(DOCROOT)/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>
-        <td class="banner-middle">
-	<:{
-	    my %navigation;
-	    my @keys;
-	    while (@navigation) {
-	      my $key = shift @navigation;
-	      my $val = shift @navigation;
-	      push @keys, $key;
-	      $navigation{$key} = $val;
-	    }
-
-	    for my $key (@keys) {
-	      my $page = $WML_SRC_FILENAME;
-	      $page =~ s/\.wml//;
-	      if ($page ne $key) {
-	        if (-e "$(DOCROOT)/$(LANG)/$key.wml") {
-	          printf '<a href="%s">%s</a>'."\n",
-	                 stripDotSlashs("$(DOCROOT)/$key.html.$(LANG)"), $navigation{$key};
-	        } elsif ($key =~ /^http/) {
-	          printf '<a href="%s">%s</a>'."\n", $key, $navigation{$key};
-	        } else {
-	          printf '<a href="%s">%s</a>'."\n",
-	                 stripDotSlashs("$(DOCROOT)/$key.html"), $navigation{$key};
-	        }
-	      } else {
-	       printf '<a class="current">%s</a>'."\n", $navigation{$key};
-	      }
-	    }
-	}:>
-        </td>
-        <td class="banner-right">
-	<:{
-	  my $page = $WML_SRC_FILENAME;
-	  $page =~ s/\.wml//;
-	  for my $dir (@LANGUAGES) {
-	    if (-e "$dir/$WML_SRC_FILENAME") {
-	      if ($dir eq '$(LANG)') {
-	        printf('<acronym title="%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></acronym> ', $LANGUAGES{$dir}, $dir, $LANGUAGES{$dir});
-	      } else {
-	        printf('<a href="%s.html.%s"><acronym title="%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></acronym></a> ', $page, $dir, $LANGUAGES{$dir}, $dir, $LANGUAGES{$dir});
-	      };
-	    } else {
-	      printf('<img src="$(IMGROOT)/green-flagspace.png"/> ');
-	    };
-	  };
-	}:>
-        </td>
-    </tr>
-</table>
-
-<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
+<table class=banner border=0 cellpadding=0 cellspacing=0 summary="Tor's Navigation Bar">
+<tr>
+  <td class=banner-left><a href=index.html><img src=images/top-left.png alt="Click to go to home page" width=193 height=79></a></td>
+  <td nowrap class=banner-middle><div style="clear: both;"></div><ul id=nav class="dropdown dropdown-horizontal">
+    <li id=organisation><a href=/ class=dir title="What is the Tor project?  Who's involved?">Tor </a>
+    <ul>
+      <li><a href=/30seconds.html title="Why you need Tor.">Why use Tor?</a> </li>
+      <li><a href=/overview.html title="What is Tor? Why would I want to use it? How does it work?">Overview</a> </li>
+      <li><a href=/people.html title="Who participates in the project?">Contributors</a> </li>
+     <li><a href=/donate.html title="Donate to the Tor project. (Tor is a non-profit organisation established to help prevent surveillance and censorship on the internet.)">Donations</a> </li>
+     <li><a href=/sponsors.html title="Tor's financial supporters.">Sponsors</a> </li>
+     <li><a href=/translation.html title="Help translate Tor into your language!">Translators</a> </li>
+     <li><a href=/torusers.html title="Who uses Tor? Could you benefit?">Users</a> </li>
+     <li><a href=/volunteer.html title="How to help with the project.">Volunteers</a> </li>
+    </ul></li>
+    <li id=news><a href=/news.html class=dir title="News, blog, & press sightings">News</a> 
+    <ul>
+      <li class=first><a href=https://blog.torproject.org title="News from the Tor front line.">Tor Blog</a> </li>
+      <li><a href=/press/ title="Tor press releases.">Press Releases</a> </li>
+      <li><a href=/tormedia title="Tor coverage in the media at large.">In The Media</a> </li>
+      <li><a href=http://rss.gmane.org/gmane.network.onion-routing.announce title="Low volume RSS Feed detailing Tor releases and security fixes.">Tor Updates</a> </li>
+    </ul>
+    <li id=help><a href=/30seconds.html class=dir title="Get assistance with Tor!">Support</a> 
+    <ul>
+      <li><span class=dir>For Tor Users</span> 
+      <ul>
+        <li><span class=dir>Installation</span> 
+        <ul>
+          <li class=first><a href=/docs/tor-doc-windows.html>Win32</a> </li>
+          <li><a href=/docs/tor-doc-osx.html.en>OS X</a> </li>
+          <li><a href=/docs/tor-doc-unix.html.en>Linux/Unix/BSD</a> </li>
+          <li><a href=/torbutton/index.html>Torbutton</a> </li>
+        </ul></li>
+        <li><span class=dir>Configuration</span> 
+        <ul>
+          <li class=first><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate title="How do I test that Tor is working? How can I be sure my connections are fully anonymized?">Is Tor working?</a> </li>
+          <li><a href=http://rootatlocalhost.bouldernet.org/tor_configurator.html title="Generate a custom Tor configuration file (torrc) using a web based interface.">Torrc Configurator</a></li> 
+          <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig title="Sample privoxy configuration file for use with the Unixish and Gnu/Linux packages.">Sample Privoxy Config</a></li> 
+          <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayCrashing title="Help with troubleshooting Tor crashes.">Tor Crashes</a> </li>
+          <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO/BitTorrent?highlight=%2528bittorrent%2529#BitTorrent title="Using Tor with BitTorrent, and how to configure it correctly.">Tor & BitTorrent.</a> </li>
+          <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO/IrcSilc title="Configuring IRC clients for use with Tor.">Tor & IRC</a> </li>
+        </ul>
+        <li class=first><a href=documentation.html title="Tor's main documentation page.">Tor Documentation</a> 
+        <li><a href=https://check.torproject.org title="Verify your browser is using Tor [https://check.torproject.org].">Check Tor works</a></li> 
+        <li><span class=dir>Tor Wiki</span> 
+          <ul>
+            <li class=first><a href=https://wiki.torproject.org/noreply/TheOnionRouter title="The Onion Router Wiki">Main Page</a></li> 
+            <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ title="Tor Wiki Frequently Asked Questions.">Tor Wiki FAQ</a> </li>
+            <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#GoogleSpyware title="Why does Google report that my machine is infected with spyware?">Tor & Google</a> </li>
+            <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms title="A list of programs you may wish to use in conjunction with Tor.">Support Programs</a> </li>
+          </ul> </li>
+          <li><a href=irc://irc.oftc.net/tor title="Tor's official IRC support channel [#tor on irc.oftc.net].">IRC support channel</a></li> 
+          <li class=first><a href=https://torstatus.kgprog.com/ title="View status of available Tor nodes.">Tor Relay Status</a></li> 
+          <li><a href=/docs/tor-hidden-service.html title="How to configure a Tor hidden service.">Setup Hidden Service</a></li> 
+          <li><a href=https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#AccessHiddenService title="How to access Tor's hidden services.">View Hidden Services</a> </li>
+          <li class=first><a href=/trademark-faq.html title="All you need to
+know about Tor's trademarks.">Trademark FAQ</a></li> </ul><li
+title=""><span class=dir>For Relay Operators</span> <ul><li
+class=first><a href=/docs/tor-doc-relay.html title="How to configure a
+Tor node.">Running a Relay</a></li> <li><a
+href=https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#DefaultPorts
+title="Tor's default list of permitted exit ports used when running a
+relay.">Default Exit Ports</a> </li><li><a
+href=https://wiki.torproject.org/noreply/TheOnionRouter/OperationalSecurity
+title="How to run a secure Tor server.">Tor Relay Security</a>
+</li><li><a href=/eff/tor-legal-faq.html title="Legal guidance for Tor
+Relay Operators.">Legal FAQ</a> </li><li><a
+href=/eff/tor-dmca-response.html title="Response template for Tor relay
+maintainer to ISP.">DMCA Response</a> </li></ul><li title=""><span
+class=dir>For Developers</span> <ul><li class=first><a
+href=https://www.torproject.org/documentation.html.en#Developers
+title="Help for Tor Developers">Developer Help</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/ title="Browse Tor's
+repository">Browse SVN </a></li><li><a
+href=http://archives.seul.org/or/cvs/ title="List of Tor SVN
+commits">Tor SVN Commits</a></li> <li><a
+href=http://cvs.seul.org/viewcvs/viewcvs.cgi/tor/?root=Tor title="View
+Tor's source code">View Tor's Source</a></li> <li><a
+href=https://bugs.torproject.org title="Review and report Tor bugs
+here.">Tor Bug Tracker</a></li> <li><a
+href=http://archives.seul.org/or/dev/ title="Low volume Tor developer
+mailing list.">Dev's Mailing List</a></li> </ul><li><span class=dir
+title="Technical documents, specifications and proposals.">Technical
+Docs</span> <ul><li class=first><a href=/tor-manual.html title="Concise
+Tor instruction manual (man pages).">Tor Manual</a> <li><a
+href=/tor-manual-dev.html title="Manual for development (unstable)
+version of Tor.">Tor Dev Manual</a></li> <li><span
+class=dir>Specifications</span> <ul><li class=first><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/tor-spec.txt
+title="Main Tor specification document.">Tor Specification</a></li>
+<li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/dir-spec.txt
+title="Tor version 3 directory server specification.">Directory Spec.
+(v3)</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/control-spec.txt
+title="Tor control protocol specification.">Control Protocol
+Spec.</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/rend-spec.txt
+title="Tor rendezvous specification.">Rendezvous Spec.</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/path-spec.txt
+title="Tor path selection specification.">Path Selection Spec.</a></li>
+<li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/address-spec.txt
+title="Special host names in Tor.">Address Spec.</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/socks-extensions.txt
+title="Tor's SOCKS support and extensions.">SOCKS Support</a></li>
+<li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/version-spec.txt
+title="How Tor's version numbers work.">Version Spec.</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/
+title="In-progress drafts of new specifications and proposed
+changes.">Proposals</a></li> </ul><li class=design><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/design-paper/tor-design.html
+title="Justifications and design considerations for Tor.">Tor
+Design</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/design-paper/blocking.html
+title="Design of a blocking-resistant anonymity system
+(draft).">Defeating Tor blocks</a></li> <li><a
+href=https://svn.torproject.org/svn/tor/trunk/doc/contrib/torel-design.txt
+title="Document detailing proposal for the design for a DNS Exit List
+(DNSEL) for Tor exit nodes.">Tor DNSEL Design</a></li> <li><a
+href=http://freehaven.net/anonbib/ title="Selected Papers in
+Anonymity.">Anonymity Docs</a></li> </ul><li class=first><a href=/faq
+title="Frequently asked questions relating to Tor. (See also: Wiki
+FAQ).">Tor FAQ</a></li> <li title="Tor's Mailing Lists."><span
+class=dir>Mailing Lists</span> <ul><li class=first><a
+href=http://archives.seul.org/or/talk/ title="Tor's general purpose list
+for discussion of Tor and support.">Or-Talk</a> </li><li><a
+href=http://archives.seul.org/or/announce/ title="Tor's low volume
+announce list detailing new versions and security
+fixes.">Or-Announce</a> </li><li><a
+href=http://archives.seul.org/or/dev/ title="Tor's low volume developer
+list.">Or-Dev</a> </li></ul></li><li title="Documents and tools to
+mitigate risk of abuse."><span class=dir>Abuse</span> <ul><li><a
+href=/faq-abuse.html title="How can Tor be abused, and what can I do to
+protect myself?">Abuse FAQ</a> </li><li><a
+href=https://www.torproject.org/faq-abuse.html.en#Bans title="How do I
+block Tor access to my network or server?">Blocking Tor</a> </li><li><a
+href=https://www.torproject.org/faq-abuse.html.en#WhatAboutSpammers
+title="Why Tor isn't the best tool for spammers.">Tor and Spam</a>
+</li><li><a href=https://check.torproject.org/cgi-bin/TorBulkExitList.py
+title="Creates an IP list of active Tor nodes.">Exit List
+Generator</a></li> <li><a href=/tordnsel/ title="Tor DNS Exit List
+(DNSEL) is an active testing, DNS-based list of Tor exit nodes.">Tor
+DNSEL</a></li> </ul><li><a href=/contact.html title="Get in touch with
+Tor">Contact</a> </li></ul></li><li class=first><a href=/projects/
+title="Related projects." class=dir>Projects</a> <ul><li class=first><a
+href=/projects/google.html title="Secure auto-update for Tor, sponsored
+by Google.">Auto-update</a> </li><li><a href=/torbrowser/ title="Tor
+Browser Bundle (TBB) is a self-contained pre-configured Tor bundle with
+Firefox and Pidgin Instant Messenger for Windows.">Browser Bundle</a>
+</li><li><a href=/projects/hidserv.html title="Improving the performance
+of Tor Hidden Services.">Hidden Services</a> </li><li><a
+href="http://www.
+browseanonymouslyanywhere.com/incognito/" title="Incognito is an open
+source LiveDistro based on Gentoo Linux assisting you to securely and
+anonymously use the Internet almost anywhere you go.">Incognito</a>
+</li><li><a href=/projects/lowbandwidth.html title="Enhancing
+performance of Tor over low bandwidth
+connections.">Low-bandwidth</a></li> <li><a href=/projects/metrics.html
+title="Measuring performance of the Tor network.">Metrics</a>
+</li><li><a href=http://portabletor.sourceforge.net/ title="A ready to
+run Tor for Windows, suitable for use on systems where installation
+isn't possible (eg netcafes, public libraries etc).">PortableTor</a>
+</li><li><a href=http://fscked.org/projects/torflow title="TorFlow is a
+set of python scripts written to scan the Tor network for misbehaving,
+misconfigured, and overloaded Tor nodes. ">TorFlow</a></li> <li><a
+href=/torbutton/ title="Torbutton addon provides security enhancements
+to the Firefox web browser when in conjunction with Tor.">Torbutton</a>
+</li><li><a href=http://www.anonymityanywhere.com/tork/ title="A
+Linux/KDE based gui controller for Tor. Single-click configuration for
+many apps, anonymous mail, configuration of Tor relays and hidden
+service etc.">TorK</a> </li><li><a href=/torvm/ title="TorVM is a
+virtual machine based on Qemu that acts as a transparent network proxy,
+enabling a more robust and secure Tor configuration for clients and
+relays.">TorVM</a> </li><li><a href=http://vidalia-project.net
+title="Vidalia is cross platform gui controller for Tor.  Available for
+Windows, OS X, Linux/Unix/BSD.">Vidalia</a> </li></ul></li><li
+id=contribute><a href=/volunteer.html class=dir title="Get involved in
+the Tor project!">Contribute</a> <ul><li class=first><a
+href=/docs/tor-doc-relay.html title="Run a relay and help the
+network.">Run a Relay</a> </li><li><a href=/donate.html title="Help the
+Tor project grow!">Donate</a> </li><li><a href=/translation.html
+title="Help translate Tor into your language. Arabic and Farsi urgently
+needed!">Translate</a> </li><li><a href=/volunteer.html#Projects
+title="Help with Tor's code and developing companion
+applications.">Develop</a> </li><li><a
+href=/volunteer.html#Documentation title="Help write documentation and
+improve existing information.">Document</a> </li><li><a
+href=/volunteer.html#Advocacy. title="Help promote Tor in your
+area!">Promote Tor</a> </ul></li><li id=download><a
+href=/easy-download.html class=dir title="Get Tor!">Download</a> <ul><li
+class=first><a href=/easy-download.html title="Simple Tor download
+choices." class=dir>Download Tor</a></li> </ul><ul><li class=first><a
+href=/easy-download.html title="Bundle installer for Windows systems.
+(Contains Tor, Vidalia, Privoxy & Torbutton).">Windows Bundle
+</a></li><li><a href=/torbrowser/ title="Zero-install pre-configured Tor
+bundle with Firefox and Pidgin Instant Messenger for Windows.">Browser
+Bundle</a> </li><li><a href=/easy-download.html title="Apple OS X
+installer. (Contains Tor, Vidalia, Polipo & Torbutton).">OS X Bundle</a>
+</li><li><a href=/download-unix.html title="Downloads for various Unix &
+Linux distributions.">Unix & Linux </a></li><li><a href=/download.html
+title="Downloads page for advanced users. Stable and development builds
+and bundles.">Advanced</a> </li></ul></li></li><li id=languages><a
+href=https://translation.torproject.org class=dir title="Choose the
+language for this document."><img src=/images/flag.png></a> <ul><li><a
+href=#><img src=/images/flags/cn.png>&nbsp;&#20013;&#25991;(&#31616;)
+(Chinese)</a> </li><li><a href=#><img
+src=/images/flags/de.png>&nbsp;Deutsch</a> </li><li><a href=#><img
+src=/images/flags/gb.png>&nbsp;English</a> </li><li><a href=#><img
+src=/images/flags/es.png>&nbsp;Espa&ntilde;ol</a> </li><li><a
+href=#><img
+src=/images/flags/ir.png>&nbsp;&#1601;&#1575;&#1585;&#1587;&#1740;
+(F&#257;rs&#299;)</a> </li><li><a href=#><img
+src=/images/flags/fr.png>&nbsp;Fran&ccedil;ais</a> </li><li><a
+href=#><img
+src=/images/flags/kn.png>&nbsp;&#54620;&#44397;&#50612;&nbsp;(Hangul)</a>
+</li><li><a href=#><img src=/images/flags/it.png>&nbsp;Italiano</a>
+</li><li><a href=#><img src=/images/flags/nl.png>&nbsp;Nederlands</a>
+</li><li><a href=#><img src=/images/flags/no.png>&nbsp;Norsk</a>
+</li><li><a href=#><img
+src=/images/flags/jp.png>&nbsp;&#26085;&#26412;&#35486;&nbsp;(Nihongo)</a>
+</li><li><a href=#><img src=/images/flags/pl.png>&nbsp;Polski</a>
+</li><li><a href=#><img
+src=/images/flags/pt.png>&nbsp;Portugu&ecirc;s</a> </li><li><a
+href=#><img
+src=/images/flags/ru.png>&nbsp;&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;&nbsp;(Russkij)</a>
+</li><li><a href=#><img src=/images/flags/pt.png>&nbsp;Suomi</a>
+</li><li><a href=#><img src=/images/flags/se.png>&nbsp;Svenska</a>
+</li><li><a href=#><img
+src=/images/flags/tr.png>&nbsp;T&uuml;rk&ccedil;e</a></li></ul></li></li></ul></ul></td><td
+align=center valign=middle class=banner-right></td></tr></table>
+<ifneq "$(REDIRECT)" "" "Redirecting to <a
+href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">



More information about the tor-commits mailing list