comment out the one-time paypal donation until I can figure out why the divs are fighting.
Andrew Lewman

Andrew Lewman commited on 2010-10-06 22:14:35
Zeige 1 geänderte Dateien mit 19 Einfügungen und 11 Löschungen.

... ...
@@ -34,27 +34,29 @@
34 34
 		      </td>
35 35
 		  </tr>
36 36
 		  <tr>
37
-		    <td><input type="radio" name="a3" value="250.00" />250/month</td>
38
-		    <td><input type="radio" name="a3" value="100.00" />100/month</td>
39
-		    <td><input type="radio" name="a3" value="50.00" />50/month</td>
40
-		    <td><input type="radio" name="a3" value="20.00" checked="checked" />20/month</td>
41
-		    <td><input type="radio" name="a3" value="10.00" />10/month</td>
42
-		    <td><input type="radio" name="a3" value="5.00" />5/month</td>
43 37
 		     <input type="hidden" name="p3" value="1" />
44 38
 		     <input type="hidden" name="t3" value="M" />
45 39
 		     <input type="hidden" name="sra" value="1" />
46 40
 		     <input type="hidden" name="src" value="1" />
47 41
 		     <input type="hidden" name="no_shipping" value="1" />
48 42
 		     <input type="hidden" name="no_note" value="1" />
49
-		      <input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
43
+		     <input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"/>
50 44
 		     <input type="hidden" name="cmd" value="_xclick-subscriptions" />
51 45
 		     <input type="hidden" name="business" value="donations@torproject.org" />
52 46
 		     <input type="hidden" name="item_name" value="Tor Project Membership" />
53 47
 		     <input type="hidden" name="return" value="https://www.torproject.org/donate"/>
54 48
 		     <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>
49
+		    <input class="donate-btn" type="submit" name="donate" value="Donate" />
55 50
 		  </tr>
56 51
 		  <tr>
57
-		    <input class="donate-btn" type="submit" name="donate" value="Donate" />
52
+		    <td><input type="radio" name="a3" value="5.00" />5/month</td>
53
+		    <td><input type="radio" name="a3" value="10.00" />10/month</td>
54
+		    <td><input type="radio" name="a3" value="20.00" selected="selected" />20/month</td>
55
+		  </tr>
56
+		  <tr>
57
+		    <td><input type="radio" name="a3" value="50.00" />50/month</td>
58
+		    <td><input type="radio" name="a3" value="100.00" />100/month</td>
59
+		    <td><input type="radio" name="a3" value="250.00" />250/month</td>
58 60
 		  </tr>
59 61
 		  </div>
60 62
 		</table>
... ...
@@ -62,7 +64,8 @@
62 64
 	     </form>
63 65
 	    </table>
64 66
 	  </div>
65
-	<div class="or left">OR
67
+<!--
68
+	<div class="or left">OR <br/>
66 69
   	</div>
67 70
 	<div class="paypal focus">
68 71
 	  <h4>Make a one-time donation</h4>
... ...
@@ -78,8 +81,10 @@
78 81
 			  <option value="YEN">&yen;</option>
79 82
 			</select>
80 83
 		      </td>
84
+	      </tr>
85
+	      <tr>
81 86
 		<input type="hidden" name="no_shipping" value="1" />
82
-		<input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
87
+		<input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make a single donation with PayPal - it's fast, free and secure!"/>
83 88
 		<input type="hidden" name="cmd" value="_xclick" />
84 89
 		<input type="hidden" name="business" value="donations@torproject.org" />
85 90
 		<input type="hidden" name="item_name" value="Tor" />
... ...
@@ -101,6 +106,7 @@
101 106
 	    </table>
102 107
           </form>
103 108
       </div>
109
+-->
104 110
     <!-- END PAYPAL -->
105 111
     <!-- BEGIN AMAZON -->
106 112
     <div class="title topforty">Donate via Amazon Payments
... ...
@@ -148,7 +154,9 @@
148 154
     <div class="title topforty">Donate via Givv.org
149 155
     </div>
150 156
     	<div class="hundred left">
151
-        <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. You stay anonymous and stay in control! <strong><a href="#">Continue to Givv.org &raquo;</a></strong></p>
157
+        <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like.
158
+	Automatic, one-click giving. You stay anonymous and stay in control!
159
+	<strong><a href="http://givv.org/recipients/the-tor-project">Continue to Givv.org &raquo;</a></strong></p>
152 160
       </div>
153 161
     <!-- END GIVV -->
154 162
     <! -- BEGIN CHECK -->
155 163