Author: phobos Date: 2011-09-28 12:48:57 +0000 (Wed, 28 Sep 2011) New Revision: 25131 Modified: website/trunk/css/layout-rtl.css website/trunk/css/layout.css website/trunk/css/typography.css website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml website/trunk/include/dlhead.wmi website/trunk/js/dlpage01.js website/trunk/js/jquery.accordion.min.js Log: and we have a new download-easy page from ticket 3926. Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/css/layout-rtl.css 2011-09-28 12:48:57 UTC (rev 25131) @@ -269,6 +269,29 @@ /* END DL PAGE ------------*/ +/* DOWNLOAD-EASY ----------*/ + +.easy .package p { + padding-right: 0px; + } + +.easy .package p.alt-dl { + padding-right: 0px; + } + +.easy .downloads { + margin-left: 0px; + margin-right: 30px; + } + +.lang-alt { + float: left; + margin-right: 0px; + margin-left: 10px; +} + +/* END DOWNLOAD-EASY ----------*/ + .title { background: url(../images/table-title-arrow-rtl.jpg) right top no-repeat; padding: 10px 10px 0 25px; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/css/layout.css 2011-09-28 12:48:57 UTC (rev 25131) @@ -518,6 +518,7 @@ } .accordionButton:hover { + background: url("../images/table-title-hover.jpg") repeat-x left bottom #885CA4; text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); } @@ -636,7 +637,102 @@ margin: 3px 0px 20px 0px; } +/* DOWNLOAD-EASY ---*/ +.easy { + width: 710px; + height: 241px; + background: url(../images/easy-bg.png) repeat-x scroll left 85px; + margin-bottom: 10px; + } + +.easy .package h2, +.easy .package em { + display: block; + width: 100%; + text-align: center; + } + +.easy .package h2 { + font-size: 30px; + font-weight: normal; + padding-top: 10px; + padding-bottom: 5px; + } + +.easy .package em { + font-size: 12px; + padding-bottom: 30px; + } + +.easy .package p { + padding-left: 0px; + font-size: 15px; + text-align: justify; + } + +.easy .package p.alt-dl { + text-align: center; + text-indent: 0px; + padding-left: 0px; + margin-top: 32px; + } + +.all-dl { + display: block; + text-align: center; + width: 100%; + font-size: 15px; +} + +.all-dl a{ + text-decoration: none; + font-weight: bold; +} + +.all-dl a:hover{ + text-decoration: underline; +} + +.easy .package { + float: none; + padding-left: 30px; + padding-right: 30px; + width: 651px; + } + +.easy .downloads { + margin-left: 30px; + padding-top: 125px; + background: url(../images/easy-tbb.png) no-repeat scroll center 10px; + } + +.easy.windows, +.easy.linux, +.easy.mac { + border: 1px solid #885CA4; + border-radius: 10px; + } + +.open { + display: block; + } + +.lang-alt { + line-height: 15px; + font-size: 10px; + float: right; + margin-right: 10px; +} + +.expander { + text-align: right; + float: right; + padding: 10px 20px 0 0px; + font-size: 15px; + display: none; +} + /* MISC ------------*/ .title { Modified: website/trunk/css/typography.css =================================================================== --- website/trunk/css/typography.css 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/css/typography.css 2011-09-28 12:48:57 UTC (rev 25131) @@ -250,7 +250,7 @@ } .package p { - text-indent: 5px; + text-indent: 0px; line-height: 18px; } Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/download/en/download-easy.wml 2011-09-28 12:48:57 UTC (rev 25131) @@ -1,196 +1,265 @@ ## translation metadata # Revision: $Revision$ -# Translation-Priority: 1-high +# Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Easy Download Selector" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#<!-- ATTENTION TRANSLATOR --> +#<!-- 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-easy>">Easy Download Selector</a></div> -<div id="maincol-left"> + <div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div> + <div id="maincol-left"> <!-- BEGIN TEASER WARNING --> + <div class="warning-top"> + <h2>Want Tor to really work?</h2> + <p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. Read the <a href="#warning">full list of warnings</a>. + </p> + </div> +<!-- END TEASER WARNING --> +<!-- START DOWNLOADS --> +<!-- START DOWNLOADS --> +<!-- START WINDOWS --> + <div class="easy windows"> + <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"><button-win-tbb32></span></a> + <select name="language" id="win-tbb" class="lang"> +#include <lang.wmi> + </select> + <div class="sig" style="margin-bottom: 5px;"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a> + (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> + <h2>Tor Browser Bundle for Windows</h2> + <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> + <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</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 --> + <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"> +#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> + </div> + </form> + <h2>Tor Browser Bundle for Mac</h2> + <em>Version <version-torbrowserbundleosx> - OS X</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> + <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 LINUX --> + <div class="easy linux"> + <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"><button-lin-tbb32></span></a> + <select name="language" id="lin-tbb32" 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-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> + </form> + <h2>Tor Browser Bundle for Linux</h2> + <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> + <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> + <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p> +<!-- END DOWNLOADS --><br> +<!-- BEGIN WARNING --> <div class="warning"> -<h2>Want Tor to really work?</h2> -<p>...then please don't just install it and go on. You need to change some of -your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all -you need to maintain your anonymity. Read the <a -href="<page download/download>#warning">full list of warnings</a>. +<a name="warning"></a> +<a name="Warning"></a> +<h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2> +<p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. There are several major pitfalls to watch out for: </p> -</div> -<!-- END TEASER WARNING --> -<br> -<table class="toppad" summary=""> -<tbody> -<tr style="vertical-align:top;"> -<td class="nopad" height="1" style="vertical-align:top;"> -<h2>Tor Browser Bundle</h2> +<ol> +<li> +Tor only protects Internet applications that are configured to +send their traffic through Tor — it doesn't magically anonymize +all your traffic just because you install it. We recommend you +use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a +href="<page torbutton/index>">Torbutton</a> extension. +</li> -</td> +<li> +Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, +Quicktime, Adobe's PDF plugin, and others: they can be manipulated +into revealing your IP address. For example, that means Youtube is +disabled. If you really need your Youtube, you can <a href="<page +torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> to allow it; but +be aware that you're opening yourself up to potential attack. Also, +extensions like Google toolbar look up more information about the +websites you type in: they may bypass Tor and/or broadcast sensitive +information. Some people prefer using two browsers (one for Tor, one +for non-Tor browsing). +</li> - <!-- DONATION WIDGET BEGIN --> -<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> -<script type="text/javascript"> -function displayVals() { - var t3 = jQuery("#t3").val(); - var amount = jQuery("#amount").val(); - if(t3 != 0){ - jQuery('#a3').val(amount); - jQuery('#p3').val(1); - jQuery('#cmd').val('_xclick-subscriptions'); - jQuery('#item_name').val('Tor Project Membership'); - jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - jQuery('#a3').val(0); - jQuery('#p3').val(0); - jQuery('#cmd').val('_donations'); - jQuery('#item_name').val('Donation to the Tor Project'); - jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - jQuery('#cmd').val('_donations'); - jQuery('#item_name').val('Donation to the Tor Project'); - jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } -} +<li> +Beware of cookies: if you ever browse without Tor and a site gives +you a cookie, that cookie could identify you even when you start +using Tor again. Torbutton tries to handle your cookies safely. <a +href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help +protect any cookies you do not want to lose. +</li> -jQuery(function(){ - jQuery("#amount").change(displayVals); - jQuery("#t3").change(displayVals); - displayVals(); -}); +<li> +Tor anonymizes the origin of your traffic, and it encrypts everything +between you and the Tor network and everything inside the Tor network, +but <a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it +can't encrypt your traffic between the Tor network and its final +destination.</a> If you are communicating sensitive information, you +should use as much care as you would on the normal scary Internet — +use HTTPS or other end-to-end encryption and authentication. <a +href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> is a +Firefox extension produced as a collaboration between The Tor Project +and the Electronic Frontier Foundation. It encrypts your communications +with a number of major websites. +</li> -</script> -<td class="nopad" rowspan="8" style="width:220px;vertical-align:top;"> - <form class="dbox" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2>Donate to Tor</h2> - <p> - <select name="currency_code" class="cur"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> - </p> - <p> - <input type="hidden" id="a3" name="a3" value="0"> - <select id="t3" name="t3"> - <option value="0">One-time Donation</option> - <option value="M">Monthly Subscription</option> - </select> - </p> - <p> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" id="cmd" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donations@torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/download-easy"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p> - <a href="<page donate/donate>">Other donation options...</a> - </p> - </form> -</td> - <!-- DONATION WIDGET END --> +<li> +While Tor blocks attackers on your local network from discovering +or influencing your destination, it opens new risks: malicious or +misconfigured Tor exit nodes can send you the wrong page, or even send +you embedded Java applets disguised as domains you trust. Be careful +opening documents or applications you download through Tor, unless you've +verified their integrity. +</li> -</tr> -<tr> -<td>The <strong>Tor Browser Bundle</strong> contains 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 -& other languages »</a></td> +<li> +Tor tries to prevent attackers from learning what destinations you connect +to. It doesn't prevent somebody watching your traffic from learning that +you're using Tor. You can mitigate (but not fully resolve) the risk +by using a <a href="<page docs/bridges>">Tor bridge relay</a> rather than +connecting directly to the public Tor network, but ultimately the best +protection here is a social approach: the more Tor users there are near +you and the more <a href="<page about/torusers>">diverse</a> their interests, +the less dangerous it will be that you are one of them. +</li> -</tr> -<tr class="gray"> -<td><span class="windows"> -# Translators: please point to the version of TBB in your language, if there is one. -<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>  -(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>) -</span> -</td> -</tr> -<tr> -<td><span class="mac"> -# Translators: please point to the version of TBB in your language, if there is one. -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>  -(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>) -</span> -</td> -</tr> -<tr class="gray"> -<td><span class="linux"> -# Translators: please point to the version of TBB in your language, if there is one. -<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>  -(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc">sig</a>) -</span> -</td> -</tr> -<tr> -<td> -<p>Looking for something else? <a href="<page download/download>">View All Downloads</a>.</p> -</td> -</tr> -<tr class="gray"> -<td colspan="2"> -<p>To keep informed of security advisories and new stable releases, subscribe to the <a -href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce -mailing list</a>. You can also <a -href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch -the list's RSS feed</a>.</p> -<p>Interested in <a href="<page about/overview>">learning more about Tor in general</a>?</p> -</td> -</tr> -</tbody> -</table> +<li> Do not use <a +href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent +and Tor</a> together. +</li> +</ol> +<br> +<p> +Be smart and learn more. Understand what Tor does and does not offer. +This list of pitfalls isn't complete, and we need your +help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting +all the issues</a>. +</p> </div> +<!-- END WARNING --> +</div> <!-- END MAINCOL --> +<!-- START SIDECOL --> <div id="sidecol-right"> +<!-- START DONATION WIDGET --> + <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> +<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <h2>Donate to Tor</h2> + <p> + <select name="currency_code" class="cur"> + <option value="USD" selected="selected">$</option> + <option value="EUR">€</option> + <option value="GBP">£</option> + <option value="YEN">¥</option> + </select> + <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + </p> + <p> + <input type="hidden" id="a3" name="a3" value="0"> + <select id="t3" name="t3"> + <option value="0">One-time Donation</option> + <option value="M">Monthly Subscription</option> + </select> + </p> + <p> + <input type="hidden" id="p3" name="p3" value="1"> + <input type="hidden" name="sra" value="1"> + <input type="hidden" name="src" value="1"> + <input type="hidden" name="no_shipping" value="1"> + <input type="hidden" name="no_note" value="1"> + <input type="hidden" id="cmd" name="cmd" value="_donations"> + <input type="hidden" name="business" value="donations@torproject.org"> + <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html"> + </p> + <h6 id="ppinfo" style="height:0px;"></h6> + <p> + <input class="donate-btn" type="submit" name="donate" value="Donate"> + </p> + <p><a href="<page donate/donate>">Other donation options...</a></p> +</form> +<!-- END DONATION WIDGET --> +<!-- START INFO --> <div class="img-shadow"> <div class="sidenav-sub"> -<h2>Advanced Choices:</h2> -<ul> -<li class="dropdown"><a href="<page download/download>#Windows">Microsoft Windows</a></li> -<li class="dropdown"><a href="<page download/download>#mac">Apple OS X</a></li> -<li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li> -<li class="dropdown"><a href="<page download/download>#smartphones">Smartphones</a></li> -<li class="dropdown"><a href="<page download/download>#source">Source Code</a></li> -</ul> -</div> -</div> -<!-- END SIDENAV --> -<div class="img-shadow"> -<div class="infoblock"> -<h2>What is the (sig) link?</h2> -<p>These are GPG signatures to allow you to verify that -your downloaded file is really from The Tor Project and not -an imposter.</p> -<a href="<page docs/verifying-signatures>">Learn more »</a> -</div> -</div> -<!-- END INFOBLOCK --> -<div class="img-shadow"> -<div class="sidenav-sub"> <h2>Having Trouble?</h2> <ul> <li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li> </ul> </div> </div> -<!-- END SIDENAV --> +<!-- END INFO --> </div> -</div><!-- #main --> -<div class=""> -<p><small>All trademarks are the property of their respective owners.</small></p> +<!-- END SIDECOL --> </div> +<!-- END CONTENT --> #include <foot.wmi> - Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/download/en/download.wml 2011-09-28 12:48:57 UTC (rev 25131) @@ -45,6 +45,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a> (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a> @@ -140,6 +141,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</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> <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> @@ -147,6 +149,7 @@ #include <lang.wmi> </select> <div class="sig"> + <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> <a href="<page projects/torbrowser-details>#build">Source Code</a> @@ -190,6 +193,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> (<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> @@ -198,6 +202,7 @@ #include <lang.wmi> </select> <div class="sig"> + <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> <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a> @@ -267,6 +272,7 @@ <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">Changelog</a> is available.</p> </div> </div> + <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div> <!-- END SOURCE --> <!-- END DOWNLOADS --> <br> @@ -360,6 +366,18 @@ <!-- END MAINCOL --> <!-- START SIDECOL --> <div id="sidecol-right"> +<div class="img-shadow sidenav"> +<div class="sidenav-sub"> +<h2>Jump To:</h2> +<ul> +<li class="dropdown"><a href="<page download/download>#windows">Microsoft Windows</a></li> +<li class="dropdown"><a href="<page download/download>#apple">Apple OS X</a></li> +<li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li> +<li class="dropdown"><a href="<page download/download>#smartphone">Smartphones</a></li> +<li class="dropdown"><a href="<page download/download>#source">Source Code</a></li> +</ul> +</div> +</div> <!-- START DONATION WIDGET --> <script async type="text/javascript"> function displayVals() { @@ -390,7 +408,7 @@ displayVals(); }); </script> -<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> +<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;"> <h2>Donate to Tor</h2> <p> <select name="currency_code" class="cur"> Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/include/dlhead.wmi 2011-09-28 12:48:57 UTC (rev 25131) @@ -67,15 +67,21 @@ if(pkg == 'win-tbb'){ $('.'+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>'); + $('.mac-alt').replaceWith('<a class="mac-alt" href="'+osxtbb+'">Mac</a>'); + $('.lin-alt').replaceWith('<a class="lin-alt" href="'+lintbb32+'">Linux</a>'); }else if(pkg == 'osx-tbb'){ $('.'+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>'); + $('.win-alt').replaceWith('<a class="lin-win" href="'+wintbb+'">Windows</a>'); + $('.lin-alt').replaceWith('<a class="lin-alt" href="'+lintbb32+'">Linux</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"><button-lin-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); + $('.mac-alt').replaceWith('<a class="lin-mac" href="'+osxtbb+'">Mac</a>'); + $('.win-alt').replaceWith('<a class="lin-win" href="'+wintbb+'">Windows</a>'); }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>'); Modified: website/trunk/js/dlpage01.js =================================================================== (Binary files differ) Modified: website/trunk/js/jquery.accordion.min.js =================================================================== (Binary files differ)