Browse code

Merge remote-tracking branch 'arthuredelstein/20677+1'

Sebastian Hahn authored on18/11/2016 13:50:47
Showing4 changed files
... ...
@@ -220,7 +220,6 @@ blockquote footer{
220 220
 }
221 221
 footer.footer{
222 222
 	margin-top: 20px;
223
-	position: absolute;
224 223
     bottom: 0;
225 224
     width: 100%;
226 225
     /* Set the height of the footer here */
... ...
@@ -5,46 +5,20 @@
5 5
 #include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
6 6
 
7 7
 <style>
8
-.hlist {
9
-    padding: 0px;
10
-    text-align: center;
11
-    display: block;
12
-    width: 100%;
13
-    list-style: outside none none;
14
-    margin: 0px 0px 18px;
15
-}
16
-
17
-.hlist li {
18
-    display: inline-block;
19
-    border-right: 1px solid #444;
20
-    margin-left: -4px;
21
-}
22
-.hlist a {
23
-    display: block;
24
-    top: 0px;
25
-    right: 0px;
26
-    bottom: 0px;
27
-    left: 0px;
28
-    text-decoration: none;
29
-    font-weight: bold;
30
-    padding: 0px 8px;
31
-}
32
-
33
-.hlist li.last {
34
-    border-right: 0px solid #444;
8
+form#makeDonation {
9
+    max-width: 500px;
35 10
 }
36 11
 </style>
37 12
 
38 13
 <div id="content" class="container" style="padding-bottom: 85px">
39 14
 <div id="maincol">
40
-  <h1>Ways to Donate to Tor</h1>
41
-  <p>The Tor Project offers the following donation methods:</p>
15
+  <h1>More Ways to Donate to Tor</h1>
16
+  <p><b>Note: if you wish to donate to The Tor Project by <a href="donate.html.en">credit card or PayPal, please click here</a>.</b></p>
17
+  <p>The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving@torproject.org.):</p>
42 18
   <ul class="hlist">
43
-    <li><a href="#bitcoin">Bitcoins</a></li>
19
+    <li><a href="#bitcoin">Bitcoin</a></li>
44 20
     <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li>
45 21
     <li><a href="https://smile.amazon.com/ch/20-8096820">Amazon Smile</a></li>
46
-    <li><a href="https://www.dwolla.com/hub/thetorproject">Dwolla</a></li>
47
-    <li><a href="<page donate/donate>">Paypal</a></li>
48 22
     <li><a href="#eubanks">EU Bank Transfer</a></li>
49 23
     <li class="last"><a href="#cash">Checks or Money Orders</a></li>
50 24
   </ul>
... ...
@@ -54,14 +28,8 @@
54 28
    <a id="bitcoin"></a>
55 29
    <div class="hundred toptwenty">
56 30
     <div class="dbox donate">
57
-    <h3>Bitcoins</h3>
58
-    <p>In order to comply with US 501(c)(3) non-profit regulations, our Bitcoin transaction limit is currently $10,000 USD per day.
59
-    If you wish to avoid transaction limits, please consider a direct Bitcoin donation to
60
-    <a href="https://www.torservers.net/donate.html#cryptocurrencies">Torservers.net</a>,
61
-    <a href="http://noisetor.net/#bitcoin">NoiseTor</a>,
62
-    <a href="https://www.oniontip.com/">OnionTip</a>,
63
-    or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a>.</p>
64
-  <p>If this transaction limit is not an issue for you, please complete the form below:</p>
31
+    <h3>Donate Bitcoin</h3>
32
+<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address.</p>
65 33
   <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
66 34
         <input name="action" type="hidden" value="checkout">
67 35
         <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">
... ...
@@ -75,8 +43,8 @@
75 43
             <li id="price" class="control-group">
76 44
               <label class="control-label" style="width: 40px">Amount:</label>
77 45
               <div class="controls" style="margin-left: 60px">
78
-                <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" style="width: 39%"  />
79
-                <select name="currency" value="" style="width: 49%" >
46
+                <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" />
47
+                <select name="currency" value="" >
80 48
                   <option value="USD" selected="selected">USD</option>
81 49
                   <option value="BTC">BTC</option>
82 50
                   <option value="EUR">EUR</option>
... ...
@@ -130,29 +98,18 @@
130 98
    <div class="hundred toptwenty">
131 99
     <div class="dbox dsmall dwolla">
132 100
       <h3>Donate via Amazon</h3>
133
-      <p>Amazon Payments allows you to donate to Tor via several different
134
-mechanisms using an Amazon account.</p>
101
+      <p>You can donate to Tor through your Amazon account.</p>
135 102
       <p style="text-align:center;"><strong><a
136 103
 href="<page donate/donate-amazon>">Donate via Amazon Payments
137 104
 &raquo;</a></strong></p>
138 105
     </div>
139 106
     <div class="dbox dsmall dwolla">
140 107
       <h3>Donate via Amazon Smile</h3>
141
-      <p>Amazon Smile allows you to donate 0.5% of your Amazon purchases to the Tor Project.</p>
142
-      <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Donate with Amazon Smile
108
+      <p>AmazonSmile is a website operated by Amazon with the same products, prices, and shopping features as Amazon.com. The difference is that when you shop on AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p>
109
+      <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Set up the Tor Project on Amazon Smile
143 110
 &raquo;</a></strong></p>
144 111
     </div>
145 112
 <!-- END AMAZON -->
146
-<!-- BEGIN DWOLLA -->
147
-    <a id="dwolla"></a>
148
-    <div class="dbox dsmall dwolla">
149
-      <h3>Donate via Dwolla</h3>
150
-      <p>Dwolla is a peer to peer payment platform which allows users to
151
-exchange money quickly, safely, at a lower cost.</p>
152
-      <p style="text-align:center;"><strong><a href="https://www.dwolla.com/hub/thetorproject">Donate via Dwolla
153
-&raquo;</a></strong></p>
154
-    </div>
155
-<!-- END DWOLLA -->
156 113
 <!-- BEGIN TRANSFER -->
157 114
     <a id="eubanks"></a>
158 115
     <div class="">
... ...
@@ -160,9 +117,7 @@ exchange money quickly, safely, at a lower cost.</p>
160 117
        <p>For European bank transfers, we have an arrangement with
161 118
         the Renewable Freedom Foundation to provide
162 119
 <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreign-charities-are-tax-deductible-ecj-rules">tax-deductible</a>
163
-        donations for Europeans. (They don't actually pass the money
164
-        through to us, but rather we trust them to spend it in Tor's
165
-        interest.) They will issue a donation receipt <a
120
+        donations for Europeans. They will issue a donation receipt <a
166 121
         href="https://renewablefreedom.org/contact/">upon request</a>. The
167 122
         account information is as follows:</p>
168 123
 
... ...
@@ -182,14 +137,14 @@ exchange money quickly, safely, at a lower cost.</p>
182 137
      <div class="dbox donate">
183 138
        <h3>Donate via Check or Money Order</h3>
184 139
        <h4>You can send checks or money orders to:</h4>
185
-       <p>The Tor Project, Inc<br>
186
-        217 1st Ave South #4903<br>
140
+       <p>The Tor Project, Inc.<br>
141
+        P.O. Box 4903<br>
187 142
         Seattle, WA 98194 USA</p>
188 143
     </div>
189 144
   </div>
190 145
 
191 146
 <!-- END CHECK -->
192
-  <p>Contact us at donations@torproject.org for more donation details.</p>
147
+  <p>Contact us at giving@torproject.org for more donation details.</p>
193 148
  </div>
194 149
 <!-- END CONTENT -->
195 150
 </div>
196 151
new file mode 100644
197 152
Binary files /dev/null and b/images/2016-tor-logo-heart.png differ
... ...
@@ -29,7 +29,7 @@
29 29
     <div class="container">
30 30
       <div class="navbar-header">
31 31
         <a class="navbar-brand" href="<page index>">
32
-          <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project" class="logo" height="100%">
32
+          <img src="$(IMGROOT)/2016-tor-logo-heart.png" alt="Tor Project" class="logo" height="100%">
33 33
         </a>
34 34
       </div>      
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">