As discussed with Larjona on IRC, here's the patch I'm proposing for the donations page. The goal is to differentiate less between SPI and other TOs and be consistent in how donations methods are displayed. At the moment, even though we recommend SPI PayPal as the main way to donate, it is not listed in the list where all the donations methods are made. I understand the "other methods" thing now, but it made me very confused when Michael from SPI pointed me to the donation page (I could not find the PayPal option since it was not in the list). I don't know your system enough to propose further modifications, but I would recommend completely removing the differentiation between SPI and the other TOs and show a clear list of methods (removing the "default" section). Thanks. -- pollo ----- diff --git a/donations.wml b/donations.wml index 2473c39..69b7eb6 100644 --- a/donations.wml +++ b/donations.wml @@ -16,24 +16,15 @@ Thanks to all of our <a href="#donors">donors</a> for supporting Debian! </p> <p id="default"> -<span id="spi-paypal"> The easiest method of donating to Debian is via PayPal to <a href="http://www.spi-inc.org/"; title="SPI">Software in the Public Interest</a>, a non-profit organization that holds assets in trust for Debian. -</span> You can also donate via the <a href="#other">other methods listed below</a>. <!-- You can donate via the <a href="#other">methods listed below</a>. --> </p> -<form action="https://www.paypal.com/cgi-bin/webscr"; method="post"> -<div> -<input type="hidden" name="cmd" value="_s-xclick"> -<input type="hidden" name="hosted_button_id" value="86AHSZNRR29UU"> -<input type="submit" value="Donate via PayPal" /> -</div> -</form> <!-- Hidden due to an issue with USAePay/Paysimple @@ -49,7 +40,7 @@ https://lists.debian.org/msgid-search/CABJgS1ZtpcfM3uzA+j9_mp6ocR2H=p4cOcWWs2rjS </form> --> -<h2 id="other">Other methods</h2> +<h2 id="other">Methods</h2> <p> Various <a href="https://wiki.debian.org/Teams/Auditor/Organizations";>organisations</a> @@ -131,6 +122,21 @@ is a tax-exempt non-profit corporation based in the United States of America, founded by Debian people in 1997 to help free software/hardware organisations. </p> +<h4 id="spi-paypal">PayPal</h4> +<p> +Single and monthly recurring donations can be made via the SPI PayPal page. To make +a monthly recurring donation, check the "Make This Recurring (Monthly)" box on +the PayPal donation page. +</p> + +<form action="https://www.paypal.com/cgi-bin/webscr"; method="post"> +<div> +<input type="hidden" name="cmd" value="_s-xclick"> +<input type="hidden" name="hosted_button_id" value="86AHSZNRR29UU"> +<input type="submit" value="Donate via PayPal" /> +</div> +</form> + <h4 id="spi-click-n-pledge">Click & Pledge</h4> <p> -----
Attachment:
signature.asc
Description: OpenPGP digital signature