Browse code

patch from jeremy to fix the mac tbb link issues.

Andrew Lewman authored on20/03/2012 03:03:30
Showing3 changed files
... ...
@@ -12,8 +12,8 @@
12 12
 #<!-- Download button text for language enabled packages -->
13 13
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15
-<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag>
16
-<define-tag button-osx-tbb64>Mac 64-bit (Beta)</define-tag>
15
+<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
+<define-tag button-osx-tbb64>Mac 64-bit</define-tag>
17 17
 <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
18 18
 <define-tag button-lin-tbb64>Linux 64-bit (Beta)</define-tag>
19 19
 
... ...
@@ -50,20 +50,20 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
50 50
 	    <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em>
51 51
 	    <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>
52 52
 	  </div>
53
-	  <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>
53
+	  <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>
54 54
 	</div>
55 55
       </div>
56 56
 <!-- START MAC -->
57 57
       <div class="easy mac">
58 58
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
59 59
 	  <form class="downloads">
60
-	    <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>
60
+	    <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>
61 61
 	    <select name="language" id="osx-tbb" class="lang">
62 62
 #include <lang.wmi>
63 63
 	    </select>
64 64
 	    <div class="sig" style="margin-bottom: 5px;">
65 65
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
66
-	      (<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>
66
+	      (<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>
67 67
 	    </div>
68 68
 	  </form>
69 69
 	  <div class="desc">
... ...
@@ -78,13 +78,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
78 78
       <div class="easy mac">
79 79
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
80 80
 	  <form class="downloads">
81
-	    <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>
81
+	    <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>
82 82
 	    <select name="language" id="osx-tbb64" class="lang">
83 83
 #include <lang.wmi>
84 84
 	    </select>
85 85
 	    <div class="sig" style="margin-bottom: 5px;">
86 86
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
87
-	      (<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>
87
+	      (<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>
88 88
 	    </div>
89 89
 	  </form>
90 90
 	  <div class="desc">
... ...
@@ -113,7 +113,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
113 113
 	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
114 114
 	    <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>
115 115
 	  </div>
116
-	  <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>
116
+	  <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>
117 117
 	</div>
118 118
       </div>
119 119
 <!-- START LINUX 64-Bit -->
... ...
@@ -134,7 +134,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
134 134
 	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em>
135 135
 	    <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>
136 136
 	  </div>
137
-	  <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>
137
+	  <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>
138 138
 	</div>
139 139
       </div>
140 140
       <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
... ...
@@ -12,8 +12,8 @@
12 12
 #<!-- Download button text for language enabled packages -->
13 13
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15
-<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag>
16
-<define-tag button-osx-tbb64>64-bit (Beta)</define-tag>
15
+<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
+<define-tag button-osx-tbb64>64-bit</define-tag>
17 17
 <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
18 18
 <define-tag button-lin-tbb64>64-bit (Beta)</define-tag>
19 19
 
... ...
@@ -58,8 +58,8 @@
58 58
     var pkg = caller.attr('id');
59 59
     var lang = caller.val();
60 60
     var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe';
61
-    var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-'+lang+'.zip';
62
-    var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-'+lang+'.zip';
61
+    var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-'+lang+'.zip';
62
+    var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-'+lang+'.zip';
63 63
     var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz';
64 64
     var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz';
65 65
     if(pkg == 'win-tbb'){