Browse code

patches to download page to fix some display issues, layout issues, and organization issues, from jeremy

Andrew Lewman authored on29/08/2011 20:50:48
Showing7 changed files
... ...
@@ -331,6 +331,11 @@ select#lang {
331 331
 		padding-right: 0px;
332 332
 		}
333 333
 
334
+	.dbox.donate ul.amounts li {
335
+		margin-left: 0px;
336
+		margin-right: 15px;
337
+		}
338
+
334 339
 #footer .about {
335 340
 	padding-left: 30px;
336 341
 	border-left: 1px solid #ddd;
... ...
@@ -67,97 +67,92 @@ body {
67 67
 				width: auto;
68 68
 			}
69 69
 			
70
-	#calltoaction {
71
-		height: 30px;
72
-		float: right;
73
-		margin-top: 10px;
74
-		margin-right: 5px;
75
-		text-align: center;
76
-	}
70
+#calltoaction {
71
+  height: 30px;
72
+  float: right;
73
+  margin-top: 10px;
74
+  margin-right: 5px;
75
+  text-align: center;
76
+  }
77 77
 	
78
-    #calltoaction ul {
79
-      padding: 0;
80
-      margin: 0px;
81
-      height: 30px;
82
-      list-style: none;
83
-      float: right;
78
+  #calltoaction ul {
79
+    padding: 0;
80
+    margin: 0px;
81
+    height: 30px;
82
+    list-style: none;
83
+    float: right;
84
+    }
85
+
86
+  #calltoaction ul li {
87
+    list-style: none;
88
+    display: inline;
89
+    float: none;
90
+    width: 100px;
91
+    margin-left: 0px;
92
+    }
93
+  
94
+  #calltoaction ul li a:link,
95
+  #calltoaction ul li a:visited {
96
+    display: block;
97
+    background: url(../images/cta-buttons.jpg) top center no-repeat #885ca4;
98
+    padding: 4px 8px;
99
+    color: #FFFFFF;
100
+    font-weight: bold;
101
+    text-decoration: none;
102
+    font-size: 13px;
103
+    line-height: 22px;
104
+    height: 22px;
105
+    width: 84px;
106
+    float: left;
107
+    text-shadow: 1px 1px 0px #111111;
108
+    }
109
+
110
+  #calltoaction ul li:hover a {
111
+    background: url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;
112
+    font-weight: bold;
113
+    text-shadow: 1px 1px 0px #111111;
114
+    }
115
+  
116
+  #calltoaction ul li:first-child a:link,
117
+  #calltoaction ul li:first-child a:visited,
118
+  #calltoaction ul li:hover:first-child a {
119
+    -webkit-border-top-left-radius: 7px;
120
+    -webkit-border-bottom-left-radius: 7px;
121
+    -moz-border-radius-topleft: 7px;
122
+    -moz-border-radius-bottomleft: 7px;
123
+    border-top-left-radius: 7px;
124
+    border-bottom-left-radius: 7px;
125
+    }
126
+
127
+  #calltoaction ul li:first-child a:link,
128
+  #calltoaction ul li:first-child a:visited {
129
+    background: url(../images/cta-buttons.jpg) top left no-repeat #885ca4;
130
+    }
131
+
132
+  #calltoaction ul li:hover:first-child a {
133
+    background: url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800;
134
+    }
135
+
136
+  #calltoaction ul li:last-child a:link,
137
+  #calltoaction ul li:last-child a:visited,
138
+  #calltoaction ul li:hover:last-child a {
139
+    -webkit-border-top-right-radius: 7px;
140
+    -webkit-border-bottom-right-radius: 7px;
141
+    -moz-border-radius-topright: 7px;
142
+    -moz-border-radius-bottomright: 7px;
143
+    border-top-right-radius: 7px;
144
+    border-bottom-right-radius: 7px;
145
+    }
146
+
147
+  #calltoaction ul li:last-child a:link,
148
+  #calltoaction ul li:last-child a:visited {
149
+    background: url(../images/cta-buttons.jpg) top right no-repeat #885ca4;
150
+    color: #FFFFFF;
151
+    }
152
+  
153
+  #calltoaction ul li:hover:last-child a {
154
+    background: url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800;
84 155
     }
85
-    	     
86
-      #calltoaction ul li {
87
-        list-style: none;
88
-        display: inline;
89
-        float: none;
90
-        width: 100px;
91
-        margin-left: 0px;
92
-      }
93
-      
94
-      #calltoaction ul li a:link,
95
-      #calltoaction ul li a:visited {
96
-        background: url(../images/cta-buttons.jpg) top center no-repeat #885ca4;
97
-        padding: 8px 8px 0px;
98
-        color: #FFFFFF;
99
-        font-weight: bold;
100
-        text-decoration: none;
101
-        font-size: 1.067em;
102
-        line-height: 1.067em;
103
-        height: 22px;
104
-        width: 84px;
105
-        float: left;
106
-        text-shadow: 0px -1px 2px #111111, 0px 1px 2px #666666;
107
-      }
108
-
109
-      #calltoaction ul li:first-child a:link,
110
-      #calltoaction ul li:first-child a:visited {
111
-        background: url(../images/cta-buttons.jpg) top left no-repeat #885ca4;
112
-		  -webkit-border-top-left-radius: 7px;
113
-		  -webkit-border-bottom-left-radius: 7px;
114
-		  -moz-border-radius-topleft: 7px;
115
-		  -moz-border-radius-bottomleft: 7px;
116
-		  border-top-left-radius: 7px;
117
-		  border-bottom-left-radius: 7px;
118
-        padding-left: 7px;
119
-        width: 85px;
120
-        }
121
-
122
-      #calltoaction ul li:last-child a:link,
123
-      #calltoaction ul li:last-child a:visited {
124
-        background: url(../images/cta-buttons.jpg) top right no-repeat #885ca4;
125
-		  -webkit-border-top-right-radius: 7px;
126
-		  -webkit-border-bottom-right-radius: 7px;
127
-		  -moz-border-radius-topright: 7px;
128
-		  -moz-border-radius-bottomright: 7px;
129
-		  border-top-right-radius: 7px;
130
-		  border-bottom-right-radius: 7px;
131
-        padding-right: 9px;
132
-        width: 83px;
133
-        color: #FFFFFF;
134
-       }
135
-      
136
-      #calltoaction ul li:hover a {
137
-        background: url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;
138
-        font-weight: bold;
139
-        text-shadow: 1px 1px 4px #111111;
140
-        }
141
-      
142
-      #calltoaction ul li:hover:first-child a {
143
-        background: url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800;
144
-        -webkit-border-top-left-radius: 7px;
145
-		  -webkit-border-bottom-left-radius: 7px;
146
-		  -moz-border-radius-topleft: 7px;
147
-		  -moz-border-radius-bottomleft: 7px;
148
-		  border-top-left-radius: 7px;
149
-		  border-bottom-left-radius: 7px;
150
-        }
151
-
152
-      #calltoaction ul li:hover:last-child a {
153
-        background: url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800;
154
-		  -webkit-border-top-right-radius: 7px;
155
-		  -webkit-border-bottom-right-radius: 7px;
156
-		  -moz-border-radius-topright: 7px;
157
-		  -moz-border-radius-bottomright: 7px;
158
-		  border-top-right-radius: 7px;
159
-		  border-bottom-right-radius: 7px;
160
-        }
161 156
 
162 157
 
163 158
 /* BANNER ------------*/
... ...
@@ -495,17 +490,18 @@ table tr img {
495 490
 .smartphone24,
496 491
 .sourcecode24 {
497 492
   display: block;
498
-  line-height: 34px;
493
+  line-height: 32px;
499 494
   padding: 0px 0 0px 33px;
500 495
   }
501 496
 
502 497
 .accordionButton {
503
-  background: url("../images/table-head.jpg") repeat-x scroll left top #885CA4;
498
+  background: url("../images/table-title.jpg") repeat-x left bottom #885CA4;
504 499
   color: #FFFFFF;
505 500
   margin: 0;
506 501
   padding-left: 10px;
507 502
   font-size: 1.1em;
508 503
   font-weight: bold;
504
+  height: 32px;
509 505
   width: 700px;
510 506
   float: left;
511 507
   _float: none;  /* Float works in all browsers but IE6 */
... ...
@@ -532,6 +528,10 @@ table tr img {
532 528
   display: block;
533 529
   }
534 530
 
531
+.accordionContent .fauxhead {
532
+  width: 710px;
533
+  }
534
+
535 535
 .package {
536 536
   float: left;
537 537
   width: 668px;
... ...
@@ -1025,7 +1025,7 @@ small {
1025 1025
 
1026 1026
 	.dbox.donate ul.amounts li {
1027 1027
 		display: inline-block;
1028
-		margin-left: 20px;
1028
+		margin-left: 15px;
1029 1029
 		}
1030 1030
 
1031 1031
 	.dbox.donate ul.amounts li label {
... ...
@@ -29,7 +29,7 @@ other more sophisticated transactions</a></li>
29 29
   </ul>
30 30
     <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations@torproject.org for more details.</p>
31 31
 <!-- BEGIN PAYPAL -->
32
-<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script>
32
+<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script>
33 33
 <script type="text/javascript">
34 34
 function displayVals() {
35 35
       var t3 = jQuery('#t3').val();
... ...
@@ -117,8 +117,8 @@ jQuery(function(){
117 117
 		     <input type="hidden" id="cmd" name="cmd" value="_donations">
118 118
 		     <input type="hidden" name="business" value="donations@torproject.org">
119 119
 		     <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
120
-		     <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou">
121
-		     <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate">
120
+		     <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
121
+		     <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate/donate.html">
122 122
 		  </div>
123 123
 	 </form>
124 124
 	</div>
... ...
@@ -142,10 +142,10 @@ jQuery(function(){
142 142
 		    <input type="hidden" name="isDonationWidget" value="1">
143 143
 		    <input type="hidden" name="description" value="Supporting Online Anonymity &amp; Privacy">
144 144
 		    <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1">
145
-		    <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate/thankyou">
145
+		    <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/thankyou.html">
146 146
 		    <input type="hidden" name="processImmediate" value="1">
147 147
 		    <input type="hidden" name="cobrandingStyle" value="logo">
148
-		    <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate">
148
+		    <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html">
149 149
 		  </div>
150 150
 		</form>
151 151
 		<small>Requires an Amazon Account</small>		
... ...
@@ -36,8 +36,8 @@ type="application/rss+xml">">
36 36
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
37 37
   <meta name="author" content="The Tor Project, Inc.">
38 38
   <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
39
-<script type="text/javascript" src="$(DOCROOT)/jquery.min.js" charset="utf-8"></script>
40
-<script type="text/javascript" src="$(DOCROOT)/jquery.infieldlabel.min.js" charset="utf-8"></script>
39
+<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script>
40
+<script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script>
41 41
 <script type="text/javascript" charset="utf-8">
42 42
 /* email placeholder function */
43 43
 	$(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); });
... ...
@@ -1,10 +1,10 @@
1 1
 ## translation metadata
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4
-#include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
4
+#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5 5
 
6 6
 #<!-- ATTENTION TRANSLATOR -->
7
-#<!-- You MUST copy 'head.wmi' and 'lang.wmi' along with this file! -->
7
+#<!-- You MUST copy 'dlhead.wmi' and 'lang.wmi' along with this file! -->
8 8
 
9 9
 #<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)-->
10 10
 #<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' -->
... ...
@@ -313,6 +313,35 @@ all the issues</a>.
313 313
 <!-- START SIDECOL -->
314 314
 <div id="sidecol-right">
315 315
 <!-- START DONATION WIDGET -->
316
+  <script async type="text/javascript">
317
+  function displayVals() {
318
+    var t3 = $("#t3").val();
319
+    var amount = $("#amount").val();
320
+    if(t3 != 0){
321
+      $('#a3').val(amount);
322
+      $('#p3').val(1);
323
+      $('#cmd').val('_xclick-subscriptions');
324
+      $('#item_name').val('Tor Project Membership');
325
+      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
326
+    }else{
327
+      $('#a3').val(0);
328
+      $('#p3').val(0);
329
+      $('#cmd').val('_donations');
330
+      $('#item_name').val('Donation to the Tor Project');
331
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
332
+    }
333
+    if( !t3 ) {
334
+      $('#cmd').val('_donations');
335
+      $('#item_name').val('Donation to the Tor Project');
336
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
337
+    }
338
+  }
339
+  $(function(){
340
+    $("#amount").change(displayVals);
341
+    $("#t3").change(displayVals);
342
+    displayVals();
343
+  });
344
+  </script>
316 345
 <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
317 346
     <h2>Donate to Tor</h2>
318 347
       <p>
... ...
@@ -340,8 +369,8 @@ all the issues</a>.
340 369
 	<input type="hidden" id="cmd" name="cmd" value="_donations">
341 370
 	<input type="hidden" name="business" value="donations@torproject.org">
342 371
 	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
343
-	<input type="hidden" name="return" value="<page donate/thankyou>">
344
-	<input type="hidden" name="cancel_return" value="<page download/download>">
372
+	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
373
+	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
345 374
       </p>
346 375
       <h6 id="ppinfo" style="height:0px;"></h6>
347 376
       <p>
348 377
deleted file mode 100644
... ...
@@ -1,197 +0,0 @@
1
-#! /usr/bin/wml
2
-<: use strict; :>
3
-<: use warnings; :>
4
-#use "perl-globals.wmi"
5
-#use "links.wmi"
6
-#use "versions.wmi"
7
-#use "navigation.wmi"
8
-
9
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
10
-<html>
11
-<head>
12
-  <title>$(TITLE)</title>
13
-  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico">
14
-  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
15
-  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
16
-  <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce"
17
-type="application/rss+xml">">
18
-
19
-  # begin WML to generate css/js paths 
20
-  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">">
21
-  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">">
22
-
23
-  #<link href="css/master.css" rel="stylesheet" type="text/css">
24
-  <!--[if lte IE 8]>
25
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie8-and-down.css">
26
-  <![endif]-->
27
-  <!--[if lte IE 7]>
28
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css">
29
-  <![endif]-->
30
-  <!--[if IE 6]>
31
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css">
32
-  <![endif]-->
33
-
34
-#  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
35
-  # end WML to generate css/js paths 
36
-
37
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
38
-  <meta name="author" content="The Tor Project, Inc.">
39
-  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
40
-  <script type="text/javascript" src="../js/jquery.min.js">
41
-#/* jQuery */
42
-  </script>
43
-  <script type="text/javascript" src="../js/jquery.client.min.js">
44
-/* "jQuery Browser And OS Detection Plugin" by Stoiman
45
-   Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plugin/
46
-   License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plugin/#comment-12498) */
47
-  </script>
48
-  <script type="text/javascript" src="../js/dlpage01.js">
49
-#/* Displays detected section */
50
-  </script>
51
-  <script async type="text/javascript" src="../js/jquery.accordion.min.js">
52
-/* Modified version of "Stupid Simple jQuery Accordian Menu" originally developed by Ryan Stemkoski
53
-   Source: http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/
54
-   License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */
55
-  </script>
56
-  <script async type="text/javascript">
57
-#/* switches package links depending on selection */
58
-  function updateLang() {
59
-    var caller = $( this );
60
-    var pkg = caller.attr('id');
61
-    var lang = caller.val();
62
-    var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe';
63
-    var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip';
64
-    var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz';
65
-    var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz';
66
-    if(pkg == 'win-tbb'){
67
-      $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a>');
68
-      $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>');
69
-    }else if(pkg == 'osx-tbb'){
70
-      $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a>');
71
-      $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>');
72
-    }else if(pkg == 'lin-tbb32'){
73
-      $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a>');
74
-      $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>');
75
-    }else if(pkg == 'lin-tbb64'){
76
-      $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal">x86_64 / 64-bit (Beta)</span></a>');
77
-      $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>');
78
-    }
79
-  }
80
-
81
-  $(function(){
82
-    $('.lang').ready(updateLang);
83
-    $('.lang').change(updateLang);
84
-    /* Only show language selector if javascript is enabled */
85
-    $('.lang').css('display', 'block');
86
-  });
87
-  </script>
88
-  <script async type="text/javascript" src="../js/ppwidget.js">
89
-#/* Script For Donation Widget */
90
-  </script>
91
-</head>
92
-<body onload="resetAll()" onunload="">
93
-<div id="wrap">
94
-  <div id="header">
95
-    <h1 id="logo"><a href="<page index>">Tor</a></h1>
96
-      # navigation menu generation
97
-      <div id="nav">
98
-        <ul>
99
-        <:{
100
-            # create a hash and maintain order of keys
101
-            my %navigation;
102
-            my @keys;
103
-            while (@navigation) {
104
-              my $key = shift @navigation;
105
-              my $val = shift @navigation;
106
-              push @keys, $key;
107
-              $navigation{$key} = $val;
108
-            }
109
-
110
-            my $page = $WML_SRC_BASENAME;
111
-            my $lang = "$(LANG)";
112
-
113
-            for my $key (@keys) {
114
-              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
115
-
116
-              # in directory of active link, set class active 
117
-              my $class;
118
-              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
119
-                $class = 'class="active"';
120
-              } else {
121
-                $class = '';
122
-              }
123
-
124
-	            $dir = '.' unless defined $dir;
125
-                
126
-              # translated version
127
-              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
128
-                  printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
129
-                         stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
130
-              } 
131
-              # english version
132
-              elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
133
-              	printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
134
-                  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key};
135
-              }
136
-              # full url
137
-              elsif ($key =~/^http/) {
138
-                printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
139
-              } else {
140
-                warn "$WML_SRC_FILENAME has a [page $key] (parses to
141
-docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
142
-              }
143
-            }
144
-        }:>
145
-        </ul>
146
-      </div>
147
-      <!-- END NAV -->
148
-     # end navigation generation
149
-      <div id="calltoaction">
150
-        <ul>
151
-          <:{
152
-            my %calltoaction;
153
-            my @keys;
154
-            while (@calltoaction) {
155
-              my $key = shift @calltoaction;
156
-              my $val = shift @calltoaction;
157
-              push @keys, $key;
158
-              $calltoaction{$key} = $val;
159
-            } 
160
-
161
-            my $page = $WML_SRC_BASENAME;
162
-            my $lang = "$(LANG)";
163
-            for my $key (@keys) {
164
-              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
165
-
166
-              # in directory, set active 
167
-              my $class;
168
-              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
169
-              #if ($WML_SRC_BASENAME eq $base) {
170
-                $class = 'class="active"';
171
-              } else {
172
-                $class = '';
173
-              }
174
-
175
-	          $dir = '.' unless defined $dir;
176
-              # try to use a translated version
177
-              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
178
-                  printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
179
-                         stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
180
-              } 
181
-              # default to english version
182
-              elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
183
-              	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
184
-                  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
185
-              } else {
186
-                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.";
187
-              }
188
-            }    
189
-          }:>
190
-        </ul>
191
-      </div>
192
-      <!-- END CALLTOACTION -->
193
-  </div>
194
-  <!-- END HEADER -->
195
-
196
-#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
197
-#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">
198 0
deleted file mode 100644
... ...
@@ -1,27 +0,0 @@
1
-function displayVals() {
2
-  var t3 = $("#t3").val();
3
-  var amount = $("#amount").val();
4
-  if(t3 != 0){
5
-    $('#a3').val(amount);
6
-    $('#p3').val(1);
7
-    $('#cmd').val('_xclick-subscriptions');
8
-    $('#item_name').val('Tor Project Membership');
9
-    $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
10
-  }else{
11
-    $('#a3').val(0);
12
-    $('#p3').val(0);
13
-    $('#cmd').val('_donations');
14
-    $('#item_name').val('Donation to the Tor Project');
15
-    $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
16
-  }
17
-  if( !t3 ) {
18
-    $('#cmd').val('_donations');
19
-    $('#item_name').val('Donation to the Tor Project');
20
-    $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
21
-  }
22
-}
23
-$(function(){
24
-  $("#amount").change(displayVals);
25
-  $("#t3").change(displayVals);
26
-  displayVals();
27
-});