Browse code

and we have a new download-easy page from ticket 3926.

Andrew Lewman authored on28/09/2011 14:48:57
Showing8 changed files
... ...
@@ -269,6 +269,29 @@ table tr img {
269 269
 
270 270
 /* END DL PAGE ------------*/
271 271
 
272
+/* DOWNLOAD-EASY ----------*/
273
+
274
+.easy .package p {
275
+  padding-right: 0px;
276
+  }
277
+
278
+.easy .package p.alt-dl {
279
+  padding-right: 0px;
280
+  }
281
+
282
+.easy .downloads {
283
+  margin-left: 0px;
284
+  margin-right: 30px;
285
+  }
286
+
287
+.lang-alt {
288
+  float: left;
289
+  margin-right: 0px;
290
+  margin-left: 10px;
291
+}
292
+
293
+/* END DOWNLOAD-EASY ----------*/
294
+
272 295
 .title {
273 296
 	background: url(../images/table-title-arrow-rtl.jpg) right top no-repeat;
274 297
 	padding: 10px 10px 0 25px;
... ...
@@ -518,6 +518,7 @@ table tr img {
518 518
   }
519 519
 
520 520
   .accordionButton:hover {
521
+    background: url("../images/table-title-hover.jpg") repeat-x left bottom #885CA4;
521 522
     text-shadow: 1px 1px 0px rgba(17, 17, 17, 1);
522 523
     }
523 524
 
... ...
@@ -636,6 +637,101 @@ table tr img {
636 637
   margin: 3px 0px 20px 0px;
637 638
   }
638 639
 
640
+/* DOWNLOAD-EASY ---*/
641
+
642
+.easy {
643
+  width: 710px;
644
+  height: 241px;
645
+  background: url(../images/easy-bg.png) repeat-x scroll left 85px;
646
+  margin-bottom: 10px;
647
+  }
648
+
649
+.easy .package h2,
650
+.easy .package em {
651
+  display: block;
652
+  width: 100%;
653
+  text-align: center;
654
+  }
655
+
656
+.easy .package h2 {
657
+  font-size: 30px;
658
+  font-weight: normal;
659
+  padding-top: 10px;
660
+  padding-bottom: 5px;
661
+  }
662
+
663
+.easy .package em {
664
+  font-size: 12px;
665
+  padding-bottom: 30px;
666
+  }
667
+
668
+.easy .package p {
669
+  padding-left: 0px;
670
+  font-size: 15px;
671
+  text-align: justify;
672
+  }
673
+
674
+.easy .package p.alt-dl {
675
+  text-align: center;
676
+  text-indent: 0px;
677
+  padding-left: 0px;
678
+  margin-top: 32px;
679
+  }
680
+
681
+.all-dl {
682
+  display: block;
683
+  text-align: center;
684
+  width: 100%;
685
+  font-size: 15px;
686
+}
687
+
688
+.all-dl a{
689
+  text-decoration: none;
690
+  font-weight: bold;
691
+}
692
+
693
+.all-dl a:hover{
694
+  text-decoration: underline;
695
+}
696
+
697
+.easy .package {
698
+  float: none;
699
+  padding-left: 30px;
700
+  padding-right: 30px;
701
+  width: 651px;
702
+  }
703
+
704
+.easy .downloads {
705
+  margin-left: 30px;
706
+  padding-top: 125px;
707
+  background: url(../images/easy-tbb.png) no-repeat scroll center 10px;
708
+  }
709
+
710
+.easy.windows,
711
+.easy.linux,
712
+.easy.mac {
713
+  border: 1px solid #885CA4;
714
+  border-radius: 10px;
715
+  }
716
+
717
+.open {
718
+  display: block;
719
+  }
720
+
721
+.lang-alt {
722
+  line-height: 15px;
723
+  font-size: 10px;
724
+  float: right;
725
+  margin-right: 10px;
726
+}
727
+
728
+.expander {
729
+  text-align: right;
730
+  float: right;
731
+  padding: 10px 20px 0 0px;
732
+  font-size: 15px;
733
+  display: none;
734
+}
639 735
 
640 736
 /* MISC ------------*/
641 737
 
... ...
@@ -250,7 +250,7 @@ table .name {
250 250
   }
251 251
 
252 252
 .package p {
253
-  text-indent: 5px;
253
+  text-indent: 0px;
254 254
   line-height: 18px;
255 255
   }
256 256
 
... ...
@@ -1,182 +1,253 @@
1 1
 ## translation metadata
2 2
 # Revision: $Revision$
3
-# Translation-Priority: 1-high
3
+# Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor: Easy Download Selector" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
+#<!-- ATTENTION TRANSLATOR -->
6
+#<!-- You MUST copy '/include/lang.wmi' along with this file! -->
7
+
8
+#<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)-->
9
+#<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' -->
10
+<define-tag lang>en-US</define-tag>
11
+
12
+#<!-- Download button text for language enabled packages -->
13
+<define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
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>
17
+<define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag>
18
+<define-tag button-lin-tbb64>64-bit (Beta)</define-tag>
19
+
20
+#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
6 21
 
7 22
 <div id="content" class="clearfix">
8
-<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download-easy>">Easy Download Selector</a></div>
9
-<div id="maincol-left">
23
+  <div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
24
+  <div id="maincol-left">
10 25
 <!-- BEGIN TEASER WARNING -->
26
+    <div class="warning-top">
27
+      <h2>Want Tor to really work?</h2>
28
+	<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>.
29
+	</p>
30
+      </div>
31
+<!-- END TEASER WARNING -->
32
+<!-- START DOWNLOADS -->
33
+<!-- START DOWNLOADS -->
34
+<!-- START WINDOWS -->
35
+      <div class="easy windows">
36
+	<div class="package" style="padding-top: 13px; border-top: 0px;">
37
+	  <form class="downloads">
38
+	    <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>
39
+	    <select name="language" id="win-tbb" class="lang">
40
+#include <lang.wmi>
41
+	    </select>
42
+	    <div class="sig" style="margin-bottom: 5px;">
43
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
44
+	      (<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>
45
+	    </div>
46
+	  </form>
47
+	  <h2>Tor Browser Bundle for Windows</h2>
48
+	  <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em>
49
+	  <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>
50
+	  <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>
51
+	</div>
52
+      </div>
53
+<!-- START MAC -->
54
+      <div class="easy mac">
55
+	<div class="package" style="padding-top: 13px; border-top: 0px;">
56
+	  <form class="downloads">
57
+	    <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>
58
+	    <select name="language" id="mac-tbb" class="lang">
59
+#include <lang.wmi>
60
+	    </select>
61
+	    <div class="sig" style="margin-bottom: 5px;">
62
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
63
+	      (<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>
64
+	    </div>
65
+	  </form>
66
+	  <h2>Tor Browser Bundle for Mac</h2>
67
+	  <em>Version <version-torbrowserbundleosx> - OS X</em>
68
+	  <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>
69
+	  <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>
70
+	</div>
71
+      </div>
72
+<!-- START LINUX -->
73
+      <div class="easy linux">
74
+	<div class="package" style="padding-top: 13px; border-top: 0px;">
75
+	  <form class="downloads">
76
+	    <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>
77
+	    <select name="language" id="lin-tbb32" class="lang">
78
+#include <lang.wmi>
79
+	    </select>
80
+	    <div class="sig" style="margin-bottom: 5px;">
81
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
82
+	      (<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>
83
+	    </div>
84
+	  </form>
85
+	  <h2>Tor Browser Bundle for Linux</h2>
86
+	  <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
87
+	  <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>
88
+	  <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>
89
+	</div>
90
+      </div>
91
+      <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
92
+<!-- END DOWNLOADS --><br>
93
+<!-- BEGIN WARNING -->
11 94
 <div class="warning">
12
-<h2>Want Tor to really work?</h2>
13
-<p>...then please don't just install it and go on. You need to change some of
14
-your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all
15
-you need to maintain your anonymity. Read the <a
16
-href="<page download/download>#warning">full list of warnings</a>.
95
+<a name="warning"></a>
96
+<a name="Warning"></a>
97
+<h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>
98
+<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:
17 99
 </p>
18
-</div>
19
-<!-- END TEASER WARNING -->
20
-<br>
21 100
 
22
-<table class="toppad" summary="">
23
-<tbody>
24
-<tr style="vertical-align:top;">
25
-<td class="nopad" height="1" style="vertical-align:top;">
26
-<h2>Tor Browser Bundle</h2>
101
+<ol>
102
+<li>
103
+Tor only protects Internet applications that are configured to
104
+send their traffic through Tor &mdash; it doesn't magically anonymize
105
+all your traffic just because you install it.  We recommend you
106
+use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a
107
+href="<page torbutton/index>">Torbutton</a> extension.
108
+</li>
27 109
 
28
-</td>
110
+<li>
111
+Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer,
112
+Quicktime, Adobe's PDF plugin, and others: they can be manipulated
113
+into revealing your IP address. For example, that means Youtube is
114
+disabled. If you really need your Youtube, you can <a href="<page
115
+torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> to allow it; but
116
+be aware that you're opening yourself up to potential attack. Also,
117
+extensions like Google toolbar look up more information about the
118
+websites you type in: they may bypass Tor and/or broadcast sensitive
119
+information. Some people prefer using two browsers (one for Tor, one
120
+for non-Tor browsing).
121
+</li>
29 122
 
30
- <!-- DONATION WIDGET BEGIN -->
31
-<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script>
32
-<script type="text/javascript">
33
-function displayVals() {
34
-      var t3 = jQuery("#t3").val();
35
-      var amount = jQuery("#amount").val();
36
-      if(t3 != 0){
37
-	    jQuery('#a3').val(amount);
38
-	    jQuery('#p3').val(1);
39
-		 jQuery('#cmd').val('_xclick-subscriptions');
40
-		 jQuery('#item_name').val('Tor Project Membership');
41
-		 jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
42
-	  }else{
43
-	  	jQuery('#a3').val(0);
44
-	  	jQuery('#p3').val(0);
45
-		jQuery('#cmd').val('_donations');
46
-   	jQuery('#item_name').val('Donation to the Tor Project');
47
-		 jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
48
-	  }
49
-	  if( !t3 ) {
50
-	   jQuery('#cmd').val('_donations');
51
-   	jQuery('#item_name').val('Donation to the Tor Project');
52
-		 jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
53
-     }
54
-}
123
+<li>
124
+Beware of cookies: if you ever browse without Tor and a site gives
125
+you a cookie, that cookie could identify you even when you start
126
+using Tor again. Torbutton tries to handle your cookies safely. <a
127
+href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help
128
+protect any cookies you do not want to lose.
129
+</li>
55 130
 
56
-jQuery(function(){
57
- 	jQuery("#amount").change(displayVals);
58
- 	jQuery("#t3").change(displayVals);
59
- 	displayVals();
60
-});
131
+<li>
132
+Tor anonymizes the origin of your traffic, and it encrypts everything
133
+between you and the Tor network and everything inside the Tor network,
134
+but <a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it
135
+can't encrypt your traffic between the Tor network and its final
136
+destination.</a> If you are communicating sensitive information, you
137
+should use as much care as you would on the normal scary Internet &mdash;
138
+use HTTPS or other end-to-end encryption and authentication.  <a
139
+href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> is a
140
+Firefox extension produced as a collaboration between The Tor Project
141
+and the Electronic Frontier Foundation. It encrypts your communications
142
+with a number of major websites.
143
+</li>
61 144
 
62
-</script>
63
-<td class="nopad" rowspan="8" style="width:220px;vertical-align:top;">
64
-	<form class="dbox" action="https://www.paypal.com/cgi-bin/webscr" method="post">
65
-		<h2>Donate to Tor</h2>
66
-		<p>
67
-		    <select name="currency_code" class="cur">
68
-			  <option value="USD" selected="selected">$</option>
69
-			  <option value="EUR">&euro;</option>
70
-			  <option value="GBP">&pound;</option>
71
-			  <option value="YEN">&yen;</option>
72
-			</select>
73
-			<input type="text" id="amount" class="amount" name="amount" value="5" size="10">		
74
-		</p>
75
-		<p>
76
-			<input type="hidden" id="a3" name="a3" value="0">
77
-			<select id="t3" name="t3">
78
-				<option value="0">One-time Donation</option>
79
-				<option value="M">Monthly Subscription</option>
80
-			</select>		
81
-		</p>
82
-		<p>
83
-		   <input type="hidden" id="p3" name="p3" value="1">
84
-		   <input type="hidden" name="sra" value="1">
85
-	      <input type="hidden" name="src" value="1">
86
-		   <input type="hidden" name="no_shipping" value="1">
87
-	      <input type="hidden" name="no_note" value="1">
88
-		   <input type="hidden" id="cmd" name="cmd" value="_donations">
89
-	      <input type="hidden" name="business" value="donations@torproject.org">
90
-	      <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
91
-	      <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou">
92
-		   <input type="hidden" name="cancel_return" value="https://www.torproject.org/download-easy">
93
-		</p>
94
-		<h6 id="ppinfo" style="height:0px;"></h6>		
95
-		<p>
96
-		   <input class="donate-btn" type="submit" name="donate" value="Donate">
97
-		</p>
98
-		<p>
99
-			<a href="<page donate/donate>">Other donation options...</a>
100
-		</p>
101
-	</form>
102
-</td>
103
- <!-- DONATION WIDGET END -->
145
+<li>
146
+While Tor blocks attackers on your local network from discovering
147
+or influencing your destination, it opens new risks: malicious or
148
+misconfigured Tor exit nodes can send you the wrong page, or even send
149
+you embedded Java applets disguised as domains you trust. Be careful
150
+opening documents or applications you download through Tor, unless you've
151
+verified their integrity.
152
+</li>
104 153
 
105
-</tr>
106
-<tr>
107
-<td>The <strong>Tor Browser Bundle</strong> contains everything you need
108
-to safely browse the Internet. This package requires no installation.
109
-Just extract it and run. <a href="<page projects/torbrowser>">Learn more
110
-&amp; other languages &raquo;</a></td>
154
+<li>
155
+Tor tries to prevent attackers from learning what destinations you connect
156
+to. It doesn't prevent somebody watching your traffic from learning that
157
+you're using Tor. You can mitigate (but not fully resolve) the risk
158
+by using a <a href="<page docs/bridges>">Tor bridge relay</a> rather than
159
+connecting directly to the public Tor network, but ultimately the best
160
+protection here is a social approach: the more Tor users there are near
161
+you and the more <a href="<page about/torusers>">diverse</a> their interests,
162
+the less dangerous it will be that you are one of them.
163
+</li>
111 164
 
112
-</tr>
113
-<tr class="gray">
114
-<td><span class="windows">
115
-# Translators: please point to the version of TBB in your language, if there is one.
116
-<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>&nbsp;
117
-(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
118
-</span>
119
-</td>
120
-</tr>
121
-<tr>
122
-<td><span class="mac">
123
-# Translators: please point to the version of TBB in your language, if there is one.
124
-<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>&nbsp;
125
-(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>)
126
-</span>
127
-</td>
128
-</tr>
129
-<tr class="gray">
130
-<td><span class="linux">
131
-# Translators: please point to the version of TBB in your language, if there is one.
132
-<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>&nbsp;
133
-(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc">sig</a>)
134
-</span>
135
-</td>
136
-</tr>
137
-<tr>
138
-<td>
139
-<p>Looking for something else? <a href="<page download/download>">View All Downloads</a>.</p>
140
-</td>
141
-</tr>
142
-<tr class="gray">
143
-<td colspan="2">
144
-<p>To keep informed of security advisories and new stable releases, subscribe to the <a
145
-href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce
146
-mailing list</a>. You can also <a
147
-href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch
148
-the list's RSS feed</a>.</p>
149
-<p>Interested in <a href="<page about/overview>">learning more about Tor in general</a>?</p> 
150
-</td>
151
-</tr>
152
-</tbody>
153
-</table>
165
+<li> Do not use <a
166
+href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent
167
+and Tor</a> together.
168
+</li>
169
+</ol>
170
+<br>
171
+<p>
172
+Be smart and learn more. Understand what Tor does and does not offer.
173
+This list of pitfalls isn't complete, and we need your
174
+help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting
175
+all the issues</a>.
176
+</p>
177
+</div>
178
+<!-- END WARNING -->
154 179
 </div>
155 180
 <!-- END MAINCOL -->
181
+<!-- START SIDECOL -->
156 182
 <div id="sidecol-right">
157
-<div class="img-shadow">
158
-<div class="sidenav-sub">
159
-<h2>Advanced Choices:</h2>
160
-<ul>
161
-<li class="dropdown"><a href="<page download/download>#Windows">Microsoft Windows</a></li>
162
-<li class="dropdown"><a href="<page download/download>#mac">Apple OS X</a></li>
163
-<li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li>
164
-<li class="dropdown"><a href="<page download/download>#smartphones">Smartphones</a></li>
165
-<li class="dropdown"><a href="<page download/download>#source">Source Code</a></li>
166
-</ul>
167
-</div>
168
-</div>
169
-<!-- END SIDENAV -->
170
-<div class="img-shadow">
171
-<div class="infoblock">
172
-<h2>What is the (sig) link?</h2>
173
-<p>These are GPG signatures to allow you to verify that
174
-your downloaded file is really from The Tor Project and not
175
-an imposter.</p>
176
-<a href="<page docs/verifying-signatures>">Learn more &raquo;</a>
177
-</div>
178
-</div>
179
-<!-- END INFOBLOCK -->
183
+<!-- START DONATION WIDGET -->
184
+  <script async type="text/javascript">
185
+  function displayVals() {
186
+    var t3 = $("#t3").val();
187
+    var amount = $("#amount").val();
188
+    if(t3 != 0){
189
+      $('#a3').val(amount);
190
+      $('#p3').val(1);
191
+      $('#cmd').val('_xclick-subscriptions');
192
+      $('#item_name').val('Tor Project Membership');
193
+      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
194
+    }else{
195
+      $('#a3').val(0);
196
+      $('#p3').val(0);
197
+      $('#cmd').val('_donations');
198
+      $('#item_name').val('Donation to the Tor Project');
199
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
200
+    }
201
+    if( !t3 ) {
202
+      $('#cmd').val('_donations');
203
+      $('#item_name').val('Donation to the Tor Project');
204
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
205
+    }
206
+  }
207
+  $(function(){
208
+    $("#amount").change(displayVals);
209
+    $("#t3").change(displayVals);
210
+    displayVals();
211
+  });
212
+  </script>
213
+<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
214
+    <h2>Donate to Tor</h2>
215
+      <p>
216
+	<select name="currency_code" class="cur">
217
+	  <option value="USD" selected="selected">$</option>
218
+	  <option value="EUR">&euro;</option>
219
+	  <option value="GBP">&pound;</option>
220
+	  <option value="YEN">&yen;</option>
221
+	</select>
222
+	<input type="text" id="amount" class="amount" name="amount" value="5" size="10">
223
+      </p>
224
+      <p>
225
+	<input type="hidden" id="a3" name="a3" value="0">
226
+	  <select id="t3" name="t3">
227
+	    <option value="0">One-time Donation</option>
228
+	    <option value="M">Monthly Subscription</option>
229
+	  </select>
230
+      </p>
231
+      <p>
232
+	<input type="hidden" id="p3" name="p3" value="1">
233
+	<input type="hidden" name="sra" value="1">
234
+	<input type="hidden" name="src" value="1">
235
+	<input type="hidden" name="no_shipping" value="1">
236
+	<input type="hidden" name="no_note" value="1">
237
+	<input type="hidden" id="cmd" name="cmd" value="_donations">
238
+	<input type="hidden" name="business" value="donations@torproject.org">
239
+	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
240
+	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
241
+	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
242
+      </p>
243
+      <h6 id="ppinfo" style="height:0px;"></h6>
244
+      <p>
245
+	<input class="donate-btn" type="submit" name="donate" value="Donate">
246
+      </p>
247
+      <p><a href="<page donate/donate>">Other donation options...</a></p>
248
+</form>
249
+<!-- END DONATION WIDGET -->
250
+<!-- START INFO -->
180 251
 <div class="img-shadow">
181 252
 <div class="sidenav-sub">
182 253
 <h2>Having Trouble?</h2>
... ...
@@ -185,12 +256,10 @@ an imposter.</p>
185 256
 </ul>
186 257
 </div>
187 258
 </div>
188
-<!-- END SIDENAV -->
259
+<!-- END INFO -->
189 260
 </div>
190
-</div><!-- #main -->
191
-<div class="">
192
-<p><small>All trademarks are the property of their respective owners.</small></p>
261
+<!-- END SIDECOL -->
193 262
 </div>
263
+<!-- END CONTENT -->
194 264
 
195 265
 #include <foot.wmi>
196
-
... ...
@@ -45,6 +45,7 @@
45 45
 #include <lang.wmi>
46 46
 	    </select>
47 47
 	    <div class="sig">
48
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
48 49
 	      (<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>
49 50
 	    </div>
50 51
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a>
... ...
@@ -140,6 +141,7 @@
140 141
 #include <lang.wmi>
141 142
 	    </select>
142 143
 	    <div class="sig">
144
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
143 145
 	      (<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>
144 146
 	    </div>
145 147
 	    <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 @@
147 149
 #include <lang.wmi>
148 150
 	    </select>
149 151
 	    <div class="sig">
152
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
150 153
 	      (<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>
151 154
 	    </div>
152 155
 	    <a href="<page projects/torbrowser-details>#build">Source Code</a>
... ...
@@ -190,6 +193,7 @@
190 193
 #include <lang.wmi>
191 194
 	    </select>
192 195
 	    <div class="sig">
196
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
193 197
 	      (<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>
194 198
 	    </div>
195 199
 
... ...
@@ -198,6 +202,7 @@
198 202
 #include <lang.wmi>
199 203
 	    </select>
200 204
 	    <div class="sig">
205
+	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
201 206
 	      (<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>
202 207
 	    </div>
203 208
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a>
... ...
@@ -267,6 +272,7 @@
267 272
 	  <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>
268 273
 	</div>
269 274
       </div>
275
+      <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div>
270 276
 <!-- END SOURCE -->
271 277
 <!-- END DOWNLOADS -->
272 278
 <br>
... ...
@@ -360,6 +366,18 @@ all the issues</a>.
360 366
 <!-- END MAINCOL -->
361 367
 <!-- START SIDECOL -->
362 368
 <div id="sidecol-right">
369
+<div class="img-shadow sidenav"> 
370
+<div class="sidenav-sub"> 
371
+<h2>Jump To:</h2> 
372
+<ul> 
373
+<li class="dropdown"><a href="<page download/download>#windows">Microsoft Windows</a></li> 
374
+<li class="dropdown"><a href="<page download/download>#apple">Apple OS X</a></li> 
375
+<li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li> 
376
+<li class="dropdown"><a href="<page download/download>#smartphone">Smartphones</a></li> 
377
+<li class="dropdown"><a href="<page download/download>#source">Source Code</a></li> 
378
+</ul> 
379
+</div> 
380
+</div>
363 381
 <!-- START DONATION WIDGET -->
364 382
   <script async type="text/javascript">
365 383
   function displayVals() {
... ...
@@ -390,7 +408,7 @@ all the issues</a>.
390 408
     displayVals();
391 409
   });
392 410
   </script>
393
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
411
+<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;">
394 412
     <h2>Donate to Tor</h2>
395 413
       <p>
396 414
 	<select name="currency_code" class="cur">
... ...
@@ -67,15 +67,21 @@ type="application/rss+xml">">
67 67
     if(pkg == 'win-tbb'){
68 68
       $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>');
69 69
       $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>');
70
+      $('.mac-alt').replaceWith('<a class="mac-alt" href="'+osxtbb+'">Mac</a>');
71
+      $('.lin-alt').replaceWith('<a class="lin-alt" href="'+lintbb32+'">Linux</a>');
70 72
     }else if(pkg == 'osx-tbb'){
71 73
       $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>');
72 74
       $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>');
75
+      $('.win-alt').replaceWith('<a class="lin-win" href="'+wintbb+'">Windows</a>');
76
+      $('.lin-alt').replaceWith('<a class="lin-alt" href="'+lintbb32+'">Linux</a>');
73 77
     }else if(pkg == 'osx-tbb64'){
74 78
       $('.'+pkg).replaceWith('<a class="button osx-tbb64" href="'+osxtbb64+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>');
75 79
       $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb64-sig" href="'+osxtbb64+'.asc">sig</a>');
76 80
     }else if(pkg == 'lin-tbb32'){
77 81
       $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>');
78 82
       $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>');
83
+      $('.mac-alt').replaceWith('<a class="lin-mac" href="'+osxtbb+'">Mac</a>');
84
+      $('.win-alt').replaceWith('<a class="lin-win" href="'+wintbb+'">Windows</a>');
79 85
     }else if(pkg == 'lin-tbb64'){
80 86
       $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>');
81 87
       $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>');
... ...
@@ -1,23 +1,24 @@
1 1
 $(function(){
2 2
   /* If javascript is enabled this hides all sections by default */
3
-  $(".accordianContent").css('display', 'none');
3
+  $(".easy").css('display', 'none');
4 4
   /* Only show language selector if javascript is enabled */
5 5
   $('.lang').css('display', 'block');
6
-  $('.accordionButton').removeClass('on');
7
-  $('.accordionButton').addClass('off');
6
+  $('.lang-alt').css('display', 'none');
7
+  $('.expander').css('display', 'block');
8
+  $('.sidenav').css('display', 'none');
8 9
 });
9 10
 
10 11
 /* Uses result of jquery.client to open the relevant section */
11 12
 function OScheck() {
12 13
   var clientos = $.client.os;
13 14
   if(clientos == "Linux"){
14
-    $('#linux').addClass('open');
15
+    $('.easy.linux').css('display', 'block');
15 16
   }else if(clientos == "Windows"){
16
-    $('#windows').addClass('open');
17
+    $('.easy.windows').css('display', 'block');
17 18
   }else if(clientos == "Mac"){
18
-    $('#apple').addClass('open');
19
-  }else if(clientos == "iPhone/iPod"){
20
-    $('#smartphone').addClass('open');
19
+    $('.easy.mac').css('display', 'block');
20
+  }else{
21
+    $('.easy').css('display', 'block');
21 22
   }
22 23
 }
23 24
   $(function(){
... ...
@@ -32,3 +33,4 @@ function resetAll() {
32 33
     f[i].reset();
33 34
   }
34 35
 }
36
+
... ...
@@ -1 +1,24 @@
1
-$(document).ready(function(){$('.accordionButton').click(function(){if($(this).next().is(':hidden')==true){$(this).addClass('on');$(this).removeClass('off');$(this).next().slideDown('normal');}else{$(this).removeClass('on');$(this).addClass('off');$(this).next().slideUp('normal');}});$('.accordionContent').hide();$(".open").trigger('click');});
2 1
\ No newline at end of file
2
+$(document).ready(function () {
3
+    $('div.accordionButton').click(function () {
4
+        if ($(this).next().is(':hidden') == true) {
5
+            $(this).addClass('on');
6
+            $(this).removeClass('off');
7
+            $(this).next().slideDown('normal');
8
+        } else {
9
+            $(this).removeClass('on');
10
+            $(this).addClass('off');
11
+            $(this).next().slideUp('normal');
12
+        }
13
+    });
14
+    $('.switch').click(function() 
15
+
16
+      {
17
+	  $('.accordionContent').slideDown('normal');
18
+	  $('.accordionButton').addClass('on'); 
19
+	  $('.accordionButton').removeClass('off');
20
+      }
21
+    );
22
+    $('.accordionButton').addClass('off'); 
23
+    $('div.accordionContent').hide();
24
+    $(".open").trigger('click');
25
+});