[or-cvs] r22936: {website} fix up the index page to purge javascript that doesn't work (website/branches/web20/en)

[Andrew Lewman]

Author: phobos
Date: 2010-08-17 18:39:04 +0000 (Tue, 17 Aug 2010)
New Revision: 22936

Modified:
   website/branches/web20/en/index.wml
   website/branches/web20/en/navigation.wmi
Log:
fix up the index page to purge javascript that doesn't work anyway.


Modified: website/branches/web20/en/index.wml
===================================================================
--- website/branches/web20/en/index.wml	2010-08-17 18:38:40 UTC (rev 22935)
+++ website/branches/web20/en/index.wml	2010-08-17 18:39:04 UTC (rev 22936)
@@ -4,55 +4,6 @@
 
 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 
-# note, translators will need to translate the javascript below also!
-# also, the script is here so that links are created for the correct language
-<!-- javascript to detect the client and suggest a download link -->
-<script language="javascript" type="text/javascript">
-
-function downloadRedirect() {
-  var destination = "<page download/thankyou>";
-  setTimeout("window.location='"+destination+"'",3000);
-}
-
-function clientSpecificDownload() {
-  document.write('<div id="download" onClick=downloadRedirect()>');
-  var platform = navigator.platform;
-  if (platform === "Win32" || platform === "Win64")
-  {
-    document.write('<a href="dist/tor-browser-<version-torbrowserbundle>_en-US.exe"> \
-        <span class="download-tor">Download <strong>Tor</strong></span><br /> \
-        </a>');
-  }
-  else if (platform === "MacIntel")
-  {
-    document.write('<a href="<package-osx-bundle-stable>"> \
-        <span class="download-tor">Download <strong>Tor</strong></span><br /> \
-        </a>');
-  }
-  else if (platform === "MacPPC")
-  {
-    document.write('<a href="<package-oldosx-bundle-stable>"> \
-        <span class="download-tor">Download <strong>Tor</strong></span><br /> \
-        </a>');
-  }
-  else if (platform === "Linux i686" || platform === "Linux x86_64")
-  {
-    document.write('<a href="<package-source-stable>"> \
-        <span class="download-tor">Download <strong>Tor</strong></span><br /> \
-        </a>');
-  } 
-  else
-  {
-    document.write('<a href="<page download/download>"> \
-        <span class="download-tor">Download <strong>Tor</strong></span><br /> \
-        </a>');
-  }
-
-  document.write('</div>');
-  document.write('<div class="incorrect"><a href="<page download/download>">Not what you\'re using?</a></div>');
-} 
-</script>
- 
 <div id="home">
     <div id="content" class="clearfix">
     	<div id="maincol">
@@ -65,22 +16,15 @@
         	<h1 class="headline">Anonymity Online</h1>
           <p class="desc">Protect your privacy. Defend yourself against network surveillance and traffic analysis.</p>
 
-          <!-- javascript to detect browser -->
-          <script type="text/javascript">
-              clientSpecificDownload();
-          </script>
-
-          <!-- default to download page -->
-          <noscript>
-          <div id="download">
-          <a href="<page download/download>">
-            <span class="download-tor">Download <strong>Tor</strong></span><br />
-          </a>
-          </div>
-          </noscript>
-
+      <div id="download">
+        <a href="dist/tor-browser-<version-torbrowserbundle>_en-US.exe"> 
+          <span class="download-tor">Download <strong>Tor</strong></span><br /> 
+        </a>
+      </div>
+      <div class="incorrect">
+        <a href="<page download/download>">Not what you are using?</a>
+      </div>
         </div>
-        <!-- END BANNER -->
         <div class="subcol-container clearfix">
           <div class="subcol first">
             <h2>What is Tor?</h2>

Modified: website/branches/web20/en/navigation.wmi
===================================================================
--- website/branches/web20/en/navigation.wmi	2010-08-17 18:38:40 UTC (rev 22935)
+++ website/branches/web20/en/navigation.wmi	2010-08-17 18:39:04 UTC (rev 22936)
@@ -7,7 +7,7 @@
 <:
     # path                              link text
     my @navigation = (
-        'index'                        , 'Home',
+        'index'                       , 'Home',
         'about/about'                 , 'About Tor',
         'docs/documentation'          , 'Documentation',
         'projects/clientside'         , 'Projects',