[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] r25189: {website} update download-easy to handle 32/64bit choices from ticket (in website/trunk: download/en include)



Author: phobos
Date: 2011-10-27 18:36:51 +0000 (Thu, 27 Oct 2011)
New Revision: 25189

Modified:
   website/trunk/download/en/download-easy.wml
   website/trunk/include/dlhead.wmi
Log:
update download-easy to handle 32/64bit choices from ticket 4231.


Modified: website/trunk/download/en/download-easy.wml
===================================================================
--- website/trunk/download/en/download-easy.wml	2011-10-27 16:15:58 UTC (rev 25188)
+++ website/trunk/download/en/download-easy.wml	2011-10-27 18:36:51 UTC (rev 25189)
@@ -13,9 +13,9 @@
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
 <define-tag button-win-tbb64>Currently Unused</define-tag>
 <define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag>
-<define-tag button-osx-tbb64>64-bit (Beta)</define-tag>
+<define-tag button-osx-tbb64>Mac 64-bit (Beta)</define-tag>
 <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
-<define-tag button-lin-tbb64>64-bit (Beta)</define-tag>
+<define-tag button-lin-tbb64>Linux 64-bit (Beta)</define-tag>
 
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 
@@ -56,13 +56,13 @@
       <div class="easy mac">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button mac-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
-	    <select name="language" id="mac-tbb" class="lang">
+	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
+	    <select name="language" id="osx-tbb" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig" style="margin-bottom: 5px;">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
-	      (<a class="mac-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">
@@ -73,6 +73,27 @@
 	  <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p>
 	</div>
       </div>
+<!-- START MAC 64-->
+      <div class="easy mac">
+	<div class="package" style="padding-top: 13px; border-top: 0px;">
+	  <form class="downloads">
+	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
+	    <select name="language" id="osx-tbb64" class="lang">
+#include <lang.wmi>
+	    </select>
+	    <div class="sig" style="margin-bottom: 5px;">
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	    </div>
+	  </form>
+	  <div class="desc">
+	    <h2>Tor Browser Bundle for 64-Bit Mac</h2>
+	    <em>Version <version-torbrowserbundleosx> - OS X (64-Bit)</em>
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
+	  </div>
+	  <p class="alt-dl">Not Using Mac? Download for <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux</a></p>
+	</div>
+      </div>
 <!-- START LINUX -->
       <div class="easy linux">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
@@ -94,6 +115,27 @@
 	  <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p>
 	</div>
       </div>
+<!-- START LINUX 64-Bit -->
+      <div class="easy linux">
+	<div class="package" style="padding-top: 13px; border-top: 0px;">
+	  <form class="downloads">
+	    <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
+	    <select name="language" id="lin-tbb64" class="lang">
+#include <lang.wmi>
+	    </select>
+	    <div class="sig" style="margin-bottom: 5px;">
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	    </div>
+	  </form>
+	  <div class="desc">
+	    <h2>Tor Browser Bundle for 64-Bit Linux</h2>
+	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em>
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
+	  </div>
+	  <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip">Mac</a> or <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p>
+	</div>
+      </div>
       <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
 <!-- END DOWNLOADS --><br>
 <!-- BEGIN WARNING -->

Modified: website/trunk/include/dlhead.wmi
===================================================================
--- website/trunk/include/dlhead.wmi	2011-10-27 16:15:58 UTC (rev 25188)
+++ website/trunk/include/dlhead.wmi	2011-10-27 18:36:51 UTC (rev 25189)
@@ -77,6 +77,8 @@
     }else if(pkg == 'osx-tbb64'){
       $('.'+pkg).replaceWith('<a class="button osx-tbb64" href="'+osxtbb64+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>');
       $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb64-sig" href="'+osxtbb64+'.asc">sig</a>');
+      $('.win-alt64').replaceWith('<a class="win-alt64" href="'+wintbb+'">Windows</a>');
+      $('.lin-alt64').replaceWith('<a class="lin-alt64" href="'+lintbb64+'">Linux</a>');
     }else if(pkg == 'lin-tbb32'){
       $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>');
       $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>');
@@ -85,6 +87,8 @@
     }else if(pkg == 'lin-tbb64'){
       $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>');
       $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>');
+      $('.mac-alt64').replaceWith('<a class="mac-alt64" href="'+osxtbb64+'">Mac</a>');
+      $('.win-alt64').replaceWith('<a class="win-alt64" href="'+wintbb+'">Windows</a>');
     }
   }
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits