[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [webwml/staging] Make staging branch match master state



commit 397b8d70f76adbca1dc8efb0cbab32f07bf1279b
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Tue Nov 22 23:53:50 2016 +0100

    Make staging branch match master state
---
 css/donate-style.css    | 187 ++++++--------------------
 donate/en/donate.wml    | 351 ++++++++++++------------------------------------
 images/amazon-smile.jpg | Bin 34854 -> 0 bytes
 images/amazon.jpg       | Bin 36076 -> 0 bytes
 images/bank48.png       | Bin 1719 -> 0 bytes
 images/bitcoin.png      | Bin 2000 -> 0 bytes
 images/dwolla.jpg       | Bin 34497 -> 0 bytes
 images/pantheon1.png    | Bin 1464 -> 0 bytes
 include/head.wmi        |   1 -
 9 files changed, 122 insertions(+), 417 deletions(-)

diff --git a/css/donate-style.css b/css/donate-style.css
index 671d097..55cae54 100644
--- a/css/donate-style.css
+++ b/css/donate-style.css
@@ -11,10 +11,6 @@ input[type="radio"]:focus,
 input[type="checkbox"]:focus {
       outline: none;
 }
-.form-control {
-	-webkit-box-shadow: none;
-        	box-shadow: none;
-}
 .form-control:focus {
 	border-color: #875ca4;
 	outline: 0;
@@ -44,7 +40,7 @@ a {
     color: #875ca4;
 }
 a:hover, a:focus {
-    color: #67467D;
+    color: #663987;
     text-decoration: none;
 }
 .btn-primary:hover {
@@ -69,8 +65,8 @@ a:hover, a:focus {
 .btn-primary:active.focus,
 .btn-primary.active.focus,
 .open > .dropdown-toggle.btn-primary.focus{
-    background-color: #67467D;
-    border-color: #67467D;
+    background-color: #663987;
+    border-color: #663987;
 }
 .navbar-brand {
     height: auto;
@@ -111,10 +107,10 @@ float: left;
 .navbar-nav{
 	margin: 0;
 }
-.img-thumbnail.champion {
+.img-thumbnail {
   padding: 1px;
-  background-color: #785291;
-  border: 1px solid #785291;
+  background-color: #794d9a;
+  border: 1px solid #794d9a;
   -webkit-transition: none;
        -o-transition: none;
           transition: none;
@@ -128,18 +124,18 @@ html {
     margin-top: 28px;
 }
 .logo{
-    height: 81px;
-    width: auto;
+    width: 120px;
 }
 .donation{
 	text-align: center;
+	margin-bottom: 125px;
 }
 .main-text{
 	margin-top: 50px;
 }
 .nav > li > a:hover, .nav > li > a:focus {
 	text-decoration: none;
-	border-bottom: 3px solid #785291;
+	border-bottom: 3px solid #794d9a;
 }
 .donate-section{
 	margin-top: 50px;
@@ -147,7 +143,6 @@ html {
 }
 .no-padding{
 	padding: 0;
-	margin-bottom: 20px;
 }
 .half-opacity{
 	opacity: 0.5;
@@ -166,9 +161,6 @@ html {
 .right{
     border-left-width: 0px !important;
 }
-.left{
-    border-right-width: 0px !important;
-}
 .choiceLabel{
     cursor: pointer !important;
     margin: 0px !important;
@@ -195,11 +187,8 @@ input[type=number] {
 	color: red;
 	display: none;
 }
-#donate > .btn-group {
-    margin-bottom: 30px;
-}
 .quote-section{
-	background-color:#67467D;
+	background-color:#663987;
 	padding: 20px 0;
 }
 .champion{
@@ -216,7 +205,7 @@ blockquote {
 	margin: 20px 0 0 0;
 	position: relative;
 	font-size: 20px;
-	border-left: 5px solid #785291;
+	border-left: 5px solid #794d9a;
     color: #ffffff;
 }
 blockquote::before {
@@ -229,99 +218,6 @@ blockquote::before {
 blockquote footer{
 	color: rgb(240,240,240);
 }
-.donate-button {
-	background-color: #4FAB76;
-	border-color: #47996A;
-}
-.donate-button:hover,
-.donate-button:focus,
-.donate-button:active,
-.donate-button:active:hover,
-.donate-button:active:focus{
-	background-color: #47996A;
-	border-color: #47996A; 
-}
-#other-ways-section{
-	display: none;
-}
-#other-ways-section > .container-fluid{
-	padding: 0;
-}
-.hundred.toptwenty{
-	text-align: justify;
-	margin-top: 0;
-}
-.row-eqheight{
-    overflow: hidden; 
-    padding-bottom: 20px
-}
-.row-eqheight > [class*="col-"]{
-    margin-bottom: -99999px;
-    padding-bottom: 99999px;
-}
-.other-ways-title{
-	margin: 10px 0;
-}
-.other-ways-title > h3{
-	display: inline;
-}
-.other-ways-icon{
-	background: transparent;
-	margin-top: -10px;
-	margin-right: 5px;
-	border:0;
-}
-.bitcoin{
-	padding-top: 10px;
-	padding-left: 30px;
-	padding-right: 30px;
-}
-#bitpayDonation > .well > .form-group {
-    margin-right: 0;
-    margin-left: 0;
-}
-#bitpayDonation > .well {
-	box-shadow: none;
-	border-radius: 7px;
-	margin-bottom: 0;
-}
-.check-eutransfer{
-	padding-top: 10px;
-	padding-left: 30px;
-	padding-right: 30px;
-	border-left: 1px dashed #e3e3e3;
-}
-.minor-other-ways{
-	background-color: #FAFAFA;
-}
-.even-more{
-	padding: 25px 0;
-	background-color: #FAFAFA;
-}
-.other-ways-img{
-	width: 100%;
-	max-width: 160px;
-}
-.img-thumbnail.other-ways-img {
-	padding: 1px;
-	transition: none 0s ease 0s;
-	border: 2px solid rgb(221, 221, 221);
-}
-.get-in-touch{
-	background-color: #35734F;
-	color: #fff;
-}
-.title {
-    min-height: 80px;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border-right: 3px solid #3D855B;
-    padding-top: 25px;
-}
-.detail {
-    margin-bottom: 0px;
-    margin-top: 50px;
-}
 footer.footer{
 	margin-top: 20px;
     bottom: 0;
@@ -332,11 +228,34 @@ footer.footer{
     padding-bottom: 10px;
     background-color: #f5f5f5;
 }
+.donate-button {
+	background-color: #5CA462;
+	border-color: #47A24E;
+}
+.donate-button:hover{
+	background-color: #2F8E38;
+	border-color: #47A24E; 
+}
+.donate-button:focus{
+	background-color: #2F8E38;
+	border-color: #47A24E; 
+}
+.donate-button:active{
+	background-color: #2F8E38;
+	border-color: #47A24E; 
+}
+.donate-button:active:hover{
+	background-color: #2F8E38;
+	border-color: #47A24E; 
+}
 @media (max-width: 991px) {
 	blockquote {
-		margin: 5px 0 0 0;
+		margin: 30px 0 0 0;
 		font-size: 18px;
 	}
+	.champion{
+		width: 140px;
+	}
 	.source-quote{
 		margin-top: 20px;
 	}
@@ -346,7 +265,7 @@ footer.footer{
 		font-size: 28px;
 	}
 	blockquote {
-		margin: 0;
+		margin: 2% 0 0 0;
 		font-size: 16px;
 		border: none;
 	}
@@ -357,32 +276,6 @@ footer.footer{
 	blockquote::before {
 		display: none;
 	}
-	.combined-input {
-	    margin: 0 15px 15px 15px;
-	}
-	#donate > .btn-group {
-	    margin-bottom: 15px;
-	}
-	.check-eutransfer{
-		border-left: none;
-		border-top: 1px dashed #e3e3e3;
-	}
-	#bitpayDonation > .well {
-	    margin-bottom: 30px;
-	}
-	.dsmall{
-		padding: 0 5%;
-	}
-	.title {
-	    min-height: auto;
-	    margin: 20px 8% 0;
-	    border-right: none;
-	    border-bottom: 2px solid #3D855B;
-	    padding: 0 0 10px;
-	}
-	.detail {
-	    margin: 10px 0 20px;
-	}
 
 }
 @media (max-width: 659px)  {
@@ -422,7 +315,7 @@ footer.footer{
 @media (max-width: 399px)  {
 	.logo {
 	    text-align: center;
-	    height: 60px;
+	    width: 25%;
 	    float: none;
 	}
 	.navbar-header{
@@ -467,14 +360,12 @@ footer.footer{
 	.img-section{
 		width: 35%;
 	}
-	.dsmall{
-		padding: 0 3%;
-	}
 	footer.footer {
+	    margin-top: 10px;
 	    margin-bottom: 0px;
 	}
 	footer.footer > p {
 	    font-size: 12px;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/donate/en/donate.wml b/donate/en/donate.wml
index 28ab1da..df5a331 100644
--- a/donate/en/donate.wml
+++ b/donate/en/donate.wml
@@ -4,51 +4,51 @@
 
 #include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8"
 
-  <div class="donation">
-
-    <div class="quote-section">
-      <div class="container">
-        <div class="row">
+<div class="donation">
           
-          <div class="col-sm-3 img-section">
-              <img src="$(IMGROOT)/shari.png" class="img-thumbnail img-responsive champion" alt="Shari Steele">
-          </div>
+      <div class="quote-section">
+          <div class="container">
+            <div class="row">
+              <div class="col-sm-3 img-section">
+                  <img src="$(IMGROOT)/shari.png" class="img-thumbnail img-responsive champion" alt="Shari Steele">
+                </div>
+
+                <div class="col-sm-9 col-xs-offset-0">
+                  <blockquote>
+Tor is an essential part of the Internet freedom infrastructure, and I'm looking forward to working with the Tor Project to continue to grow the movement.
+                    <footer class="pull-right source-quote"><cite title="Source Title">Shari Steele</cite></footer>
+                  </blockquote>
+                </div>
 
-          <div class="col-sm-9 col-xs-offset-0">
-            <blockquote>
-              Tor is an essential part of the Internet freedom infrastructure, and I'm looking forward to working with the Tor Project to continue to grow the movement.
-              <footer class="pull-right source-quote"><cite title="Source Title">Shari Steele</cite></footer>
-            </blockquote>
           </div>
+        </div>
+      </div>
 
-        </div><!-- container -->
-      </div><!-- row -->
-    </div><!-- quote-section -->
 
-    <div class="paypal-donate">
-      <div class="container">
-        <div class="row">
-          <div class="col-sm-7">
-            <h2 class="main-text">Your support is critical to our success</h2>
-            <hr>
-            <p style="text-align:left;">Donate $23 or more, get swag, take a picture and share it with us via <code><a href="https://twitter.com/search?q=%23SupportTor"; target="_blank">#supportTor</a></code> hashtag.</p>
-              
-            <noscript class="perks">
-              <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4>
-              <p style="text-align:left;">Donate $23+ to get a <b>pack of stickers</b></p>
-              <p style="text-align:left;">Donate $100+ to get a <b>Tor supporter tshirt</b></p>
-              <p style="text-align:left;">Donate $500+ to get a <b>hoodie</b></p>
-            </noscript>
+    <div class="container">
 
-            <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4>
-            <div class="col-xs-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div>
-            <div class="col-xs-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div>
-            <div class="col-xs-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div>
-          </div>
+      <div class="row">
+        <div class="col-sm-7">
+          <h2 class="main-text">Your support is critical to our success</h2>
+          <hr>
+          <p style="text-align:left;">Donate $23 or more, get swag, take a picture and share it with us via <code><a href="https://twitter.com/search?q=%23SupportTor"; target="_blank">#supportTor</a></code> hashtag.</p>
           
-          <div class="donate-section col-sm-5">
-            <form id="donate" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
-              <div class="row col-md-offset-0 combined-input">
+          <noscript class="perks">
+            <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4>
+            <p style="text-align:left;">Donate $23+ to get a <b>pack of stickers</b></p>
+            <p style="text-align:left;">Donate $100+ to get a <b>Tor supporter tshirt</b></p>
+            <p style="text-align:left;">Donate $500+ to get a <b>hoodie</b></p>
+          </noscript>
+
+          <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4>
+          <div class="col-sm-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div>
+          <div class="col-sm-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div>
+          <div class="col-sm-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div>
+
+        </div>
+        <div class="donate-section col-sm-5">
+          <form id="donate" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
+            <div class="row col-md-offset-0 combined-input">
                 <div class="left col-xs-6 btn btn-default btn-lg active">
                   <label class="choiceLabel">
                     <input class="sr-only" name="cmd" id="blankRadio1" type="radio" value="_donations" aria-label="one_time"checked >
@@ -61,231 +61,63 @@
                     <span>Monthly</span>
                   </label>
                 </div>
-              </div>
+            </div>
 
-              <div class="btn-group btn-group-lg" role="group">
-                <div style="padding-bottom:5px;" class="col-xs-6">
-                  <button value="10" id="amount10" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn">$10</button>
-                </div>
-                <div style="padding-bottom:5px;" class="col-xs-6">
-                  <button value="23" id="amount23" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a sticker!">$23</button>
-                </div>
-                <div style="padding-bottom:5px;" class="col-xs-6">
-                  <button value="100" id="amount100" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$100</button>
-                </div>
-                <div style="padding-bottom:5px;" class="col-xs-6">
-                  <button value="256" id="amount256" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$256</button>
-                </div>
-                <div style="padding-bottom:5px;" class="col-xs-6">
-                  <button value="500" id="amount500" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a hoody!">$500</button>
-                </div>
-                <div class="col-xs-6 form-group-lg">
-                  <label class="sr-only" for="exampleInputAmount">1</label>
-                  <div class="input-group">
-                    <div class="input-group-addon">$</div>
-                    <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other amount">
-                  </div>
-                </div>
+            <div class="btn-group btn-group-lg" role="group" style="margin-bottom: 30px;">
+              <div style="padding-bottom:5px;" class="col-xs-6">
+                <button value="10" id="amount10" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn">$10</button>
               </div>
-              <div style="padding: 0 15px;">
-                <h5 class="error-msg">The minimum donation amount is $5</h5>
-                <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button>
-                <h5>via PayPal (doesn't require an account)</h5>
-                <h4><a id="link" href="#other-ways-section">Other Ways to Donate</a></h4>
+              <div style="padding-bottom:5px;" class="col-xs-6">
+                <button value="23" id="amount23" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a sticker!">$23</button>
               </div>
-              
-              <!-- PAYPAL ESSENTIAL INPUTS -->
-              <input type="hidden" id="amount" name="amount" value="">
-              <input type="hidden" id="a3" name="a3" value="0">
-              <input type="hidden" id="p3" name="p3" value="1">
-              <input type="hidden" id="t3" name="t3" value="M">
-              <input type="hidden" name="sra" value="1">
-              <input type="hidden" name="src" value="1">
-              <input type="hidden" name="no_shipping" value="1">
-              <input type="hidden" name="no_note" value="1">
-              <input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx">
-              <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
-              <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou";>
-              <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer";>
-
-            </form>
-          </div><!-- donate-section -->
-        </div><!-- row -->
-      </div><!-- container -->
-    </div><!-- paypal-donate -->
-
-    <div id="other-ways-section">
-      <div class="main-other-ways">
-        <div class="container">
-          <div id="maincol">
-          <div class="hundred toptwenty">
-          
-            <div class="row-eqheight">
-              
-              <!-- BEGIN BITCOIN -->
-              <div class="col-sm-6 bitcoin">
-                <a id="bitcoin"></a>
-                <div class="other-ways-title">
-                  <img class="img-thumbnail other-ways-icon" src="../images/bitcoin.png" width="40" height="40">
-                  <h3><strong>Bitcoins</strong></h3>
-                </div>
-                <p>In order to comply with US 501(c)(3) non-profit regulations, our Bitcoin transaction limit is currently $10,000 USD per day.
-                  If you wish to avoid transaction limits, please consider a direct Bitcoin donation to
-                  <a href="https://www.torservers.net/donate.html#cryptocurrencies";>Torservers.net</a>,
-                  <a href="http://noisetor.net/#bitcoin";>NoiseTor</a>,
-                  <a href="https://www.oniontip.com/";>OnionTip</a>,
-                  or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails</a>.
-                </p>
-                <p>If this transaction limit is not an issue for you, please complete the form below:</p>
-                <form id="bitpayDonation" class="form" action="https://bitpay.com/checkout"; method="post" onsubmit="return bp.validateMobileCheckoutForm($('#bitpayDonation'));">
-                  <input name="action" type="hidden" value="checkout">
-                  <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">
-                    <div class="form-group">
-                      <label for="bitcoinEmail" class="input-group control-label" style="padding:0;">Email address</label>
-                      <input id="bitcoinEmail" name="orderID" type="email" class="form-control" placeholder="Email address (optional)" maxlength="50" autocapitalize="off" autocorrect="off">
-                    </div>
-                        
-                    <div class="form-group row">
-                      <label for="bitcoinAmount" class="input-group control-label">Amount</label>
-                      <div class="col-sm-8" style="padding:0;">
-                        <input name="price" type="number" class="form-control" id="bitcoinAmount" value="43.00" placeholder="Amount" maxlength="10" min="5">
-                      </div>
-                      
-                      <div class="col-sm-4" style="padding:0;">
-                        <select name="currency" value="" class="form-control">
-                          <option value="USD" selected="selected">USD</option>
-                          <option value="BTC">BTC</option>
-                          <option value="EUR">EUR</option>
-                          <option value="GBP">GBP</option>
-                          <option value="AUD">AUD</option>
-                          <option value="BGN">BGN</option>
-                          <option value="BRL">BRL</option>
-                          <option value="CAD">CAD</option>
-                          <option value="CHF">CHF</option>
-                          <option value="CNY">CNY</option>
-                          <option value="CZK">CZK</option>
-                          <option value="DKK">DKK</option>
-                          <option value="HKD">HKD</option>
-                          <option value="HRK">HRK</option>
-                          <option value="HUF">HUF</option>
-                          <option value="IDR">IDR</option>
-                          <option value="ILS">ILS</option>
-                          <option value="INR">INR</option>
-                          <option value="JPY">JPY</option>
-                          <option value="KRW">KRW</option>
-                          <option value="LTL">LTL</option>
-                          <option value="LVL">LVL</option>
-                          <option value="MXN">MXN</option>
-                          <option value="MYR">MYR</option>
-                          <option value="NOK">NOK</option>
-                          <option value="NZD">NZD</option>
-                          <option value="PHP">PHP</option>
-                          <option value="PLN">PLN</option>
-                          <option value="RON">RON</option>
-                          <option value="RUB">RUB</option>
-                          <option value="SEK">SEK</option>
-                          <option value="SGD">SGD</option>
-                          <option value="THB">THB</option>
-                          <option value="TRY">TRY</option>
-                          <option value="ZAR">ZAR</option>
-                        </select>
-                      </div>
-                      
-                    </div>
-                    <br>
-                    <input type="hidden" name="data" value="iH+sCoKQo5J52hkEzWcMi8+PRt78/89lcSU9GnapWfWL6thyubtDCahTUqa2JTlj6RQrQySkZAoFvK05yifMwfx5V87JJuoaDlHUsZR9ppzkklmzHpKJ4TG5M0zNVcKfNBfyopdfTFbzpOXM2FDppqmU7njsRUF1EZPa0K7SIxpv4lNKSPn1PyjVKVxjnpFE0AZ1Qa75VwZnS+rBNNfwxPsgSz+Oa2Twe226FmJJrLtPuBteFfHAIWh6QS5JnpOn4ScMFph0zjixutmunMAjKw==">
-                    <div style="margin: auto; width: 100%; text-align: center">
-                      <input name="submit" src="https://www.torproject.org/images/bitpay-donate-md.png"; type="image" style="width: auto" alt="BitPay" border="0">
-                    </div>
-                  </fieldset>
-                </form>
+              <div style="padding-bottom:5px;" class="col-xs-6">
+                <button value="100" id="amount100" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$100</button>
               </div>
-              <!-- END BITCOIN -->
-
-
-
-
-
-              <div class="col-sm-6 check-eutransfer">
-
-                <!-- BEGIN CHECK -->
-                <a id="cash"></a>
-                <div class="other-ways-title">
-                  <img class="img-thumbnail other-ways-icon" src="../images/bank48.png" width="40" height="40">
-                  <h3><strong>Check or Money Order</strong></h3>
-                </div>
-                <p>You can send checks or money orders to:</p>
-                <p>The Tor Project, Inc<br>
-                  7 Temple Street, Suite A<br>
-                  Cambridge, MA 02139-2403 USA
-                </p>
-                <!-- END CHECK -->
-
-                <!-- BEGIN TRANSFER -->
-                <a id="eubanks"></a>
-                <div style="margin-top:30px;" class="other-ways-title">
-                  <img class="img-thumbnail other-ways-icon" src="../images/pantheon1.png" width="40" height="40">
-                  <h3><strong>European Bank Transfer</strong></h3>
-                </div>
-                <p>For European bank transfers, we have an arrangement with
-                  the Renewable Freedom Foundation to provide
-                  <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreign-charities-are-tax-deductible-ecj-rules";>tax-deductible</a>
-                  donations for Europeans. (They don't actually pass the money
-                  through to us, but rather we trust them to spend it in Tor's
-                  interest.) They will issue a donation receipt <a
-                  href="https://renewablefreedom.org/contact/";>upon request</a>. The
-                  account information is as follows:
-                </p>
-                <p>Renewable Freedom Foundation<br>
-                  IBAN: DE17721500000053693701<br>
-                  BIC: BYLADEM1ING<br>
-                  Sparkasse Ingolstadt<br>
-                  Rathausplatz 6<br>
-                  85049 Ingolstadt<br>
-                </p>
-                <!-- END TRANSFER -->
-
-              </div><!-- check-eutransfer -->
-
-            </div><!-- row-eqheight -->
-            </div> <!-- hundred toptwenty -->
-          </div> <!-- maincol row -->
-        </div> <!-- container -->
-      </div> <!-- main-other-ways -->
-            
-      <div class="minor-other-ways">
-        <div class="container">              
-            <div class="col-xs-12 even-more">
-
-              <div class="dsmall col-xs-4">
-                <a href="../donate/donate-amazon.html.en">
-                  <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/amazon.jpg">
-                </a>
+              <div style="padding-bottom:5px;" class="col-xs-6">
+                <button value="256" id="amount256" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$256</button>
               </div>
-              
-              <div class="dsmall col-xs-4">
-                <a href="https://smile.amazon.com/ch/20-8096820";>
-                  <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/amazon-smile.jpg">
-                </a>
+              <div style="padding-bottom:5px;" class="col-xs-6">
+                <button value="500" id="amount500" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a hoody!">$500</button>
               </div>
-
-              <div class="dsmall col-xs-4">
-                <a id="dwolla"></a>
-                <a href="https://www.dwolla.com/hub/thetorproject";>
-                  <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/dwolla.jpg">
-                </a>
+              <div class="col-xs-6 form-group-lg">
+                <label class="sr-only" for="exampleInputAmount">1</label>
+                <div class="input-group">
+                  <div class="input-group-addon">$</div>
+                  <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other amount">
+                </div>
               </div>
             </div>
+            <div style="padding: 0 15px;">
+              <h5 class="error-msg">The minimum donation amount is $5</h5>
+              <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button>
+              <h5>via PayPal (doesn't require an account)</h5>
+              <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4>
+            </div>
+            <input type="hidden" id="amount" name="amount" value="">
+            <input type="hidden" id="a3" name="a3" value="0">
+            <input type="hidden" id="p3" name="p3" value="1">
+            <input type="hidden" id="t3" name="t3" value="M">
+            <input type="hidden" name="sra" value="1">
+            <input type="hidden" name="src" value="1">
+            <input type="hidden" name="no_shipping" value="1">
+            <input type="hidden" name="no_note" value="1">
+            <input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx">
+            <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
+            <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou";>
+            <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer";>
 
-        </div> <!-- container -->
-      </div> <!-- minor-other-ways -->
-      
-    </div><!-- other-ways-section -->
-    
-  </div><!-- donation -->
+
+          </form>
+        </div>
+      </div>
+    </div>
+  
 
 
+  </div>
 
+
+  <!-- PAYPAL -->
   <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script>
   <script type="text/javascript">
   function displayVals() {
@@ -312,8 +144,6 @@
       $(".error-msg").css("display","none");
     });
 
-
-    // Perks functionality
     if (23 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 100) {
       $("#stickers").css("opacity","1");
       $("#tshirt").css("opacity","0.5");
@@ -338,9 +168,7 @@
     $("#exampleInputAmount").click(displayVals);
     $("#exampleInputAmount").change(displayVals);
     displayVals();
-    
 
-    // Paypal donate validation when changing other amount input 
     $("#exampleInputAmount").change(function(){
       if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) {
         $(".error-msg").css("display","block");
@@ -349,7 +177,6 @@
       }
     });
 
-    // Paypal donate validation when clicking on donate button 
     $("#donate-btn").click(function(event){
       if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) {
         event.preventDefault();
@@ -359,8 +186,6 @@
       }
     });
 
-
-    // monthly or one-time donate functionality
     $(".left").click(function(){
       $(".left").addClass('active');
       $(".right").removeClass('active');
@@ -370,16 +195,6 @@
       $(".left").removeClass('active');
     });
     
-
-    $("#link").on('click',function(event){
-      event.preventDefault();
-      $("#other-ways-section").show();
-      $('html, body').animate({
-        scrollTop: $("#other-ways-section").offset().top
-      }, 200);
-    });
-
-
   });
 
 
diff --git a/images/amazon-smile.jpg b/images/amazon-smile.jpg
deleted file mode 100644
index 3e188dd..0000000
Binary files a/images/amazon-smile.jpg and /dev/null differ
diff --git a/images/amazon.jpg b/images/amazon.jpg
deleted file mode 100644
index d954448..0000000
Binary files a/images/amazon.jpg and /dev/null differ
diff --git a/images/bank48.png b/images/bank48.png
deleted file mode 100644
index b488403..0000000
Binary files a/images/bank48.png and /dev/null differ
diff --git a/images/bitcoin.png b/images/bitcoin.png
deleted file mode 100644
index 497e514..0000000
Binary files a/images/bitcoin.png and /dev/null differ
diff --git a/images/dwolla.jpg b/images/dwolla.jpg
deleted file mode 100644
index b64bbf3..0000000
Binary files a/images/dwolla.jpg and /dev/null differ
diff --git a/images/pantheon1.png b/images/pantheon1.png
deleted file mode 100644
index 361a233..0000000
Binary files a/images/pantheon1.png and /dev/null differ
diff --git a/include/head.wmi b/include/head.wmi
index 296a54c..faf8dd1 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -40,7 +40,6 @@
    <![endif]-->
  #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
    # end WML to generate css/js paths 
-
 </head>
 <body>
 <div id="wrap">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits