[tor-commits] r25558: {website} patch from jeremy to fix the mac tbb link issues. (in website/trunk: download/en include)

Andrew Lewman andrew at torproject.org
Tue Mar 20 02:03:31 UTC 2012


Author: phobos
Date: 2012-03-20 02:03:30 +0000 (Tue, 20 Mar 2012)
New Revision: 25558

Modified:
   website/trunk/download/en/download-easy.wml
   website/trunk/download/en/download.wml
   website/trunk/include/dlhead.wmi
Log:
patch from jeremy to fix the mac tbb link issues.


Modified: website/trunk/download/en/download-easy.wml
===================================================================
--- website/trunk/download/en/download-easy.wml	2012-03-19 20:58:42 UTC (rev 25557)
+++ website/trunk/download/en/download-easy.wml	2012-03-20 02:03:30 UTC (rev 25558)
@@ -12,8 +12,8 @@
 #<!-- Download button text for language enabled packages -->
 <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>Mac 64-bit (Beta)</define-tag>
+<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
+<define-tag button-osx-tbb64>Mac 64-bit</define-tag>
 <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
 <define-tag button-lin-tbb64>Linux 64-bit (Beta)</define-tag>
 
@@ -50,20 +50,20 @@
 	    <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</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 »</a></p>
 	  </div>
-	  <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip">Mac</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p>
+	  <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip">Mac</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p>
 	</div>
       </div>
 <!-- START MAC -->
       <div class="easy mac">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
+	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-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="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-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-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">
@@ -78,13 +78,13 @@
       <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-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
+	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-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-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-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">
@@ -113,7 +113,7 @@
 	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</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 »</a></p>
 	  </div>
-	  <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p>
+	  <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-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 -->
@@ -134,7 +134,7 @@
 	    <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 »</a></p>
 	  </div>
-	  <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-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>
+	  <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-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>

Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml	2012-03-19 20:58:42 UTC (rev 25557)
+++ website/trunk/download/en/download.wml	2012-03-20 02:03:30 UTC (rev 25558)
@@ -12,8 +12,8 @@
 #<!-- Download button text for language enabled packages -->
 <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-tbb32>Tor Browser Bundle</define-tag>
+<define-tag button-osx-tbb64>64-bit</define-tag>
 <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
 <define-tag button-lin-tbb64>64-bit (Beta)</define-tag>
 

Modified: website/trunk/include/dlhead.wmi
===================================================================
--- website/trunk/include/dlhead.wmi	2012-03-19 20:58:42 UTC (rev 25557)
+++ website/trunk/include/dlhead.wmi	2012-03-20 02:03:30 UTC (rev 25558)
@@ -58,8 +58,8 @@
     var pkg = caller.attr('id');
     var lang = caller.val();
     var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe';
-    var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-'+lang+'.zip';
-    var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-'+lang+'.zip';
+    var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-'+lang+'.zip';
+    var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-'+lang+'.zip';
     var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz';
     var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz';
     if(pkg == 'win-tbb'){



More information about the tor-commits mailing list