Author: phobos Date: 2011-09-06 18:49:32 +0000 (Tue, 06 Sep 2011) New Revision: 25030 Modified: website/trunk/download/en/download.wml website/trunk/include/dlhead.wmi Log: apply jeremy's patch for osx tbb and language issues. Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-06 17:11:27 UTC (rev 25029) +++ website/trunk/download/en/download.wml 2011-09-06 18:49:32 UTC (rev 25030) @@ -1,15 +1,24 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 3-low -#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" #<!-- ATTENTION TRANSLATOR --> -#<!-- You MUST copy 'dlhead.wmi' and 'lang.wmi' along with this file! --> +#<!-- You MUST copy '/include/lang.wmi' along with this file! --> #<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)--> #<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' --> <define-tag lang>en-US</define-tag> +#<!-- 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-lin-tbb32>Tor Browser Bundle (Beta)</define-tag> +<define-tag button-lin-tbb64>64-bit (Beta)</define-tag> + +#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" + <div id="content" class="clearfix"> <div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div> <div id="maincol-left"> @@ -28,9 +37,10 @@ <div class="accordionContent"> <div class="fauxhead"></div> <!-- TOR BROWSER BUNDLE --> +#<!-- NOTE - change language enabled button text at the top of this page --> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a> + <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> <select name="language" id="win-tbb" class="lang"> #include <lang.wmi> </select> @@ -119,21 +129,22 @@ <div class="accordionContent"> <div class="fauxhead"></div> <!-- TOR BROWSER BUNDLE --> +#<!-- NOTE - change language enabled button text at the top of this page --> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <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">Tor Browser Bundle (32-bit Beta)</span></a> + <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"> (<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> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (64-bit Beta)</span></a> - <select name="language" id="osx-tbb" class="lang"> + <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"> - (<a class="osx-tbb-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> + (<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> <a href="<page projects/torbrowser-details>#build">Source Code</a> </form> @@ -168,9 +179,10 @@ <div class="accordionContent"> <div class="fauxhead"></div> <!-- TOR BROWSER BUNDLE --> +#<!-- NOTE - change language enabled button text at the top of this page --> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a> + <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> @@ -178,7 +190,7 @@ (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <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">x86_64 / 64-bit (Beta)</span></a> + <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> Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2011-09-06 17:11:27 UTC (rev 25029) +++ website/trunk/include/dlhead.wmi 2011-09-06 18:49:32 UTC (rev 25030) @@ -61,19 +61,23 @@ var lang = caller.val(); var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; + var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-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'){ - $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a>'); + $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>'); }else if(pkg == 'osx-tbb'){ - $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a>'); + $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>'); + }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>'); }else if(pkg == 'lin-tbb32'){ - $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a>'); + $('.'+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>'); }else if(pkg == 'lin-tbb64'){ - $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal">x86_64 / 64-bit (Beta)</span></a>'); + $('.'+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>'); } } @@ -85,35 +89,6 @@ $('.lang').css('display', 'block'); }); </script> - <script async type="text/javascript"> - function displayVals() { - var t3 = $("#t3").val(); - var amount = $("#amount").val(); - if(t3 != 0){ - $('#a3').val(amount); - $('#p3').val(1); - $('#cmd').val('_xclick-subscriptions'); - $('#item_name').val('Tor Project Membership'); - $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - $('#a3').val(0); - $('#p3').val(0); - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - } - $(function(){ - $("#amount").change(displayVals); - $("#t3").change(displayVals); - displayVals(); - }); - </script> </head> <body onload="resetAll()" onunload=""> <div id="wrap">