r24976: {website} new download page layout from jeremy from ticket 3590. (in website/trunk: . css download/en images js)
Author: phobos Date: 2011-08-29 02:37:19 +0000 (Mon, 29 Aug 2011) New Revision: 24976
Added: website/trunk/download/en/head.wmi website/trunk/download/en/lang.wmi website/trunk/images/button-downloadpage.png website/trunk/images/icon-linux24.png website/trunk/images/icon-mac24.png website/trunk/images/icon-smartphone24.png website/trunk/images/icon-sourcecode24.png website/trunk/images/icon-windows24.png website/trunk/js/ website/trunk/js/dlpage01.js website/trunk/js/jquery.accordion.min.js website/trunk/js/jquery.client.min.js website/trunk/js/jquery.min.js website/trunk/js/ppwidget.js Modified: website/trunk/css/layout-rtl.css website/trunk/css/layout.css website/trunk/css/typography.css website/trunk/download/en/download.wml website/trunk/images/warning.png Log: new download page layout from jeremy from ticket 3590.
Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-08-29 02:12:07 UTC (rev 24975) +++ website/trunk/css/layout-rtl.css 2011-08-29 02:37:19 UTC (rev 24976) @@ -194,16 +194,65 @@ float: left; }
-.windows, -.mac, -.linux, -.android { padding: 5px 30px 5px 0; } +/* DL PAGE ------------*/
-.windows { background-position: right center; } -.mac { background-position: right center; } -.linux { background-position: right center; } -.android { background-position: right center; } +.windows24, +.mac24, +.linux24, +.smartphone24, +.sourcecode24 { + background-position: right center; + padding: 0px 33px 0px 0; + }
+.warning-top { + padding: 10px 60px 10px 10px; + background: url("../images/warning.png") no-repeat scroll 628px 23px #FFFEB6; + } + +.warning-top h2 { + padding-left: 15px; + padding-right: 0px; + } + +.warning-top p { + padding-left: 0; + padding-right: 10px; + } + +.warning h2 { + padding-left: 0; + padding-right: 0px; + } + +.warning p { + padding-left: 0; + padding-right: 10px; + } + +.accordionButton { + padding-left: 0; + padding-right: 10px; + } + +.package p { + padding-left: 0px; + padding-right: 10px; + } + +.downloads { + float: left; + margin: 0px 20px 0 0; + } + +.lang { + float: left; + margin: 0px 0px 0px 7px; + padding: 0px 3px 0px 0px; + } + +/* END DL PAGE ------------*/ + .title { background: url(../images/table-title-arrow-rtl.jpg) right top no-repeat; padding: 10px 10px 0 25px; @@ -220,18 +269,6 @@ } .paypal span { padding-left: 20px; }
-.warning { - background-position: right center; -} - .warning h2 { - background: url("../images/warning2.jpg") no-repeat scroll right top transparent; - padding-right: 40px; - } - - .warning p { - padding-right: 20px; - } - .focus .icon { float: right; margin-left: 10px; @@ -294,11 +331,6 @@ padding-right: 0px; }
-.dbox.dl { - margin: -50px 20px 20px 0px; - float: left; - } - #footer .about { padding-left: 30px; border-left: 1px solid #ddd;
Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-29 02:12:07 UTC (rev 24975) +++ website/trunk/css/layout.css 2011-08-29 02:37:19 UTC (rev 24976) @@ -453,23 +453,163 @@ width: auto; }
-/* DL TABLE ------------*/ +/* DL PAGE ------------*/
-td.intro { padding: 0 0 10px; } +.windows24 { + /* Open Icon Library - Webpage Icons Package + * Source: http://openiconlibrary.sourceforge.net/downloads.html */ + background: url("../images/icon-windows24.png") no-repeat scroll left center transparent; + }
-.windows, -.mac, -.linux, -.android { - padding: 5px 0 5px 30px; - } +.mac24 { + /* Open Icon Library - Webpage Icons Package + * Source: http://openiconlibrary.sourceforge.net/downloads.html */ + background: url("../images/icon-mac24.png") no-repeat scroll left center transparent; + }
-.windows { background: url(../images/icon-windows.gif) left center no-repeat; } -.mac { background: url(../images/icon-mac.gif) left center no-repeat; } -.linux { background: url(../images/icon-linux.gif) left center no-repeat; } -.android { background: url(../images/icon-android.gif) left center no-repeat; } +.linux24 { + /* Open Icon Library - Webpage Icons Package + * Source: http://openiconlibrary.sourceforge.net/downloads.html */ + background: url("../images/icon-linux24.png") no-repeat scroll left center transparent; + }
+.smartphone24 { +/* Icon from the Crystal set + * author: Everaldo Coelho + * source: http://www.everaldo.com/crystal/ + * license: LGPL v2 */ + background: url("../images/icon-smartphone24.png") no-repeat scroll left center transparent; + }
+.sourcecode24 { +/* Icon from the Crystal set + * author: Everaldo Coelho + * source: http://www.everaldo.com/crystal/ + * license: LGPL v2 */ + background: url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent; + } + +.windows24, +.mac24, +.linux24, +.smartphone24, +.sourcecode24 { + display: block; + line-height: 34px; + padding: 0px 0 0px 33px; + } + +.accordionButton { + background: url("../images/table-head.jpg") repeat-x scroll left top #885CA4; + color: #FFFFFF; + margin: 0; + padding-left: 10px; + font-size: 1.1em; + font-weight: bold; + width: 700px; + float: left; + _float: none; /* Float works in all browsers but IE6 */ + border: 1px solid #FFFFFF; + border-bottom: none; + cursor: pointer; + -webkit-border-top-left-radius: 7px; + -webkit-border-top-right-radius: 7px; + -moz-border-radius-topleft: 7px; + -moz-border-radius-topright: 7px; + border-top-left-radius: 7px; + border-top-right-radius: 7px; + } + + .accordionButton:hover { + text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); + } + +.accordionContent { + width: 708px; + float: left; + _float: none; /* Float works in all browsers but IE6 */ + background: #FFFFFF; + display: block; + } + +.package { + float: left; + width: 668px; + margin: 0px; + padding: 25px 20px 20px 20px; + border-top: 1px solid #888888; + } + + .package h2 { + margin-bottom: 3px; + } + + .package p { + margin-top: 20px; + margin-bottom: 5px; + padding-left: 10px; + } + +.downloads { + float: right; + width: 200px; + padding: 0px; + margin: 0px 0 0 20px; + text-align: center; + } + +.lang { + float: right; + display: none; + width: 80px; + height: 18px; + margin: 0px 7px 0px 0px; + padding: 0px 0px 0px 3px; + background-color: #fefff7; + border: 2px solid #CCCFB8; + border-top: 0px; + -webkit-border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + } + +.button { + text-align: center; + display: block; + width: 200px; + height: 60px; + text-decoration: none; + background: url(../images/button-downloadpage.png) bottom left no-repeat #FF9800; + margin: 0px auto 0px auto; + text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + border-radius: 7px; + } + +.button:hover { + background: url(../images/button-downloadpage.png) top left no-repeat #FF9800; + } + +.button .strong { + display: block; + padding: 10px 0 0 0px; + } + +.button .normal { + padding: 5px 0 0 0px; + display: block; + } + +.sig { + display: block; + margin: 3px 0px 20px 0px; + } + + /* MISC ------------*/
.title { @@ -493,23 +633,44 @@ max-width: 365px; } .paypal span { padding-right: 20px; } + +.warning-top { + padding: 10px 10px 10px 60px; + margin: 0px 10px 0px 10px; + display: block; + background: url("../images/warning.png") no-repeat scroll 2px 23px #FFFEB6; + border: 1px solid #A6A427; + border-bottom: none; + -webkit-border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 5px; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + }
+ .warning-top h2 { + padding-right: 15px; + padding-left: 0px; + margin-bottom: 5px; + } + + .warning-top p { + padding-left: 10px; + margin-bottom: 0px; + } + .warning { - background: #F4F2C7; - border: 2px dashed #bfbd8c; - padding: 25px 25px; - margin-top: 4px; - } + float: left; + _float: none; /* Float works in all browsers but IE6 */ + padding: 25px 25px; + margin-top: 4px; + }
- .warning h2 { - background: url("../images/warning2.jpg") no-repeat scroll left top transparent; - padding-left: 40px; - } - - .warning p { - padding-left: 20px; - } - + .warning p { + padding-left: 10px; + } + .focus { background: #f4f2c7; border: 1px solid #ebd4a9; @@ -788,10 +949,19 @@ }
.dbox.dl { - margin: -50px 0px 20px 20px; - float: right; - } - + float: none; + width: 177px; + margin: 0px 5px 20px 5px; + } + +.dbox.dl h2 { + padding: 0; + } + +.dbox.dl input.amount { + width: 120px; + } + .dbox.donate { float: none; padding: 30px 30px;
Modified: website/trunk/css/typography.css =================================================================== --- website/trunk/css/typography.css 2011-08-29 02:12:07 UTC (rev 24975) +++ website/trunk/css/typography.css 2011-08-29 02:37:19 UTC (rev 24976) @@ -240,13 +240,50 @@ line-height: 32px; }
-/* DL TABLE ------------*/ +/* DL PAGE ------------*/
-.column-title { - font-weight: bold; - color: #23300e; -} +.package h2 { + color: #4E6A20; + font-size: 22px; + line-height: 22px; + font-weight: bold; + }
+.package p { + text-indent: 5px; + line-height: 18px; + } + +.lang { + line-height: 18px; + color: #23300E; + font-size: 10px; + } + +.button .strong { + font-size: 20px; + font-weight: bold; + color: #FFFFFF; + } + +.button .normal { + font-size: 12px; + font-weight: bold; + font-style: italic; + color: #FFFFFF; + } + +.siginfo { + font-size: 10px; + text-decoration: none; + font-style: italic; + } + +.additional { + font-size: 12px; + line-height: 16px; + } + /* MISC ------------*/
.continue a:link, @@ -266,6 +303,16 @@ color: #666; }
+.warning-top h2 { + font-size: 1em; + line-height: 18px; + } + +.warning-top p { + font-size: 0.8em; + line-height: 14px; + } + .warning p { color: #3a3a3a; margin-bottom: 0;
Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-29 02:12:07 UTC (rev 24975) +++ website/trunk/download/en/download.wml 2011-08-29 02:37:19 UTC (rev 24976) @@ -3,265 +3,224 @@ # Translation-Priority: 3-low #include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+#<!-- ATTENTION TRANSLATOR --> +#<!-- You MUST copy 'head.wmi' and '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> + <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"> -<h1>Download Tor</h1> + <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"> -<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> + <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 WINDOWS --> -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td> -</tr> -<tr> -<td> - <!-- 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>'); - } -} + <div id="windows" style="border-top: 0px;" class="accordionButton"> + <span class="windows24">Microsoft Windows</span> + </div> + <div class="accordionContent"> + <div class="fauxhead"></div> +<!-- TOR BROWSER BUNDLE --> + <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> + <select name="language" id="win-tbb" class="lang"> +#include <lang.wmi> + </select> + <div class="sig"> + (<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> + </form>
-jQuery(function(){ - jQuery("#amount").change(displayVals); - jQuery("#t3").change(displayVals); - displayVals(); -}); + <h2>Tor Browser Bundle</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> + </div> +<!-- VIDALIA BUNDLE --> + <div class="package"> + <div class="downloads"> + <a class="button" href="<package-win32-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Bundle</span></a> + <div class="sig"> + (<a href="<package-win32-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + <a class="additional" href="<package-win32-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bundle-alpha>.asc">sig</a>) + </div>
-</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> + <h2>Vidalia Bundle</h2> + <em>Windows 7, Vista, and XP</em> + <p>Contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor. <a href="<page docs/tor-doc-windows>">Installation Guide »</a></p> + </div> +<!-- VIDALIA BRIDGE BUNDLE --> + <div class="package"> + <div class="downloads"> + <a class="button" href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle (Beta)</span></a> + <div class="sig"> + (<a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </div>
- <p> + <h2>Vidalia Bridge Bundle</h2> + <em>Windows 7, Vista, and XP</em> + <p>A Vidalia Bundle which is configured to be a <a href="<page docs/bridges>">bridge</a> by default. This helps censored users reach the Tor network. <a href="<page docs/tor-doc-windows>">Installation Guide »</a></p> + </div> +<!-- EXPERT BUNDLE --> + <div class="package"> + <div class="downloads"> + <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> + <div class="sig"> + (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) + </div>
- <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"> - </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> - - <!-- DONATION WIDGET END --> - -The Tor Software for Windows comes bundled in four different ways: -<ul> -<li>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 »</a></li> -<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor.</li> -<li>The <strong>Bridge-by-Default Vidalia Bundle</strong> is a -<strong>Vidalia Bundle</strong> which is configured to be a <a -href="<page docs/bridges>">bridge</a> in order to help censored users -reach the Tor network.</li> -<li>The <strong>Expert Bundle</strong> contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually.</li> -</ul> -<p>There are two versions of each package, a stable and alpha release. Stable packages are released when we believe the features and code will not change for many months. Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads. Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p> -<p>The current stable version of Tor for Windows is <version-win32-stable>. The current alpha/unstable version of Tor for Windows is <version-win32-alpha>.</p> -</td> -</tr> -<tr class="gray"> -<td><span class="windows"> -Tor Browser Bundle (English) version <version-torbrowserbundle>, works with -Windows 7, Vista, and XP. <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>) -</span> -</td> -</tr> -<tr> -<td><span class="windows"> -Tor Browser Instant Messaging Bundle (English) has been -<a href="https://blog.torproject.org/blog/tor-im-browser-bundle-discontinued-temporarily">temporarily discontinued</a>. -</span> - </td> -</tr> - <tr class="gray"> - <td><span class="windows"> -Download <a href="<page projects/torbrowser>">other language versions and the source code</a> of the Tor Browser Bundle. -</span> -</td> -</tr> - <tr><td><span class="windows"> - Stable Vidalia Bundle works with Windows 7, Vista, XP, <a href="<package-win32-bundle-stable>">Download Stable</a> (<a href="<package-win32-bundle-stable>.asc">sig</a>) - </span></td> - </tr> - <tr class="gray"><td><span class="windows">Unstable Vidalia Bundle works with Windows 7, Vista, XP, <a href="<package-win32-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bundle-alpha>.asc">sig</a>)</span></td> - </tr> - <tr class="gray"><td><span class="windows">Unstable Bridge-by-Default Vidalia Bundle works with Windows 7, Vista, XP, <a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe">Download Unstable</a> (<a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.asc">sig</a>)</span></td> - </tr> - <tr> - <td><span class="windows">Stable Expert Bundle works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, <a href="../dist/win32/tor-<version-win32-stable>-win32.exe">Download Stable</a> (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>)</span></td> -</tr> - <tr class="gray"> - <td><span class="windows">Unstable Expert Bundle works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, -<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) - </span></td> - </tr> - <tr> -<td> -<a href="<page docs/tor-doc-windows>">Documentation for Microsoft Windows clients</a> -</td> -</tr> -</table> + <h2>Expert Bundle</h2> + <em>Windows 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em> + <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually.</p> + </div> + </div> <!-- END WINDOWS --> <!-- START OS X --> -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="mac">Apple OS X</a></div></td> -</tr> -<tr> -<td class="intro">The Tor Software for OS X comes bundled in two different ways: -<ul> -<li>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 »</a></li> -<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor.</li> -</ul> -<p>There are two versions of each package, a stable and alpha release. Stable packages are released when we believe the features and code will not change for many months. Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads. Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p> -<p>The current stable version of Tor for OS X is <version-osx-x86-stable>. The current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>.</p> -</td> -</tr> -<tr class="gray"> -<td><span class="mac">Tor Browser Bundle for OS X Intel (beta version), -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a> -(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>) -</span> -</td> -</tr> -<tr> -<td><span class="mac">Stable Vidalia Bundle for OS X Intel, <a href="<package-osx-x86-bundle-stable>">Download Stable</a> (<a href="<package-osx-x86-bundle-stable>.asc">sig</a>)</span></td> -</tr> -<tr class="gray"> -<td><span class="mac">Unstable Vidalia Bundle for OS X Intel, <a href="<package-osx-x86-bundle-alpha>">Download Unstable</a> (<a href="<package-osx-x86-bundle-alpha>.asc">sig</a>)</span></td> -</tr> -<tr> -<td><span class="mac">Stable Vidalia Bundle for OS X PowerPC, <a href="<package-osx-ppc-bundle-stable>">Download Stable</a> (<a href="<package-osx-ppc-bundle-stable>.asc">sig</a>)</span></td> -</tr> -<tr class="gray"> -<td><span class="mac">Unstable Vidalia Bundle for OS X PowerPC, <a href="<package-osx-ppc-bundle-alpha>">Download Unstable</a> (<a href="<package-osx-ppc-bundle-alpha>.asc">sig</a>)</span></td> -</tr> -<tr> -<td><a href="<page docs/tor-doc-osx>">Documentation for Apple OS X clients</a>.</td> -</tr> -</table> + <div id="apple" class="accordionButton"> + <span class="mac24">Apple OS X</span></div> + <div class="accordionContent"> + <div class="fauxhead"></div> +<!-- TOR BROWSER BUNDLE --> + <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 (Beta)</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 href="<page projects/torbrowser-details>#build">Source Code</a> + </form> + + <h2>Tor Browser Bundle</h2> + <em>Version <version-torbrowserbundleosx> - OS X Intel</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> +<!-- VIDALIA BUNDLE --> + <div class="package"> + <div class="downloads"> + <a class="button" href="<package-osx-x86-bundle-stable>"><span class="strong">Download</span><span class="normal">OS X Intel</span></a> + <div class="sig"> + (<a href="<package-osx-x86-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + <a class="button" href="<package-osx-ppc-bundle-stable>"><span class="strong">Download</span><span class="normal">OS X Power PC</span></a> + <div class="sig"> + (<a href="<package-osx-ppc-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + Download Unstable<br /><a class="additional" href="<package-osx-x86-bundle-alpha>">OS X Intel</a> (<a href="<package-osx-x86-bundle-alpha>.asc">sig</a>)<br /><a class="additional" href="<package-osx-ppc-bundle-alpha>">OS X PowerPC</a> (<a href="<package-osx-ppc-bundle-alpha>.asc">sig</a>) + </div> + + <h2>Vidalia Bundle</h2> + <em>OS X Intel, OS X Power PC</em> + <p>Contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor. <a href="<page docs/tor-doc-osx>">Installation Guide »</a></p> + </div> + </div> <!-- END OS X --> <!-- START UNIX --> - <table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="linux">Linux/Unix</a></div></td></tr> -<tr> -<td class="intro">The Tor Software comes bundled in two different ways: -<ul> -<li>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 »</a></li> -<li>Read how to use <a href="<page download/download-unix>">our repositories for the Tor software</a>.</li> -</ul> -</td> -</tr> -<tr class="gray"> -<td><span class="linux">Tor Browser Bundle for GNU/Linux (beta version) on i686, -<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">Download</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><span class="linux">Tor Browser Bundle for GNU/Linux (beta version) on x86_64, -<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">Download</a> -(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc">sig</a>)</span></td> -</tr> -<tr class="gray"> -<td><span class="linux">Use <a href="<page download/download-unix>">our repositories</a> for all other Tor-related software.</span></td> -</tr> -</table> -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="smartphones">Tor for Smartphones</a></div></td> -</tr> -<tr class="gray"> -<td colspan="2">Android-based phones, tablets, computers</td> -<td><a href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk">Android Bundle</a></td> -<td><a href="<page docs/android>">Android Instructions</a></td> -</tr> -<tr> -<td colspan="2">iPhone, iPod Touch, iPad</td> -<td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td> -</tr> -<tr class="gray"> -<td>Nokia Maemo/N900</td> -<td></td> -<td><span class="nokia"><a href="<page docs/N900>">Experimental instructions</a></span></td> -<td></td> -</tr> -</table> + <div id="linux" class="accordionButton"> + <span class="linux24">Linux, BSD, & Unix</span></div> + <div class="accordionContent"> + <div class="fauxhead"></div> + <!-- TOR BROWSER BUNDLE --> + <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> + <select name="language" id="lin-tbb32" class="lang"> +#include <lang.wmi> + </select> + <div class="sig"> + (<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> + <select name="language" id="lin-tbb64" class="lang"> +#include <lang.wmi> + </select> + <div class="sig"> + (<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> + </form> + + <h2>Tor Browser Bundle</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</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>Use <a href="<page download/download-unix>">our repositories</a> for all other Tor-related software.</p> + </div> + </div> <!-- END UNIX --> +<!-- START SMARTPHONES --> + <div id="smartphone" class="accordionButton"> + <span class="smartphone24">Tor for Smartphones</span></div> + <div class="accordionContent"> + <div class="fauxhead"></div> +<!-- ANDROID --> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <div class="downloads"> + <a class="button" style="margin-bottom: 5px;" href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk"><span class="strong">Download</span><span class="normal">Android Bundle</span></a> + <a class="additional" href="<page docs/android>">Installation Instructions</a> + </div> + + <h2>Android Bundle</h2> + <p>For Android-based phones, tablets, and computers.</p> + </div> +<!-- iOS --> + <div class="package"> + <div class="downloads" style="padding-top: 20px;"> + <a class="additional" style="font-weight: bold;" href="http://sid77.slackware.it/iphone/">Test Packages by Marco</a> + </div> + + <h2>Tor for Apple iOS</h2> + <p>For iPhone, iPod Touch, and iPad.</p> + </div> +<!-- Nokia --> + <div class="package" style="border-bottom: 0px;"> + <div class="downloads"> + <a class="additional" style="font-weight: bold;" href="<page docs/N900>">Experimental Instructions</a> + </div> + + <h2>Nokia Maemo/N900</h2> + </div> + </div> +<!-- END SMARTPHONES --> <!-- BEGIN SOURCE --> -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="source">Source Code</a></div></td> -</tr> -<tr> -<td colspan="2">The current stable version of Tor is <version-stable>. Its <a -href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog%22%3Erel... -notes</a> are available.</td> -<td colspan="2">The current unstable/alpha version of Tor is <version-alpha>. Its -<a -href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/ChangeL... -</a> is available.</td> -</tr> -<tr class="gray"> -<td>Source Tarballs</td> -<td>./configure && make && src/or/tor</td> -<td><a href="../dist/tor-<version-stable>.tar.gz">Download Stable</a> (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>)</td> -<td><a href="../dist/tor-<version-alpha>.tar.gz">Download Unstable</a> (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>)</td> -</tr> -</table> + <div class="accordionButton"> + <span class="sourcecode24">Source Code</span></div> + <div class="accordionContent"> + <div class="fauxhead"></div> + <div class="package" style="padding-top: 13px; border-top: 0px; border-bottom: 1px solid #888888;"> + <div class="downloads"> + <a class="button" href="../dist/tor-<version-stable>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code</span></a> + <div class="sig"> + (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + <a class="button" href="../dist/tor-<version-alpha>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Unstable)</span></a> + <div class="sig"> + (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </div> + + <h2>Source Tarball</h2> + <p> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code></p> + <p>The current stable version of Tor is 0.2.1.30. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog">release notes</a> are available.</p> + <p>The current unstable/alpha version of Tor is 0.2.2.30-rc. Its <a href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/ChangeLog">Changelog</a> is available.</p> + </div> + </div> <!-- END SOURCE --> +<!-- END DOWNLOADS --> <br> <!-- BEGIN WARNING --> <div class="warning"> @@ -351,39 +310,56 @@ <!-- END WARNING --> </div> <!-- END MAINCOL --> +<!-- START SIDECOL --> <div id="sidecol-right"> +<!-- START DONATION WIDGET --> +<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="<page donate/thankyou>"> + <input type="hidden" name="cancel_return" value="<page download/download>"> + </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>Jump to:</h2> -<ul> -<li class="dropdown"><a href="#Windows">Microsoft Windows</a></li> -<li class="dropdown"><a href="#mac">Apple OS X</a></li> -<li class="dropdown"><a href="#linux">Linux/Unix</a></li> -<li class="dropdown"><a href="#smartphones">Smartphones</a></li> -<li class="dropdown"><a href="#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> <!-- END SIDECOL --> </div>
Added: website/trunk/download/en/head.wmi =================================================================== --- website/trunk/download/en/head.wmi (rev 0) +++ website/trunk/download/en/head.wmi 2011-08-29 02:37:19 UTC (rev 24976) @@ -0,0 +1,197 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$(TITLE)</title> + <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" +type="application/rss+xml">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> + <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> + + #<link href="css/master.css" rel="stylesheet" type="text/css"> + <!--[if lte IE 8]> + <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie8-and-down.css"> + <![endif]--> + <!--[if lte IE 7]> + <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css"> + <![endif]--> + <!--[if IE 6]> + <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css"> + <![endif]--> + +# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <script type="text/javascript" src="../js/jquery.min.js"> +#/* jQuery */ + </script> + <script type="text/javascript" src="../js/jquery.client.min.js"> +/* "jQuery Browser And OS Detection Plugin" by Stoiman + Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plugi... + License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plugi...) */ + </script> + <script type="text/javascript" src="../js/dlpage01.js"> +#/* Displays detected section */ + </script> + <script async type="text/javascript" src="../js/jquery.accordion.min.js"> +/* Modified version of "Stupid Simple jQuery Accordian Menu" originally developed by Ryan Stemkoski + Source: http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/ + License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */ + </script> + <script async type="text/javascript"> +#/* switches package links depending on selection */ + function updateLang() { + var caller = $( this ); + 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-torbrowserbundleosx>-dev-osx-i386-'+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+'-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+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.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+'-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+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); + } + } + + $(function(){ + $('.lang').ready(updateLang); + $('.lang').change(updateLang); + /* Only show language selector if javascript is enabled */ + $('.lang').css('display', 'block'); + }); + </script> + <script async type="text/javascript" src="../js/ppwidget.js"> +#/* Script For Donation Widget */ + </script> +</head> +<body onload="resetAll()" onunload=""> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> + <!-- END NAV --> + # end navigation generation + <div id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> + <!-- END CALLTOACTION --> + </div> + <!-- END HEADER --> + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">
Added: website/trunk/download/en/lang.wmi =================================================================== --- website/trunk/download/en/lang.wmi (rev 0) +++ website/trunk/download/en/lang.wmi 2011-08-29 02:37:19 UTC (rev 24976) @@ -0,0 +1,20 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> + +#<!-- Remove 'selected="selected"' from English option and add it to preferred default language option --> +#<!-- IMPORTANT: You MUST also change '<define-tag lang>en-US</define-tag>' within download.wml --> + + <option value="en-US" selected="selected">English</option> + <option value="ar">العربية</option> + <option value="de">Deutsch</option> + <option value="es-ES">Español</option> + <option value="fa">فارسی</option> + <option value="fr">Français</option> + <option value="it">Italiano</option> + <option value="nl">Nederlands</option> + <option value="pl">Polish</option> + <option value="pt-PT">Português</option> + <option value="ru">Русский</option> + <option value="vi">Vietnamese</option> + <option value="zh-CN">简体字</option>
Added: website/trunk/images/button-downloadpage.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/button-downloadpage.png ___________________________________________________________________ Added: svn:mime-type + image/png
Added: website/trunk/images/icon-linux24.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/icon-linux24.png ___________________________________________________________________ Added: svn:mime-type + image/png
Added: website/trunk/images/icon-mac24.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/icon-mac24.png ___________________________________________________________________ Added: svn:mime-type + image/png
Added: website/trunk/images/icon-smartphone24.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/icon-smartphone24.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/png
Added: website/trunk/images/icon-sourcecode24.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/icon-sourcecode24.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/png
Added: website/trunk/images/icon-windows24.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/icon-windows24.png ___________________________________________________________________ Added: svn:mime-type + image/png
Modified: website/trunk/images/warning.png =================================================================== (Binary files differ)
Added: website/trunk/js/dlpage01.js =================================================================== (Binary files differ)
Property changes on: website/trunk/js/dlpage01.js ___________________________________________________________________ Added: svn:mime-type + application/javascript
Added: website/trunk/js/jquery.accordion.min.js =================================================================== (Binary files differ)
Property changes on: website/trunk/js/jquery.accordion.min.js ___________________________________________________________________ Added: svn:mime-type + application/javascript
Added: website/trunk/js/jquery.client.min.js =================================================================== (Binary files differ)
Property changes on: website/trunk/js/jquery.client.min.js ___________________________________________________________________ Added: svn:mime-type + application/javascript
Added: website/trunk/js/jquery.min.js =================================================================== (Binary files differ)
Property changes on: website/trunk/js/jquery.min.js ___________________________________________________________________ Added: svn:mime-type + application/javascript
Added: website/trunk/js/ppwidget.js =================================================================== (Binary files differ)
Property changes on: website/trunk/js/ppwidget.js ___________________________________________________________________ Added: svn:mime-type + application/javascript
tor-commits@lists.torproject.org
-
Andrew Lewman