update download-easy to handle 32/64bit choices from ticket 4231. (4b0929ca9)

update download-easy to handle 32/64bit choices from ticket 4231.

Andrew Lewman commited on 2011-10-27 20:36:51
Zeige 2 geänderte Dateien mit 51 Einfügungen und 5 Löschungen.

download/en/download-easy.wml f4462a9d5..8cf614ebe
include/dlhead.wmi 57e1adfb0..adade001a

@@ -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 -->

include/dlhead.wmi

Zeige Datei @ 4b0929ca9

@@ -77,6 +77,8 @@ type="application/rss+xml">">
     }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 @@ type="application/rss+xml">">
     }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>');
     }
   }
 


...	...	@@ -77,6 +77,8 @@ type="application/rss+xml">">
77	77	}else if(pkg == 'osx-tbb64'){
78	78	$('.'+pkg).replaceWith('<a class="button osx-tbb64" href="'+osxtbb64+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>');
79	79	$('.'+pkg+'-sig').replaceWith('<a class="osx-tbb64-sig" href="'+osxtbb64+'.asc">sig</a>');
	80	+ $('.win-alt64').replaceWith('<a class="win-alt64" href="'+wintbb+'">Windows</a>');
	81	+ $('.lin-alt64').replaceWith('<a class="lin-alt64" href="'+lintbb64+'">Linux</a>');
80	82	}else if(pkg == 'lin-tbb32'){
81	83	$('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>');
82	84	$('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>');
...	...	@@ -85,6 +87,8 @@ type="application/rss+xml">">
85	87	}else if(pkg == 'lin-tbb64'){
86	88	$('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>');
87	89	$('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>');
	90	+ $('.mac-alt64').replaceWith('<a class="mac-alt64" href="'+osxtbb64+'">Mac</a>');
	91	+ $('.win-alt64').replaceWith('<a class="win-alt64" href="'+wintbb+'">Windows</a>');
88	92	}
89	93	}
90	94
91	95

...	...	@@ -13,9 +13,9 @@
13	13	<define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14	14	<define-tag button-win-tbb64>Currently Unused</define-tag>
15	15	<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag>
16		-<define-tag button-osx-tbb64>64-bit (Beta)</define-tag>
	16	+<define-tag button-osx-tbb64>Mac 64-bit (Beta)</define-tag>
17	17	<define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
18		-<define-tag button-lin-tbb64>64-bit (Beta)</define-tag>
	18	+<define-tag button-lin-tbb64>Linux 64-bit (Beta)</define-tag>
19	19
20	20	#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
21	21
...	...	@@ -56,13 +56,13 @@
56	56	<div class="easy mac">
57	57	<div class="package" style="padding-top: 13px; border-top: 0px;">
58	58	<form class="downloads">
59		- <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>
60		- <select name="language" id="mac-tbb" class="lang">
	59	+ <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>
	60	+ <select name="language" id="osx-tbb" class="lang">
61	61	#include <lang.wmi>
62	62	</select>
63	63	<div class="sig" style="margin-bottom: 5px;">
64	64	<a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
65		- (<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>
	65	+ (<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>
66	66	</div>
67	67	</form>
68	68	<div class="desc">
...	...	@@ -73,6 +73,27 @@
73	73	<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>
74	74	</div>
75	75	</div>
	76	+<!-- START MAC 64-->
	77	+ <div class="easy mac">
	78	+ <div class="package" style="padding-top: 13px; border-top: 0px;">
	79	+ <form class="downloads">
	80	+ <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>
	81	+ <select name="language" id="osx-tbb64" class="lang">
	82	+#include <lang.wmi>
	83	+ </select>
	84	+ <div class="sig" style="margin-bottom: 5px;">
	85	+ <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
	86	+ (<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>
	87	+ </div>
	88	+ </form>
	89	+ <div class="desc">
	90	+ <h2>Tor Browser Bundle for 64-Bit Mac</h2>
	91	+ <em>Version <version-torbrowserbundleosx> - OS X (64-Bit)</em>
	92	+ <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 »</a></p>
	93	+ </div>
	94	+ <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>
	95	+ </div>
	96	+ </div>
76	97	<!-- START LINUX -->
77	98	<div class="easy linux">
78	99	<div class="package" style="padding-top: 13px; border-top: 0px;">
...	...	@@ -94,6 +115,27 @@
94	115	<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>
95	116	</div>
96	117	</div>
	118	+<!-- START LINUX 64-Bit -->
	119	+ <div class="easy linux">
	120	+ <div class="package" style="padding-top: 13px; border-top: 0px;">
	121	+ <form class="downloads">
	122	+ <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>
	123	+ <select name="language" id="lin-tbb64" class="lang">
	124	+#include <lang.wmi>
	125	+ </select>
	126	+ <div class="sig" style="margin-bottom: 5px;">
	127	+ <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
	128	+ (<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>
	129	+ </div>
	130	+ </form>
	131	+ <div class="desc">
	132	+ <h2>Tor Browser Bundle for 64-Bit Linux</h2>
	133	+ <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em>
	134	+ <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 »</a></p>
	135	+ </div>
	136	+ <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>
	137	+ </div>
	138	+ </div>
97	139	<p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
98	140	<!-- END DOWNLOADS --><br>
99	141	<!-- BEGIN WARNING -->

tor-webwml.git