Browse code

update download page per ticket 10330

Andrew Lewman authored on30/01/2014 04:57:58
Showing6 changed files
... ...
@@ -237,6 +237,7 @@ body {
237 237
 		margin-bottom: 20px;
238 238
 	}
239 239
 
240
+	#dow-don-left,
240 241
 	#maincol-left {
241 242
 		float: left;
242 243
 		width: 710px;
... ...
@@ -270,6 +271,7 @@ body {
270 271
 	margin-right: 20px;
271 272
 }
272 273
 
274
+#dow-don-right,
273 275
 #sidecol-right {
274 276
 	float: right;
275 277
 	width: 230px;
... ...
@@ -580,7 +582,7 @@ table tr img {
580 582
 
581 583
 .package {
582 584
   float: left;
583
-  width: 668px;
585
+  height: 280px;
584 586
   margin: 0px;
585 587
   padding: 25px 20px 20px 20px;
586 588
   border-top: 1px solid #888888;
... ...
@@ -591,16 +593,15 @@ table tr img {
591 593
     }
592 594
 
593 595
   .package p {
594
-    margin-top: 20px;
595
-    margin-bottom: 5px;
596
+    margin-top: 16px;
596 597
     padding-left: 10px;
597 598
     }
598 599
 
599 600
 .downloads {
600
-  float: right;
601
-  width: 200px;
602
-  padding: 0px;
603
-  margin: 0px 0 0 20px;
601
+  display: block;
602
+  float: left;
603
+  width: 238px;
604
+  padding: 0 16px 0 0;
604 605
   text-align: center;
605 606
   }
606 607
 
... ...
@@ -625,28 +626,24 @@ table tr img {
625 626
 .button {
626 627
   text-align: center;
627 628
   display: block;
628
-  width: 200px;
629
-  height: 60px;
629
+  width: 234px;
630
+  height: 69px;
630 631
   text-decoration: none;
631
-  background: url(../images/button-downloadpage.png) bottom left no-repeat #FF9800;
632
-  margin: 0px auto 0px auto;
632
+  background: url(../images/button-downloadpage.png) bottom left no-repeat;
633
+  margin: 0px auto 8px auto;
633 634
   text-shadow: 1px 1px 0px rgba(17, 17, 17, 1);
634 635
   -webkit-border-radius: 7px;
635 636
   -moz-border-radius: 7px;
636 637
   border-radius: 7px;
637 638
   }
638 639
 
639
-.button:hover {
640
-  background: url(../images/button-downloadpage.png) top left no-repeat #FF9800;
641
-  }
642
-
643 640
 .button .strong {
644 641
   display: block;
645
-  padding: 10px 0 0 0px;
642
+  padding: 10px 0 0 57px;
646 643
   }
647 644
 
648 645
 .button .normal {
649
-  padding: 5px 0 0 0px;
646
+  padding: 5px 0 0 57px;
650 647
   display: block;
651 648
   }
652 649
 
... ...
@@ -658,29 +655,38 @@ table tr img {
658 655
 /* DOWNLOAD-EASY ---*/
659 656
 
660 657
 .easy {
661
-  width: 710px;
662
-  background: url(../images/easy-bg.png) repeat-x scroll left 85px;
663
-  margin-bottom: 10px;
664
-  padding-bottom: 15px;
665
-  }
658
+	width: 712px;
659
+	margin-bottom: 10px;
660
+	padding-bottom: 8px;
661
+}
662
+
663
+#download-donate {
664
+	background-attachment: scroll;
665
+	background-clip: border-box;
666
+	background-color: transparent;
667
+	background-image: url(../images/headerbg.jpg);
668
+	background-origin: padding-box;
669
+	background-position: 0% 0%;
670
+	background-repeat: no-repeat;
671
+	background-size: 100% 100%;	
672
+}
666 673
 
667 674
 .easy .package h2,
668 675
 .easy .package em {
669 676
   display: block;
670 677
   width: 100%;
671
-  text-align: center;
678
+  text-align: left;
672 679
   }
673 680
 
674 681
 .easy .package h2 {
675
-  font-size: 24px;
676
-  font-weight: normal;
677 682
   padding-top: 10px;
678 683
   padding-bottom: 5px;
679 684
   }
680 685
 
681 686
 .easy .package em {
682
-  font-size: 12px;
683
-  padding-bottom: 30px;
687
+  font-size: 1.2em;
688
+  padding-top: 8px;
689
+  padding-bottom: 4px;
684 690
   }
685 691
 
686 692
 .easy .package p {
... ...
@@ -690,7 +696,7 @@ table tr img {
690 696
   }
691 697
 
692 698
 .easy .package p.alt-dl {
693
-  text-align: center;
699
+  text-align: left;
694 700
   text-indent: 0px;
695 701
   padding-left: 0px;
696 702
   margin-top: 32px;
... ...
@@ -698,7 +704,7 @@ table tr img {
698 704
 
699 705
 .all-dl {
700 706
   display: block;
701
-  text-align: center;
707
+  text-align: left;
702 708
   width: 100%;
703 709
   font-size: 15px;
704 710
 }
... ...
@@ -714,25 +720,9 @@ table tr img {
714 720
 
715 721
 .easy .package {
716 722
   float: none;
717
-  padding-left: 30px;
718
-  padding-right: 30px;
719
-  width: 651px;
720
-  }
721
-
722
-.easy .downloads {
723
-  margin-left: 30px;
724
-  padding-top: 125px;
725
-  background: url(../images/easy-tbb.png) no-repeat scroll center 10px;
723
+  padding: 0 8px 0 12px ;
726 724
   }
727 725
 
728
-.easy.windows,
729
-.easy.linux,
730
-.easy.mac {
731
-  border: 1px solid #885CA4;
732
-  -webkit-border-radius: 10px;
733
-  -moz-border-radius: 10px;
734
-  border-radius: 10px;  }
735
-
736 726
 .open {
737 727
   display: block;
738 728
   }
... ...
@@ -777,6 +767,7 @@ table tr img {
777 767
 	.paypal span { padding-right: 20px; }
778 768
 
779 769
 .warning-top {
770
+  width: 618px;
780 771
   padding: 10px 10px 10px 60px;
781 772
   margin: 0px 10px 0px 10px;
782 773
   display: block;
... ...
@@ -986,14 +977,10 @@ small {
986 977
 	text-align: center;
987 978
 	color: #222222;
988 979
 	border: none;
989
-    background: #F0DBFA;
990
-	padding: 20px 20px;
980
+	padding: 1.4em 0.7em;
991 981
 	width: 163px;
992 982
 	margin: 0px 0px 0px 10px;
993
-	-webkit-border-radius: 5px;
994
-	-moz-border-radius: 5px;
995
-	border-radius: 5px;
996
-	}
983
+}
997 984
 
998 985
 	.dbox p {
999 986
 		display: block;
... ...
@@ -1002,74 +989,26 @@ small {
1002 989
 		}
1003 990
 
1004 991
 	.dbox h2 {
1005
-		background: url('../images/top_bg.png') no-repeat;
1006
-		color: #23300E;
1007 992
 		padding:13px 0px 15px 0px;
1008 993
         position: relative;
1009
-        top: -33px;
1010 994
         width: 190px;
1011
-        color: white;
995
+		color: black;
1012 996
         font-family: Helvetica, Arial, sans-serif;
1013
-        font-size: 15px;
997
+		font-size: 18px;
1014 998
         font-weight: normal;
1015 999
         height: 35px;
1016 1000
         margin-bottom: -20px;
1017 1001
         margin-left: -6px;
1018 1002
 		}
1019 1003
 
1020
-	.dbox input ,
1021
-	.dbox select {
1022
-	   background-color: #fefff7;
1023
-	   color: #23300E;
1024
-	   border:2px solid #BAB8BD;
1025
-	   -webkit-border-radius: 5px;
1026
-	   -moz-border-radius: 5px;
1027
-	   border-radius: 5px;
1028
-	   padding: 0px 0px 0px 5px;
1029
-	   margin: 0px 0px 10px 0px;
1030
-	   }
1031
-
1032
-		.dbox input:focus ,
1033
-		.dbox select:focus {
1034
-		        outline:none;
1035
-		        border:2px solid #BAB8BD;      
1036
-		  }
1037
-
1038
-		.dbox input.radio {
1039
-		  border: 0px solid;
1040
-		  background: #ffffed;
1041
-		  padding: 0px 0px;
1042
-		  }
1043
-
1044
-	.dbox select.cur {
1045
-		margin-right: 5px;
1046
-		text-align: left;
1047
-		}
1048
-
1049
-	.dbox input.amount {
1050
-		width: 100px;
1051
-		margin-right: 0px;
1052
-		text-align: left;
1053
-		}
1054
-
1055
-	.dbox select#t3 {
1056
-		width: 100%;
1057
-		margin-bottom: 20px;
1058
-		padding: 0px 0px;
1059
-		}
1060
-
1061 1004
 	.dbox input.donate-btn {
1062 1005
 		background: url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;
1063
-		height: 26px;
1064
-		width: 150px;
1006
+		height: 68px;
1007
+		width: 186px;
1065 1008
 		margin-top: 0px;
1066 1009
 		display: block;
1067 1010
 		background-color: transparent;
1068 1011
 		color: transparent;
1069
-		border:0px solid transparent;
1070
-		-webkit-border-radius: 5px;
1071
-		-moz-border-radius: 5px;
1072
-		border-radius: 5px;
1073 1012
 		margin: 10px auto 10px auto;
1074 1013
 		padding: 0px 0px 0px 0px;
1075 1014
 		}
... ...
@@ -1094,14 +1033,13 @@ small {
1094 1033
 		margin: 0px auto 0px auto;
1095 1034
 		text-align: center;
1096 1035
 		font-size: 10px;
1097
-		font-style: italic;
1036
+		font-style: normal;
1098 1037
 		}
1099 1038
 
1100 1039
 .dbox.dl {
1101 1040
   float: none;
1102 1041
   width: 177px;
1103 1042
   margin: 0px 5px 20px 5px;
1104
-  border:1px solid #785688;
1105 1043
   }
1106 1044
 
1107 1045
 
... ...
@@ -1296,9 +1234,3 @@ small {
1296 1234
 }
1297 1235
 /* End hide from IE-mac */
1298 1236
 
1299
-.dbox.dl p:last-child a{color: #785688;
1300
-text-decoration: underline;
1301
-font-weight: bold;
1302
-}
1303
-.dbox.dl select{
1304
-width: 70px;outline-inset:1px;}
... ...
@@ -248,17 +248,25 @@ table .name {
248 248
 /* DL PAGE ------------*/
249 249
 
250 250
 .package h2 {
251
-  color: #4E6A20;
252
-  font-size: 22px;
253
-  line-height: 22px;
254
-  font-weight: bold;
251
+    color: #2A2A2A;
252
+    font-family: Helvetica, Arial, sans-serif;
253
+    font-size: 24px;
254
+    font-weight: normal;
255 255
   }
256 256
 
257
+.package h2 big {
258
+    font-size: 1.5em;
259
+}
260
+
257 261
 .package p {
258 262
   text-indent: 0px;
259 263
   line-height: 18px;
260 264
   }
261 265
 
266
+.package em {
267
+    font-style: normal;
268
+}
269
+
262 270
 .lang {
263 271
   line-height: 18px;
264 272
   color: #23300E;
... ...
@@ -266,6 +274,7 @@ table .name {
266 274
   }
267 275
 
268 276
 .button .strong {
277
+  text-transform: uppercase;
269 278
   font-size: 20px;
270 279
   font-weight: bold;
271 280
   color: #FFFFFF;
... ...
@@ -274,14 +283,12 @@ table .name {
274 283
 .button .normal {
275 284
   font-size: 12px;
276 285
   font-weight: bold;
277
-  font-style: italic;
278 286
   color: #FFFFFF;
279 287
   }
280 288
 
281 289
 .siginfo {
282 290
   font-size: 10px;
283 291
   text-decoration: none;
284
-  font-style: italic;
285 292
   }
286 293
 
287 294
 .additional {
... ...
@@ -19,21 +19,29 @@
19 19
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
20 20
 
21 21
 <div id="content" class="clearfix">
22
-  <div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
23
-  <div id="maincol-left">
24
-<!-- BEGIN TEASER WARNING -->
25
-    <div class="warning-top">
26
-      <h2>Want Tor to really work?</h2>
27
-	<p>You need to change some of your habits, as some things won't work exactly as
28
-you are used to. Please read the <a href="#warning">full list of warnings</a> for details.
29
-	</p>
30
-      </div>
31
-<!-- END TEASER WARNING -->
32
-<!-- START DOWNLOADS -->
33
-<!-- START DOWNLOADS -->
34
-<!-- START WINDOWS -->
22
+	<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
23
+	<!-- BEGIN TEASER WARNING -->
24
+	<div class="warning-top">
25
+		<h2>Want Tor to really work?</h2>
26
+		<p>You need to change some of your habits, as some things won't work exactly as you are used to. Please read the <a href="#warning">full list of warnings</a> for details.</p>
27
+	</div>
28
+	<!-- END TEASER WARNING -->
29
+	<div id="download-donate" class="clearfix">
30
+		<!-- START DOWNLOADS -->
31
+		<!-- START WINDOWS -->
32
+
33
+
34
+
35
+<div id="dow-don-left">
36
+
37
+
35 38
       <div id="windows" class="easy windows">
36 39
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
40
+	  <div class="desc">
41
+	    <h2>Tor Browser Bundle for Windows</h2>
42
+	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
43
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44
+	  </div>
37 45
 	  <form class="downloads">
38 46
 	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
39 47
 	    <select name="language" id="win-tbb" class="lang">
... ...
@@ -44,17 +52,17 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
44 52
 	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
45 53
 	    </div>
46 54
 	  </form>
47
-	  <div class="desc">
48
-	    <h2>Tor Browser Bundle for Windows</h2>
49
-	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
50
-	    <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>
51
-	  </div>
52
-	  <p class="alt-dl">Not Using Windows? Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p>
55
+	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p>
53 56
 	</div>
54 57
       </div>
55 58
 <!-- START MAC -->
56 59
       <div id="mac" class="easy mac">
57 60
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
61
+	  <div class="desc">
62
+	    <h2>Tor Browser Bundle for Mac</h2>
63
+	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>
64
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65
+	  </div>
58 66
 	  <form class="downloads">
59 67
 	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
60 68
 	    <select name="language" id="osx-tbb" class="lang">
... ...
@@ -65,17 +73,18 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
65 73
 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66 74
 	    </div>
67 75
 	  </form>
68
-	  <div class="desc">
69
-	    <h2>Tor Browser Bundle for Mac</h2>
70
-	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>
71
-	    <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>
72
-	  </div>
73 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
74 77
         </div>
75 78
       </div>
76 79
 <!-- START LINUX -->
77 80
       <div id="linux" class="easy linux">
78 81
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
82
+	  <div class="desc">
83
+	    <h2>Tor Browser Bundle for GNU/Linux</h2>
84
+	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
85
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
86
+	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
87
+	  </div>
79 88
 	  <form class="downloads">
80 89
 	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
81 90
 	    <select name="language" id="lin-tbb32" class="lang">
... ...
@@ -86,17 +95,17 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
86 95
 	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
87 96
 	    </div>
88 97
 	  </form>
89
-	  <div class="desc">
90
-	    <h2>Tor Browser Bundle for GNU/Linux</h2>
91
-	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
92
-	    <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>
93
-	  </div>
94 98
 	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
95 99
 	</div>
96 100
       </div>
97 101
 <!-- START LINUX 64-Bit -->
98 102
       <div class="easy linux">
99 103
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
104
+	  <div class="desc">
105
+	    <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2>
106
+	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>
107
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
108
+	  </div>
100 109
 	  <form class="downloads">
101 110
 	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
102 111
 	    <select name="language" id="lin-tbb64" class="lang">
... ...
@@ -107,16 +116,78 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
107 116
 	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
108 117
 	    </div>
109 118
 	  </form>
110
-	  <div class="desc">
111
-	    <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2>
112
-	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>
113
-	    <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>
114
-	  </div>
115 119
 	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
116 120
 	</div>
117 121
       </div>
118 122
       <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
119
-<!-- END DOWNLOADS --><br>
123
+		<!-- END DOWNLOADS --><br>
124
+</div> <!-- END dow-don-left -->
125
+
126
+
127
+
128
+
129
+<div id="dow-don-right">
130
+
131
+<!-- START DONATION WIDGET -->
132
+  <script async type="text/javascript">
133
+  function displayVals() {
134
+    var t3 = $("#t3").val();
135
+    var amount = $("#amount").val();
136
+    if(t3 != 0){
137
+      $('#a3').val(amount);
138
+      $('#p3').val(1);
139
+      $('#cmd').val('_xclick-subscriptions');
140
+      $('#item_name').val('Tor Project Membership');
141
+      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
142
+    }else{
143
+      $('#a3').val(0);
144
+      $('#p3').val(0);
145
+      $('#cmd').val('_donations');
146
+      $('#item_name').val('Donation to the Tor Project');
147
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
148
+    }
149
+    if( !t3 ) {
150
+      $('#cmd').val('_donations');
151
+      $('#item_name').val('Donation to the Tor Project');
152
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
153
+    }
154
+  }
155
+  $(function(){
156
+    $("#amount").change(displayVals);
157
+    $("#t3").change(displayVals);
158
+    displayVals();
159
+  });
160
+  </script>
161
+<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
162
+    <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2>
163
+      <p>
164
+	<input type="hidden" name="currency_code" class="cur" value="USD">
165
+	<input type="hidden" id="a3" name="a3" value="0">
166
+	<input type="hidden" id="t3" name="t3" value="0">
167
+	<input type="hidden" id="amount" class="amount" name="amount" value="10" size="10">
168
+	<input type="hidden" id="p3" name="p3" value="1">
169
+	<input type="hidden" name="sra" value="1">
170
+	<input type="hidden" name="src" value="1">
171
+	<input type="hidden" name="no_shipping" value="1">
172
+	<input type="hidden" name="no_note" value="1">
173
+	<input type="hidden" id="cmd" name="cmd" value="_donations">
174
+	<input type="hidden" name="business" value="donations@torproject.org">
175
+	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
176
+	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou">
177
+	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download-easy">
178
+      </p>
179
+      <h6 id="ppinfo" style="height:0px;"></h6>
180
+      <p>
181
+	<input class="donate-btn" type="submit" name="donate" value="Donate">
182
+      </p>
183
+      <p><a href="<page donate/donate>">Other donation options...</a></p>
184
+</form> <!-- END DONATION WIDGET -->
185
+</div> <!-- END dow-don-right -->
186
+
187
+
188
+
189
+	</div> <!-- END download-donate -->
190
+	<div id="maincol-left">
120 191
 <!-- BEGIN WARNING -->
121 192
 <div class="warning">
122 193
 <a name="warning"></a>
... ...
@@ -218,73 +289,6 @@ the issues</a>.</p>
218 289
 <!-- END MAINCOL -->
219 290
 <!-- START SIDECOL -->
220 291
 <div id="sidecol-right">
221
-<!-- START DONATION WIDGET -->
222
-  <script async type="text/javascript">
223
-  function displayVals() {
224
-    var t3 = $("#t3").val();
225
-    var amount = $("#amount").val();
226
-    if(t3 != 0){
227
-      $('#a3').val(amount);
228
-      $('#p3').val(1);
229
-      $('#cmd').val('_xclick-subscriptions');
230
-      $('#item_name').val('Tor Project Membership');
231
-      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
232
-    }else{
233
-      $('#a3').val(0);
234
-      $('#p3').val(0);
235
-      $('#cmd').val('_donations');
236
-      $('#item_name').val('Donation to the Tor Project');
237
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
238
-    }
239
-    if( !t3 ) {
240
-      $('#cmd').val('_donations');
241
-      $('#item_name').val('Donation to the Tor Project');
242
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
243
-    }
244
-  }
245
-  $(function(){
246
-    $("#amount").change(displayVals);
247
-    $("#t3").change(displayVals);
248
-    displayVals();
249
-  });
250
-  </script>
251
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
252
-    <h2>Support more privacy!</h2>
253
-      <p>
254
-	<select name="currency_code" class="cur">
255
-	  <option value="USD" selected="selected">$</option>
256
-	  <option value="EUR">&euro;</option>
257
-	  <option value="GBP">&pound;</option>
258
-	  <option value="YEN">&yen;</option>
259
-	</select>
260
-	<input type="text" id="amount" class="amount" name="amount" value="10" size="10">
261
-      </p>
262
-      <p>
263
-	<input type="hidden" id="a3" name="a3" value="0">
264
-	  <select id="t3" name="t3">
265
-	    <option value="0">One-time Donation</option>
266
-	    <option value="M">Monthly Subscription</option>
267
-	  </select>
268
-      </p>
269
-      <p>
270
-	<input type="hidden" id="p3" name="p3" value="1">
271
-	<input type="hidden" name="sra" value="1">
272
-	<input type="hidden" name="src" value="1">
273
-	<input type="hidden" name="no_shipping" value="1">
274
-	<input type="hidden" name="no_note" value="1">
275
-	<input type="hidden" id="cmd" name="cmd" value="_donations">
276
-	<input type="hidden" name="business" value="donations@torproject.org">
277
-	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
278
-	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
279
-	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
280
-      </p>
281
-      <h6 id="ppinfo" style="height:0px;"></h6>
282
-      <p>
283
-	<input class="donate-btn" type="submit" name="donate" value="Donate">
284
-      </p>
285
-      <p><a href="<page donate/donate>">Other donation options...</a></p>
286
-</form>
287
-<!-- END DONATION WIDGET -->
288 292
 <div class="img-shadow sidenav-ez">
289 293
 <div class="sidenav-sub">
290 294
 <ul>
291 295
Binary files a/images/btn_donateCC_LG.gif and b/images/btn_donateCC_LG.gif differ
292 296
Binary files a/images/button-downloadpage.png and b/images/button-downloadpage.png differ
293 297
new file mode 100644
294 298
Binary files /dev/null and b/images/headerbg.jpg differ