[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] r24787: {website} roll out new pages for donations, downloads, download-easy, (in website/trunk: . css donate/en download/en images)
Author: phobos
Date: 2011-05-27 01:04:25 +0000 (Fri, 27 May 2011)
New Revision: 24787
Added:
website/trunk/donate/en/side-donate.wmi
website/trunk/images/warning2.jpg
website/trunk/jquery-1.6.1.min.js
Modified:
website/trunk/css/ie7-and-down.css
website/trunk/css/layout.css
website/trunk/donate/en/donate.wml
website/trunk/download/en/download-easy.wml
website/trunk/download/en/download.wml
Log:
roll out new pages for donations, downloads, download-easy, and css
fixes to accomodate them all. All, jquery makes all of this happen,
with sane fallback for those without javascript.
Modified: website/trunk/css/ie7-and-down.css
===================================================================
--- website/trunk/css/ie7-and-down.css 2011-05-25 15:51:16 UTC (rev 24786)
+++ website/trunk/css/ie7-and-down.css 2011-05-27 01:04:25 UTC (rev 24787)
@@ -27,14 +27,67 @@
width: 100%;
border-bottom: 1px solid #ddd;
}
+
+.hlist {
+ text-align: center;
+ display: block;
+ width: 100%;
+ padding: 0px 0px;
+ list-style: none;
+ margin: 0px 0px 18px 0px;
+ }
+
+ .hlist li {
+ width: auto;
+ display: inline;
+ float: left;
+ border-right: 1px solid #444444;
+ margin-left: -4px;
+ }
-.donate-btn {
- width: 102px;
+ .hlist li.last {
+ border-right: 0px solid #444444;
+ }
+
+ .hlist a {
+ display: block;
+ top: 0px;
+ right: 0px;
+ bottom: 0px;
+ left: 0px;
+ text-decoration: none;
+ font-weight: bold;
+ padding: 0px 8px;
+ }
+
+.dbox.donate ul.amounts li {
+ list-style-type: none;
+ display: inline;
+ float: left;
+ margin-left: 20px;
+ }
+
+ .donate-btn {
+ width: 122px;
font-size: 0;
- color: #fff;
- text-align: right;
-}
+ color: transparent;
+ }
+
+.dbox.dl {
+ margin: 0px 0px 20px 20px;
+ }
+.dbox.dsmall {
+ display: inline;
+ float: left;
+ }
+
+ .dbox.dsmall small {
+ position: static;
+ display: inline;
+ float: none;
+ }
+
.focus .continue { padding-bottom: 20px; }
table h2 { margin-bottom: -4px; padding-bottom: 0;}
Modified: website/trunk/css/layout.css
===================================================================
--- website/trunk/css/layout.css 2011-05-25 15:51:16 UTC (rev 24786)
+++ website/trunk/css/layout.css 2011-05-27 01:04:25 UTC (rev 24787)
@@ -389,7 +389,9 @@
.windows,
.mac,
.linux,
-.android { padding: 5px 0 5px 20px; }
+.android {
+ padding: 5px 0 5px 30px;
+ }
.windows { background: url(../images/icon-windows.gif) left center no-repeat; }
.mac { background: url(../images/icon-mac.gif) left center no-repeat; }
@@ -422,12 +424,21 @@
.paypal span { padding-right: 20px; }
.warning {
- background: #ebd4a9 url(../images/warning.jpg) left center no-repeat;;
- border: 1px solid #deba78;
- padding: 10px 15px;
-}
- .warning p { padding-left: 40px; }
+ background: #F4F2C7;
+ border: 2px dashed #bfbd8c;
+ padding: 25px 25px;
+ margin-top: 4px;
+ }
+
+ .warning h2 {
+ background: url("../images/warning.jpg") no-repeat scroll left top transparent;
+ padding-left: 40px;
+ }
+ .warning p {
+ padding-left: 20px;
+ }
+
.focus {
background: #f4f2c7;
border: 1px solid #ebd4a9;
@@ -555,7 +566,276 @@
#footer .first { margin-left: 30px; }
#footer .wider { width: 201px; }
+
+
+/* DONATION ADDITIONS ----------- */
+
+small {
+ margin: 0px auto 0px auto;
+ text-align: center;
+ font-size: 10px;
+ font-style: italic;
+ }
+
+.hlist {
+ text-align: center;
+ display: block;
+ width: 100%;
+ padding: 0px 0px;
+ list-style: none;
+ margin: 0px 0px 18px 0px;
+ }
+
+ .hlist li {
+ display: inline-block;
+ border-right: 1px solid #444444;
+ margin-left: -4px;
+ }
+ .hlist li.last {
+ border-right: 0px solid #444444;
+ }
+
+ .hlist a {
+ display: block;
+ top: 0px;
+ right: 0px;
+ bottom: 0px;
+ left: 0px;
+ text-decoration: none;
+ font-weight: bold;
+ padding: 0px 8px;
+ }
+
+.dbox {
+ float: none;
+ text-align: center;
+ color: #222222;
+ border: 2px solid #cbcbaf;
+ background-color: #ffffed;
+ padding: 20px 20px;
+ width: 163px;
+ margin: 0px 0px 0px 10px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ }
+
+ .dbox p {
+ display: block;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+ }
+
+ .dbox h2 {
+ background: url() top left transparent;
+ color: #23300E;
+ padding:0px 0px 15px 0px;
+ }
+
+ .dbox input ,
+ .dbox select {
+ background-color: #fefff7;
+ color: #23300E;
+ border:2px solid #CCCFB8;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding: 0px 0px 0px 5px;
+ margin: 0px 0px 10px 0px;
+ }
+
+ .dbox input:focus ,
+ .dbox select:focus {
+ -moz-box-shadow: 0px 0px 4px #cbcbaf;
+ -webkit-box-shadow: 0px 0px 4px #cbcbaf;
+ box-shadow: 0px 0px 4px #cbcbaf;
+ border:2px solid #cbcbaf;
+ background-color: #FFFFFF;
+ }
+
+ .dbox select.cur {
+ margin-right: 5px;
+ text-align: left;
+ }
+
+ .dbox input.amount {
+ width: 100px;
+ margin-right: 0px;
+ text-align: left;
+ }
+
+ .dbox select#t3 {
+ width: 100%;
+ margin-bottom: 20px;
+ padding: 0px 0px;
+ }
+
+ .dbox input.donate-btn {
+ background: url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;
+ height: 26px;
+ width: 122px;
+ margin-top: 0px;
+ display: block;
+ background-color: transparent;
+ color: transparent;
+ border:0px solid transparent;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ margin: 10px auto 10px auto;
+ padding: 0px 0px 0px 0px;
+ }
+
+ .dbox span {
+ float: left;
+ padding-right: 0px;
+ }
+
+ .dbox div label {
+ padding: 0px 10px 0px 0px;
+ }
+
+ .dbox h6#ppinfo{
+ width: 100%;
+ text-align: center;
+ margin: -15px auto 0px auto;
+ }
+
+ .dbox small,
+ .dbox.donate #ppinfo {
+ margin: 0px auto 0px auto;
+ text-align: center;
+ font-size: 10px;
+ font-style: italic;
+ }
+
+.dbox.dl {
+ margin: -50px 0px 20px 20px;
+ float: right;
+ }
+
+.dbox.donate {
+ float: none;
+ padding: 30px 30px;
+ width: 626px;
+ min-height: 0px;
+ max-width: none;
+ text-align: left;
+ }
+
+ .dbox.donate input ,
+ .dbox.donate select {
+ padding-bottom: 0px;
+ margin-bottom: 0px;
+ }
+
+ .dbox.donate .drow {
+ margin: 0px 0px 0px 20px;
+ }
+
+ .dbox.donate .drow div {
+ padding: 0px 0 0 0px;
+ width: auto;
+ display: block;
+ }
+
+ .dbox.donate h3 {
+ padding-left: 0px;
+ color: #23300E;
+ margin: 0 0 10px 0;
+ }
+
+ .dbox.donate h4 {
+ padding-left: 20px;
+ }
+
+ .dbox.donate p {
+ padding: 5px 20px 15px 40px;
+ }
+
+ .dbox.donate span {
+ float: left;
+ padding-right: 0px;
+ }
+
+ .dbox.donate div label {
+ padding: 0px 10px 0px 0px;
+ }
+
+ .dbox.donate .type {
+ padding-left: 20px;
+ }
+
+ .dbox.donate select#t3 {
+ width: auto;
+ margin-bottom: 0px;
+ }
+
+ .dbox.donate ul.amounts {
+ width: auto;
+ }
+
+ .dbox.donate ul.amounts li {
+ display: inline-block;
+ margin-left: 20px;
+ }
+
+ .dbox.donate ul.amounts li label {
+ padding: 0px 0px 0px 5px;
+ }
+
+ .dbox.donate input.donate-btn {
+ background: url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;
+ height: 26px;
+ width: 115px;
+ margin-top: -3px;
+ display: inline-block;
+ background-color: transparent;
+ color: transparent;
+ border:0px solid transparent;
+ }
+
+.dbox.dsmall {
+ position: relative;
+ display: inline-block;
+ width: 170px;
+ height: 140px;
+ text-align: center;
+ margin: 0px 10px;
+ vertical-align: top;
+ }
+
+ .dbox.dsmall input.donate-btn {
+ background: url() left top no-repeat transparent;
+ width: auto;
+ height: auto;
+ margin-top: 0px;
+ display: block;
+ background-color: transparent;
+ color: transparent;
+ border:0px solid transparent;
+ }
+
+ .dbox.dsmall div label {
+ padding: 0px 0px 0px 0px;
+ }
+
+ .dbox.dsmall small {
+ display: block;
+ position: absolute;
+ width: 172px;
+ float: none;
+ bottom: 20px;
+ margin: 0px auto;
+ }
+
+ .givv p {
+ text-align: justify;
+ margin-top: 10px;
+ font-size: 11px;
+ line-height: 13px;
+ }
/*
** Markup free clearing
** Details: http://www.positioniseverything.net/easyclearing.html
Modified: website/trunk/donate/en/donate.wml
===================================================================
--- website/trunk/donate/en/donate.wml 2011-05-25 15:51:16 UTC (rev 24786)
+++ website/trunk/donate/en/donate.wml 2011-05-27 01:04:25 UTC (rev 24787)
@@ -8,162 +8,154 @@
<a href="<page index>">Home » </a>
<a href="<page donate/donate>">Donate</a>
</div>
- <div id="maincol">
- <h1>Monetary Donations</h1>
+<div id="maincol">
+ <h1>Make A Donation</h1>
<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
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. Our tax ID
- number is 20-8096820. We are listed on <a
+ number is 20-8096820. We are listed on <a
href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx";>GuideStar</a>.
- We're happy to accept donations via:
- <ul>
+ We're happy to accept donations via:</p>
+ <ul class="hlist">
<li><a href="#paypal">Paypal</a></li>
<li><a href="#amazon">Amazon Payments</a></li>
<li><a href="#google">Google Checkout</a></li>
<li><a href="#givv">Givv.org</a></li>
- <li><a href="#cash">checks, money orders, bank transfers, stock grants or
+ <li class="last"><a href="#cash">checks, money orders, bank transfers, stock grants or
other more sophisticated transactions.</a></li>
- </ul></p>
- <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations@xxxxxxxxxxxxxx for more details.</p>
- <!-- BEGIN PAYPAL SUBSCRIPTION -->
- <div class="title toptwenty">Tor Project Subscription via PayPal</div>
- <div class="left hundred">
- <div class="paypal focus">
- <a id="paypal"></a>
- <a class="anchor" href="#paypal"></a>
- <h4>Monthly Subscription to The Tor Project</h4>
- <table>
- <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
- <div class="toppad">
- <tr>
- <td>Choose your currency:</td>
- <td>
- <select name="currency_code">
- <option value="USD" selected="selected">$</option>
- <option value="EUR">€</option>
- <option value="GBP">£</option>
- <option value="YEN">¥</option>
- </select>
- </td>
- </tr>
- <tr>
- <input type="hidden" name="p3" value="1">
- <input type="hidden" name="t3" value="M">
+ </ul>
+ <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations@xxxxxxxxxxxxxx for more details.</p>
+<!-- BEGIN PAYPAL -->
+<script type="text/javascript" src="../jquery-1.6.1.min.js"></script>
+<script type="text/javascript">
+function displayVals() {
+ var t3 = jQuery('#t3').val();
+ var amount = jQuery('#amount').val();
+ var radioVal = jQuery('input[@name="amount"]:checked').val();
+ if(t3 != 0){
+ if( !amount ) {
+ jQuery('#a3').val(radioVal);
+ }else{
+ jQuery('#a3').val(amount);
+ }
+ jQuery('#p3').val(1);
+ jQuery('#cmd').val('_xclick-subscriptions');
+ jQuery('#item_name').val('Tor Project Membership');
+ jQuery('#ppinfo').replaceWith('<small id="ppinfo">Requires a PayPal Account</small>');
+ }else{
+ jQuery('#a3').val(0);
+ jQuery('#p3').val(0);
+ jQuery('#cmd').val('_donations');
+ jQuery('#item_name').val('Donation to the Tor Project');
+ jQuery('#ppinfo').replaceWith('<small id="ppinfo">Does Not Require a PayPal Account</small>');
+ }
+ if( !t3 ) {
+ jQuery('#cmd').val('_donations');
+ jQuery('#item_name').val('Donation to the Tor Project');
+ jQuery('#ppinfo').replaceWith('<small id="ppinfo">Does Not Require a PayPal Account</small>');
+ }
+}
+
+jQuery(function(){
+ jQuery("input[@name='amount']:checked").change(displayVals);
+ jQuery("#amount").change(displayVals);
+ jQuery("#t3").change(displayVals);
+ displayVals();
+
+});
+</script>
+
+ <div class="hundred toptwenty">
+ <div class="dbox donate">
+ <a name="paypal"></a>
+ <h3>Donate via PayPal</h3>
+ <form id="donate" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
+ <p class="type">
+ <label for="type">Donation Type:</label>
+ <select id="t3" name="t3">
+ <option value="0">One-time Donation</option>
+ <option value="M">Monthly Subscription</option>
+ </select>
+ <small id="ppinfo">Does Not Require a PayPal Account</small>
+ </p>
+ <div class="drow">
+ <div>
+ <span>
+ <select name="currency_code" class="cur">
+ <option value="USD" selected="selected">$</option>
+ <option value="EUR">€</option>
+ <option value="GBP">£</option>
+ <option value="YEN">¥</option>
+ </select>
+ </span>
+ <ul class="amounts">
+ <li><input type="radio" name="amount" value="2000.00"><label for="2000">2000</label></li>
+ <li><input type="radio" name="amount" value="1000.00"><label for="1000">1000</label></li>
+ <li><input type="radio" name="amount" value="500.00"><label for="500">500</label></li>
+ <li><input type="radio" name="amount" value="250.00"><label for="250">250</label></li>
+ <li><input type="radio" name="amount" value="100.00"><label for="100">100</label></li>
+ <li><input type="radio" name="amount" value="50.00"><label for="50">50</label></li>
+ <li><input type="radio" name="amount" value="20.00" checked="checked"><label for="20">20</label></li>
+ <li><input type="radio" name="amount" value="10.00"><label for="10">10</label></li>
+ <li><input type="radio" name="amount" value="5.00"><label for="5">5</label></li>
+ </ul>
+ </div>
+ <div>
+ <label for="custom">or enter a donation amount:</label><input type="text" id="amount" class="amount" name="amount">
+ <input type="hidden" id="a3" name="a3" value="0">
+ <input class="donate-btn" type="submit" name="donate" value="Donate" alt="Subscribe to Tor with PayPal - it's fast, free and secure!">
+ <!-- <input type="image" src="../images/btn_donateCC_LG.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> -->
+ </div>
+ <input type="hidden" id="p3" name="p3" value="1">
<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="image" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"/>
- <input type="hidden" name="cmd" value="_xclick-subscriptions">
+ <input type="hidden" id="cmd" name="cmd" value="_donations">
<input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx">
- <input type="hidden" name="item_name" value="Tor Project Membership">
- <input type="hidden" name="return" value="https://www.torproject.org/donate"/>
- <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>
- <input class="donate-btn" type="submit" name="donate" value="Donate">
- </tr>
- <tr>
- <td><input type="radio" name="amount" value="5.00">5/mo</td>
- <td><input type="radio" name="amount" value="10.00">10/mo</td>
- <td><input type="radio" name="amount" value="20.00" checked="checked">20/mo</td>
- </tr>
- <tr>
- <td><input type="radio" name="amount" value="50.00">50/mo</td>
- <td><input type="radio" name="amount" value="100.00">100/mo</td>
- <td><input type="radio" name="amount" value="250.00">250/mo</td>
- </tr>
+ <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";>
+ <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate";>
</div>
+ </form>
+ </div>
+ </div>
+<!-- END PAYPAL -->
+ <div class="hundred toptwenty">
+<!-- BEGIN AMAZON -->
+ <a name="amazon"></a>
+ <div class="dbox dsmall">
+ <h3>Donate via Amazon Payments</h3>
+ <form action="https://authorize.payments.amazon.com/pba/paypipeline"; method="post">
+ <div class="drow toppad">
+ <div>
+ <label for="amazon">$</label>
+ <input type="text" name="amount" size="6" value="20">
+ <input class="donate-btn" type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif";>
+ </div>
+ <input type="hidden" name="immediateReturn" value="1">
+ <input type="hidden" name="collectShippingAddress" value="0">
+ <input type="hidden" name="minimumDonationAmount" value="USD 5">
+ <input type="hidden" name="isDonationWidget" value="1">
+ <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy">
+ <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1">
+ <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en";>
+ <input type="hidden" name="processImmediate" value="1">
+ <input type="hidden" name="cobrandingStyle" value="logo">
+ <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en";>
+ </div>
</form>
- </table>
- </div>
- </div>
- <!-- END PAYPAL SUBSCRIPTION -->
- <!-- BEGIN PAYPAL ONE TIME -->
- <div class="title toptwenty">Single Donation via PayPal</div>
- <div class="left hundred">
- <div class="paypal focus">
- <h4>Make a one-time donation</h4>
- <form id="donate" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
- <table>
- <tr colspan="2">
- <td>Choose your currency:</td>
- <td>
- <select name="currency_code">
- <option value="USD" selected="selected">$</option>
- <option value="EUR">€</option>
- <option value="GBP">£</option>
- <option value="YEN">¥</option>
- </select>
- </td>
- </tr>
- <tr colspan="2">
- <input type="hidden" name="no_shipping" value="1">
- <input type="image" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Make a single donation with PayPal - it's fast, free and secure!"/>
- <input type="hidden" name="cmd" value="_xclick">
- <input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx">
- <input type="hidden" name="item_name" value="Donation to the Tor Project">
- <input type="hidden" name="return" value="https://www.torproject.org/donate/donate.html.en"/>
- <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate/donate.html.en"/>
- </tr>
- <tr>
- <td><input type="radio" name="amount" value="10.00"> 10</td>
- <td><input type="radio" name="amount" value="20.00" checked="checked"> 20</td>
- <td><input type="radio" name="amount" value="50.00"> 50</td>
- <td><input type="radio" name="amount" value="100.00"> 100</td>
- </tr>
- <tr>
- <td><input type="radio" name="amount" value="250.00"> 250</td>
- <td><input type="radio" name="amount" value="500.00"> 500</td>
- <td><input type="radio" name="amount" value="1000.00"> 1,000</td>
- <td><input type="radio" name="amount" value="5000.00"> 5,000</td>
- </tr>
- </table>
- </form>
- </div>
- </div>
- <!-- END PAYPAL ONE-TIME -->
- <!-- BEGIN AMAZON -->
- <div class="title topforty">Single Donation via Amazon Payments</div>
- <div class="hundred left">
- <div class="paypal focus">
- <a id="amazon"></a>
- <a class="anchor" href="#amazon"></a>
- <h4>Make a single donation.</h4>
- <form action="https://authorize.payments.amazon.com/pba/paypipeline"; method="post">
- <table>
- <tr>
- <input type="hidden" name="immediateReturn" value="1">
- <input type="hidden" name="collectShippingAddress" value="0">
- <input type="hidden" name="minimumDonationAmount" value="USD 10">
- <input type="hidden" name="isDonationWidget" value="1">
- <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy">
- <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1">
- <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en";>
- <input type="hidden" name="processImmediate" value="1">
- <input type="hidden" name="cobrandingStyle" value="logo">
- <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en";>
- </tr>
- <td> </td>
- <td>$<input type="text" name="amount" size="8" value="10"></td>
- <td> </td>
- <tr>
- <td colspan="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif";></td>
- </tr>
- </table>
- </form>
- </div>
- </div>
- <!-- END AMAZON -->
- <!-- BEGIN GOOGLE -->
- <div class="title topforty">Single Donation via Google Checkout</div>
- <div class="hundred left">
- <div class="paypal focus">
+ <small>Requires an Amazon Account</small>
+ </div>
+<!-- END AMAZON -->
+<!-- BEGIN GOOGLE -->
<a id="google"></a>
- <a class="anchor" href="#google"></a>
- <h4>Make a single donation.</h4>
-
+ <div class="dbox dsmall">
+ <h3>Donate via Google Checkout</h3>
+
<script type="text/javascript">
function validateAmount(amount){
if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
@@ -175,64 +167,55 @@
}
}
</script>
-<form action="https://checkout.google.com/cws/v2/Donations/250937139555708/checkoutForm"; id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
-<table>
-<tr>
- <input name="item_name_1" type="hidden" value="Donate to the Tor
-Project"/>
- <input name="item_description_1" type="hidden" value="Tor is written
-for and supported by people like you"/>
- <input name="item_quantity_1" type="hidden" value="1"/>
- <input name="item_currency_1" type="hidden" value="USD"/>
- <input name="item_is_modifiable_1" type="hidden" value="true"/>
- <input name="item_min_price_1" type="hidden" value="0.01"/>
- <input name="item_max_price_1" type="hidden" value="25000.0"/>
- <input name="_charset_" type="hidden" value="utf-8"/>
-</tr>
-<tr>
-<td>
- $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="25.00"/>
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=250937139555708&w=115&h=50&style=trans&variant=text&loc=en_US"; type="image"/>
-</td>
-</tr>
-</table>
-</form>
-</div>
-</div>
- <!-- END GOOGLE -->
- <!-- BEGIN GIVV -->
- <div class="title topforty">Donate via Givv.org</div>
- <div class="hundred left">
+
+ <form action="https://checkout.google.com/cws/v2/Donations/250937139555708/checkoutForm"; id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
+ <div class="drow toppad">
+ <div>
+ <label for="google">$</label>
+ <input id="item_price_1" name="item_price_1" size="6" type="text" value="20">
+ <input class="donate-btn" alt="Donate" src="https://checkout.google.com/buttons/checkout.gif?merchant_id=&w=168&h=44&style=trans&variant=text&loc=en_US"; type="image">
+ </div>
+ <input name="item_name_1" type="hidden" value="Donate to the Tor Project">
+ <input name="item_description_1" type="hidden" value="Tor is written for and supported by people like you">
+ <input name="item_quantity_1" type="hidden" value="1">
+ <input name="item_currency_1" type="hidden" value="USD">
+ <input name="item_is_modifiable_1" type="hidden" value="true">
+ <input name="item_min_price_1" type="hidden" value="0.01">
+ <input name="item_max_price_1" type="hidden" value="25000.0">
+ <input name="_charset_" type="hidden" value="utf-8">
+ </div>
+ </form>
+ <small>Requires a Google Account</small>
+ </div>
+<!-- END GOOGLE -->
+<!-- BEGIN GIVV -->
<a id="givv"></a>
- <a class="anchor" href="#givv"></a>
- <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="http://givv.org/recipients/the-tor-project";>Continue to Givv.org »</a></strong></p>
- </div>
- <!-- END GIVV -->
- <!-- BEGIN CHECK -->
- <div class="title toptwenty">Donate via Check, Cash, or Money Order</div>
- <div class="left hundred">
- <a id="cash"></a>
- <a class="anchor" href="#cash"></a>
- <p>You can send checks or money orders to:</p>
+ <div class="dbox dsmall givv">
+ <h3>Donate via Givv.org</h3>
+ <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. <strong>You stay anonymous and stay in control!</strong></p>
+ <p style="text-align:center;"><strong><a href="http://givv.org/recipients/the-tor-project";>Continue to Givv.org »</a></strong></p>
+ </div>
+<!-- END GIVV -->
+ </div>
+<!-- BEGIN CHECK -->
+ <a id="cash"></a>
+ <div class="hundred toptwenty">
+ <div class="dbox donate">
+ <h3>Donate via Check, Cash, Money Order, Bank Transfer, Stock Grant, or Another More Sophisticated Transaction</h3>
+ <h4>You can send checks or money orders to:</h4>
<p>The Tor Project, Inc<br>
969 Main Street, Suite 206<br>
Walpole, MA 02081-2972 USA</p>
- </div>
- <!-- END CHECK -->
- <div class="title toptwenty">
- Donate via Wire or Bank Transfer
- </div>
- <div class="left hundred">
- <h3>US Transfers</h3>
+<!-- END CHECK -->
+ <h3 style="margin-top:20px;">Donate via Wire or Bank Transfer</h3>
+ <h4>US Transfers</h4>
<p>For US donations via wire or ACH transfer, please contact us for the relevant information.</p>
- <h3>European Transfers</h3>
+ <h4>European Transfers</h4>
<p>Wau Holland Stiftung<br>
IBAN DE03 5204 0021 0277 281202<br>
SWIFT BIC COBADEFF520</p>
- <p><strong>Classic style German account information is:</strong><br>
- Konto: 2772812-02<br>
+ <h4>Classic style German account information is:</h4>
+ <p>Konto: 2772812-02<br>
Inhaber: Wau Holland Stiftung<br>
Bank: Commerzbank Kassel<br>
BLZ: 52040021</p>
@@ -254,12 +237,13 @@
a donation receipt upon request (if provided with address
information).</li>
</ul>
- </div>
- <!-- END TRANSFER -->
- <!-- END MAINCOL -->
+ </div>
+ </div>
+<!-- END TRANSFER -->
+<!-- END MAINCOL -->
</div>
<div id = "sidecol">
-#include "side.wmi"
+#include "side-donate.wmi"
#include "info.wmi"
</div>
<!-- END SIDECOL -->
Added: website/trunk/donate/en/side-donate.wmi
===================================================================
--- website/trunk/donate/en/side-donate.wmi (rev 0)
+++ website/trunk/donate/en/side-donate.wmi 2011-05-27 01:04:25 UTC (rev 24787)
@@ -0,0 +1,92 @@
+#! /usr/bin/wml
+<: use strict; :>
+<: use warnings; :>
+#use "perl-globals.wmi"
+#use "links.wmi"
+#use "versions.wmi"
+#use "sidenav.wmi"
+<div class="img-shadow">
+ <div id="sidenav">
+ <h2>Help another way:</h2>
+ <:
+ # recursively search menu structure to see if it contains a given page
+ sub containsSub($$);
+ sub containsSub($$) {
+ my ($elements, $page) = @_;
+ for my $ele (@{$elements}) {
+ if (containsSub($ele->{'subelements'},$page)){
+ return 1;
+ } elsif ($page eq $ele->{'url'}) {
+ return 1;
+ }
+
+ }
+ return 0;
+ }
+
+ # generate navigation menu
+ sub printNavMenu($$$);
+ sub printNavMenu($$$) {
+ my ($navmenu, $page, $lang) = @_;
+ print '<ul>'."\n";
+ for my $navmenu (@{$navmenu}) {
+ # this menu entry is the current (active) page
+ if ($navmenu->{'url'} eq $page) {
+
+ # the current page has nested menu elements
+ if ($navmenu->{'subelements'}) { # menu has dropdown
+ printf '<li class="dropdown active"><a class="active" href="%s">%s</a></li>'."\n",
+ pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'};
+
+ print '<li>'."\n";
+ printNavMenu($navmenu->{'subelements'},$page,$lang);
+ print '</li>'."\n";
+
+ # the current (active) page does not have sub elements
+ } else {
+ printf '<li class="active"><a class="active" href="%s">%s</a></li>'."\n",
+ pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'};
+ }
+
+ # a subelement of this menu item is the current (active) page
+ } elsif (containsSub($navmenu->{'subelements'}, $page)) {
+ printf '<li class="dropdown"><a class="active" href="%s">%s</a></li>'."\n",
+ pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'};
+
+ print '<li>'."\n"; #encapsulate subelements
+ # recurse to generate the expanded menu
+ printNavMenu($navmenu->{'subelements'},$page,$lang);
+ print '</li>'."\n"; #encapsulate subelements
+
+ # the menu entry is not active and does not enclose the active page
+ } else {
+
+ # if there are subelements, set collapsed style
+ if ($navmenu->{'subelements'}) {
+ printf '<li class="dropdown"><a href="%s">%s</a></li>'."\n",
+ pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'};
+ # regular menu entry
+ } else {
+ printf '<li><a href="%s">%s</a></li>'."\n",
+ pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'};
+ }
+ }
+ }
+ print '</ul>'."\n";
+ }
+
+ my $lang = "$(LANG)";
+
+ use Cwd;
+ use Cwd 'abs_path';
+ use File::Spec;
+
+ # get document path from site root
+ my $path = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
+ my $page = $WML_SRC_BASENAME;
+ printNavMenu($sidenav, $path.'/'.$page, $lang);
+ :>
+ </div>
+ <!-- END SIDENAV -->
+</div>
+<!-- END IMG-SHADOW -->
Modified: website/trunk/download/en/download-easy.wml
===================================================================
--- website/trunk/download/en/download-easy.wml 2011-05-25 15:51:16 UTC (rev 24786)
+++ website/trunk/download/en/download-easy.wml 2011-05-27 01:04:25 UTC (rev 24787)
@@ -7,19 +7,108 @@
<div id="content" class="clearfix">
<div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download-easy>">Easy Download Selector</a></div>
<div id="maincol-left">
+<!-- BEGIN TEASER WARNING -->
+<div class="warning">
+<h2>Want Tor to really work?</h2>
+<p>...then please don't just install it and go on. You need to change some of
+your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all
+you need to maintain your anonymity. Read the <a
+href="<page download/download>#warning">full list of warnings</a>.
+</p>
+</div>
+<!-- END TEASER WARNING -->
+<br>
-<table class="topforty">
-<tr>
-<td class="nopad"><div class="title">
-Tor Browser Bundle
-</div>
+<table class="toppad" summary="">
+<tbody>
+<tr style="vertical-align:top;">
+<td class="nopad" height="1" style="vertical-align:top;">
+<h2>Tor Browser Bundle</h2>
+
</td>
+
+ <!-- DONATION WIDGET BEGIN -->
+<script type="text/javascript" src="../jquery-1.6.1.min.js"></script>
+<script type="text/javascript">
+function displayVals() {
+ var t3 = jQuery("#t3").val();
+ var amount = jQuery("#amount").val();
+ if(t3 != 0){
+ jQuery('#a3').val(amount);
+ jQuery('#p3').val(1);
+ jQuery('#cmd').val('_xclick-subscriptions');
+ jQuery('#item_name').val('Tor Project Membership');
+ jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
+ }else{
+ jQuery('#a3').val(0);
+ jQuery('#p3').val(0);
+ jQuery('#cmd').val('_donations');
+ jQuery('#item_name').val('Donation to the Tor Project');
+ jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
+ }
+ if( !t3 ) {
+ jQuery('#cmd').val('_donations');
+ jQuery('#item_name').val('Donation to the Tor Project');
+ jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
+ }
+}
+
+jQuery(function(){
+ jQuery("#amount").change(displayVals);
+ jQuery("#t3").change(displayVals);
+ displayVals();
+});
+
+</script>
+<td class="nopad" rowspan="8" style="width:220px;vertical-align:top;">
+ <form class="dbox" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
+ <h2>Donate to Tor</h2>
+ <p>
+ <select name="currency_code" class="cur">
+ <option value="USD" selected="selected">$</option>
+ <option value="EUR">€</option>
+ <option value="GBP">£</option>
+ <option value="YEN">¥</option>
+ </select>
+ <input type="text" id="amount" class="amount" name="amount" value="5" size="10">
+ </p>
+ <p>
+ <input type="hidden" id="a3" name="a3" value="0">
+ <select id="t3" name="t3">
+ <option value="0">One-time Donation</option>
+ <option value="M">Monthly Subscription</option>
+ </select>
+ </p>
+ <p>
+ <input type="hidden" id="p3" name="p3" value="1">
+ <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" id="cmd" name="cmd" value="_donations">
+ <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";>
+ <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate";>
+ </p>
+ <h6 id="ppinfo" style="height:0px;"></h6>
+ <p>
+ <input class="donate-btn" type="submit" name="donate" value="Donate">
+ </p>
+ <p>
+ <a href="../donate/donate.html.en" >Other donation options...</a>
+ </p>
+ </form>
+</td>
+ <!-- DONATION WIDGET END -->
+
</tr>
<tr>
<td>The <strong>Tor Browser Bundle</strong> contains everything you need
to safely browse the Internet. This package requires no installation.
Just extract it and run. <a href="<page projects/torbrowser>">Learn more
& other languages »</a></td>
+
</tr>
<tr class="gray">
<td><span class="windows">
@@ -45,31 +134,25 @@
</span>
</td>
</tr>
-</table>
-<br>
-<!-- BEGIN TEASER WARNING -->
-<div class="warning">
-<h2>Want Tor to really work?</h2>
-<p>...then please don't just install it and go on. You need to change some of
-your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all
-you need to maintain your anonymity. Read the <a
-href="<page download/download>#warning">full list of warnings</a>.
-</p>
-</div>
-<!-- END TEASER WARNING -->
-<br>
-<p>Need more download options? <a href="<page download/download>">See advanced choices</a>.</p>
-<br>
-<p>Interested in <a href="<page about/overview>">learning more about Tor in general</a>?</p>
-<br>
+<tr>
+<td>
+<p>Looking for something else? <a href="<page download/download>">View All Downloads</a>.</p>
+</td>
+</tr>
+<tr class="gray">
+<td colspan="2">
<p>To keep informed of security advisories and new stable releases, subscribe to the <a
href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce";>tor-announce
mailing list</a>. You can also <a
href="http://rss.gmane.org/gmane.network.onion-routing.announce";>watch
the list's RSS feed</a>.</p>
-<p>All trademarks are the property of their respective owners.</p>
-
+</td>
+</tr>
+</tbody>
+</table>
+<!-- <br>
+<p>Interested in <a href="../about/overview.html.en">learning more about Tor in general</a>?</p> -->
</div>
<!-- END MAINCOL -->
<div id="sidecol-right">
@@ -109,6 +192,9 @@
<!-- END SIDENAV -->
</div>
</div><!-- #main -->
+<div class="">
+<p><small>All trademarks are the property of their respective owners.</small></p>
+</div>
#include <foot.wmi>
Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml 2011-05-25 15:51:16 UTC (rev 24786)
+++ website/trunk/download/en/download.wml 2011-05-27 01:04:25 UTC (rev 24787)
@@ -20,7 +20,84 @@
<td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td>
</tr>
<tr>
-<td>The Tor Software for Windows comes bundled in four different ways:
+<td>
+ <!-- DONATION WIDGET BEGIN -->
+<script type="text/javascript" src="../jquery-1.6.1.min.js"></script>
+<script type="text/javascript">
+function displayVals() {
+ var t3 = jQuery("#t3").val();
+ var amount = jQuery("#amount").val();
+ if(t3 != 0){
+ jQuery('#a3').val(amount);
+ jQuery('#p3').val(1);
+ jQuery('#cmd').val('_xclick-subscriptions');
+ jQuery('#item_name').val('Tor Project Membership');
+ jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
+ }else{
+ jQuery('#a3').val(0);
+ jQuery('#p3').val(0);
+ jQuery('#cmd').val('_donations');
+ jQuery('#item_name').val('Donation to the Tor Project');
+ jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
+ }
+ if( !t3 ) {
+ jQuery('#cmd').val('_donations');
+ jQuery('#item_name').val('Donation to the Tor Project');
+ jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
+ }
+}
+
+jQuery(function(){
+ jQuery("#amount").change(displayVals);
+ jQuery("#t3").change(displayVals);
+ displayVals();
+});
+
+</script>
+ <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
+ <h2>Donate to Tor</h2>
+ <p>
+ <select name="currency_code" class="cur">
+ <option value="USD" selected="selected">$</option>
+ <option value="EUR">€</option>
+ <option value="GBP">£</option>
+ <option value="YEN">¥</option>
+ </select>
+ <input type="text" id="amount" class="amount" name="amount" value="5" size="10">
+ </p>
+ <p>
+ <input type="hidden" id="a3" name="a3" value="0">
+ <select id="t3" name="t3">
+ <option value="0">One-time Donation</option>
+ <option value="M">Monthly Subscription</option>
+ </select>
+ </p>
+
+ <p>
+
+ <input type="hidden" id="p3" name="p3" value="1">
+
+ <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" id="cmd" name="cmd" value="_donations">
+ <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";>
+ <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate";>
+ </p>
+ <h6 id="ppinfo" style="height:0px;"></h6>
+ <p>
+ <input class="donate-btn" type="submit" name="donate" value="Donate">
+ </p>
+ <p><a href="../donate/donate.html.en" >Other donation options...</a></p>
+ </form>
+
+ <!-- DONATION WIDGET END -->
+
+The Tor Software for Windows comes bundled in four different ways:
<ul>
<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></li>
<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor.</li>
Added: website/trunk/images/warning2.jpg
===================================================================
(Binary files differ)
Property changes on: website/trunk/images/warning2.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: website/trunk/jquery-1.6.1.min.js
===================================================================
(Binary files differ)
Property changes on: website/trunk/jquery-1.6.1.min.js
___________________________________________________________________
Added: svn:mime-type
+ application/javascript
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits