commit my div hacking for now, works but looks horrible now.
Andrew Lewman

Andrew Lewman commited on 2010-09-24 21:26:09
Zeige 1 geänderte Dateien mit 70 Einfügungen und 46 Löschungen.

... ...
@@ -10,67 +10,91 @@
10 10
   </div>
11 11
   <div id="maincol">
12 12
   <h1>Monetary Donations</h1>
13
-    <p><strong>Your support is critical to our success.</strong> The
14
-    Tor Project is a US 501[c][3] non-profit dedicated to the research,
15
-    development, and education of online anonymity and privacy. Donations
16
-    to The Tor Project may be tax deductible to persons who are in the
17
-    US; or who pay taxes in countries with reciprocity with the US on
18
-    charitable donations. We're happy to accept donations via paypal,
19
-    checks, money orders, stock grants or other more sophisticated
20
-    transactions.</p>
21
-    <p>If you want to make an anonymous donation, please do so in an
22
-    anonymous way.  Contact us at donations@torproject.org for more
23
-    details.</p>
13
+   <p><strong>Your support is critical to our success.</strong> The Tor Project is a US 501[c][3] non-profit dedicated to the research, development, and education of online anonymity and privacy. Donations
14
+    to The Tor Project may be tax deductible to persons who are in the US; or who pay taxes in countries with reciprocity with the US on charitable donations. We're happy to accept donations via paypal,
15
+    checks, money orders, stock grants or other more sophisticated transactions.</p>
16
+    <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>
24 17
     <div class="title toptwenty">Donate via PayPal</div>
25 18
       <div class="left hundred">
26 19
 	<div class="paypal focus">
27 20
 	  <h4>Make a recurring donation</h4>
28
-        <form>
21
+	    <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr" method="post">
29 22
 	      <div class="toppad">
30
-            <input class="textfield" type="text" value="Amount" />
31
-            <br />
32
-            <select>
33
-              <option selected="selected">$</option>
34
-              <option>&euro;</option>
35
-              <option>&pound;</option>
36
-              <option>&yen;</option>
37
-            </select>
38
-            <select>
39
-              <option selected="selected">How often?</option>
40
-              <option>Weeks</option>
41
-              <option>Months</option>
42
-              <option>Years</option>
23
+		<table>
24
+		  <tr>
25
+		    <td>Choose your currency:</td>
26
+		      <td>
27
+			<select name="currency_code">
28
+			  <option value="USD" selected="selected">$</option>
29
+			  <option value="EUR">&euro;</option>
30
+			  <option value="GBP">&pound;</option>
31
+			  <option value="YEN">&yen;</option>
43 32
 			</select>
44
-          </div>
45
-          <br />
33
+		      </td>
34
+		  </tr>
35
+		  <tr>
36
+		    <td><input type="radio" name="a3" value="250.00" />250/month</td>
37
+		    <td><input type="radio" name="a3" value="100.00" />100/month</td>
38
+		    <td><input type="radio" name="a3" value="50.00" />50/month</td>
39
+		    <td><input type="radio" name="a3" value="20.00" checked="checked" />20/month</td>
40
+		    <td><input type="radio" name="a3" value="10.00" />10/month</td>
41
+		    <td><input type="radio" name="a3" value="5.00" />5/month</td>
42
+		      <input type="hidden" name="p3" value="1" />
43
+		      <input type="hidden" name="t3" value="M" />
44
+		      <input type="hidden" name="sra" value="1" />
45
+		      <input type="hidden" name="src" value="1" />
46
+		      <input type="hidden" name="no_shipping" value="1" />
47
+		      <input type="hidden" name="no_note" value="1" />
48
+		      <input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
49
+		      <input type="hidden" name="cmd" value="_xclick-subscriptions" />
50
+		      <input type="hidden" name="business" value="donations@torproject.org" />
51
+		      <input type="hidden" name="item_name" value="Tor Project Membership" />
52
+		      <input type="hidden" name="return" value="https://www.torproject.org/donate"/>
53
+		      <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>
54
+		  </tr>
55
+		  <tr>
46 56
 		    <input class="donate-btn" type="submit" name="donate" value="Donate" />
57
+		  </tr>
58
+		</table>
59
+	      </div>
47 60
 	    </form>
48 61
 	  </div>
49 62
 	<div class="or left">OR</div>
50 63
 	<div class="paypal focus">
51 64
 	  <h4>Make a one-time donation</h4>
52
-        <form>
65
+	    <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post">
53 66
 	      <table>
54 67
 		<tr>
55
-        	  <td><input type="radio" value="10" /> $10</td>
56
-              <td><input type="radio" value="20" /> $20</td>
57
-              <td><input type="radio" value="50" /> $50</td>
58
-              <td><input type="radio" value="100" /> $100</td>
68
+		    <td>Choose your currency:</td>
69
+		      <td>
70
+			<select name="currency_code">
71
+			  <option value="USD" selected="selected">$</option>
72
+			  <option value="EUR">&euro;</option>
73
+			  <option value="GBP">&pound;</option>
74
+			  <option value="YEN">&yen;</option>
75
+			</select>
76
+		      </td>
77
+		<input type="hidden" name="no_shipping" value="1" />
78
+		<input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
79
+		<input type="hidden" name="cmd" value="_xclick" />
80
+		<input type="hidden" name="business" value="donations@torproject.org" />
81
+		<input type="hidden" name="item_name" value="Tor" />
82
+		<input type="hidden" name="return" value="https://www.torproject.org/donate#funds"/>
83
+		<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>
59 84
 	      </tr>
60 85
 	      <tr>
61
-              <td><input type="radio" value="250" /> $250</td>
62
-              <td><input type="radio" value="500" /> $500</td>
63
-              <td><input type="radio" value="1000" /> $1000</td>
64
-              <td><input type="radio" value="other" /> Other</td>
86
+		<td><input type="radio" value="10.00" /> 10</td>
87
+		<td><input type="radio" value="20.00" checked="checked" /> 20</td>
88
+		<td><input type="radio" value="50.00" /> 50</td>
89
+		<td><input type="radio" value="100.00" /> 100</td>
90
+	      </tr>
91
+	      <tr>
92
+		<td><input type="radio" value="250.00" /> 250</td>
93
+		<td><input type="radio" value="500.00" /> 500</td>
94
+		<td><input type="radio" value="1000.00" /> 1000</td>
95
+		<td><input type="radio" value="" /> Other</td>
65 96
 	      </tr>
66 97
 	    </table>
67
-          <br />
68
-          <input class="donate-btn right" type="submit" name="donate" value="Donate" />
69
-          <div class="right">
70
-            <img class="icon" src="$(IMGROOT)/icon-visa.gif" alt="Visa" />
71
-            <img class="icon" src="$(IMGROOT)/icon-mc.gif" alt="Master Card" />
72
-            <img class="icon" src="$(IMGROOT)/icon-ae.gif" alt="American Express" />
73
-          </div>
74 98
           </form>
75 99
       </div>
76 100
     </div>
... ...
@@ -80,6 +104,8 @@
80 104
     <div class="hundred left">
81 105
       <div class="paypal focus">
82 106
       	<h4>Make a one-time donation</h4>
107
+      <table>
108
+      <tr>
83 109
 	    <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post">
84 110
 	    <input type="hidden" name="immediateReturn" value="1" />
85 111
 	    <input type="hidden" name="collectShippingAddress" value="0" />
... ...
@@ -95,8 +121,6 @@
95 121
 	    <input type="hidden" name="processImmediate" value="1" />
96 122
 	    <input type="hidden" name="cobrandingStyle" value="logo" />
97 123
 	    <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate" />
98
-      <table>
99
-      <tr>
100 124
         <td><input type="radio" value="10" /> $10</td>
101 125
         <td><input type="radio" value="20" /> $20</td>
102 126
         <td><input type="radio" value="50" /> $50</td>
... ...
@@ -109,7 +133,7 @@
109 133
         <td><input type="radio" value="other" /> Other</td>
110 134
       </tr>
111 135
       <tr>
112
-	  <td span="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif" border="0" /></td>
136
+	  <td colspan="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif" border="0" /></td>
113 137
       </tr>
114 138
       </table>
115 139
 	</form>
116 140