[pypy-commit] pypy.org extradoc: Add a way to donate for both general and py3k cause from the main site. Use
fijal
noreply at buildbot.pypy.org
Wed Sep 21 14:32:06 CEST 2011
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r271:a60beecea321
Date: 2011-09-21 14:31 +0200
http://bitbucket.org/pypy/pypy.org/changeset/a60beecea321/
Log: Add a way to donate for both general and py3k cause from the main
site. Use the main site as the basic layout for py3k.
diff --git a/archive.html b/archive.html
--- a/archive.html
+++ b/archive.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
diff --git a/compat.html b/compat.html
--- a/compat.html
+++ b/compat.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -101,57 +102,6 @@
<p>A more complete list is available at <a class="reference external" href="http://pypy.readthedocs.org/en/latest/cpython_differences.html">our dev site</a>.</p>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/contact.html b/contact.html
--- a/contact.html
+++ b/contact.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -52,57 +53,6 @@
</ul>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/donate1.html b/donate1.html
new file mode 100644
--- /dev/null
+++ b/donate1.html
@@ -0,0 +1,60 @@
+<ul>
+ <li>
+ <a href="#" onclick="py3k_donate(); return false;"><b>Donate towards py3k in pypy</b></a><br/>
+ <a href="#" onclick="general_donate(); return false;">Donate towards general pypy progress</a><br/>
+ </li>
+ <li>
+ <span id="donate_text">This donation will go towards supporting python 3 in PyPy <a href="py3donate.html">Read proposal</a>
+ </li>
+ <li>
+ <div class="sidepic">
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick"/>
+ <input type="hidden" name="hosted_button_id" value="XBG5EK3URC5G8"/>
+ <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"/>
+ <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1"/>
+ </form>
+
+ <script type="text/javascript">
+ function validateAmount(amount){
+ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
+ return true;
+ }else{
+ alert('You must enter a valid donation.');
+ amount.focus();
+ return false;
+ }
+ }
+ </script>
+</li>
+<li>
+ <div id="googlecheckout">
+ <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
+ <input name="item_name_1" type="hidden" value="Directed Donation for PyPy's Py3k project"/>
+ <input name="item_description_1" type="hidden" value="Donation to Software Freedom Conservancy directed for PyPy's Py3k project: http://pypy.org/py3donate.html"/>
+ <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"/>
+ <table cellpadding="5" cellspacing="0" width="1%">
+ <tr>
+ <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="10"/>
+ </td>
+ <td align="left" width="1%">
+ <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </li>
+ </div>
+ </li>
+ <li>
+ <div class="sidepic">
+ <a id="main_download" href="download.html">Download PyPy</a>
+ </div>
+ </li>
+</ul>
diff --git a/donate2.html b/donate2.html
new file mode 100644
--- /dev/null
+++ b/donate2.html
@@ -0,0 +1,58 @@
+<ul>
+ <li>
+ <a href="#" onclick="py3k_donate(); return false;">Donate towards py3k in pypy</a><br/>
+ <a href="#" onclick="general_donate(); return false;"><b>Donate towards general pypy progress</b></a><br/>
+ </li>
+ <li>
+ <span id="donate_text">This donation will go towards general PyPy progress
+ </li>
+ <li>
+ <div class="sidepic">
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick" />
+<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+</form>
+ </div>
+ </li>
+ <li>
+ <div class="sidepic">
+<script type="text/javascript">
+function validateAmount(amount){
+ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
+ return true;
+ }else{
+ alert('You must enter a valid donation.');
+ amount.focus();
+ return false;
+ }
+}
+</script>
+<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
+ <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc."/>
+ <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project."/>
+ <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="5.0"/>
+ <input name="item_max_price_1" type="hidden" value="25000.0"/>
+ <input name="_charset_" type="hidden" value="utf-8"/>
+ <table cellpadding="5" cellspacing="0" width="1%">
+ <tr>
+ <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/>
+ </td>
+ <td align="left" width="1%">
+ <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
+ </td>
+ </tr>
+ </table>
+</form>
+ </div>
+ </li>
+ <li>
+ <div class="sidepic">
+ <a id="main_download" href="download.html">Download PyPy</a>
+ </div>
+ </li>
+</ul>
diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -191,57 +192,6 @@
</div>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/features.html b/features.html
--- a/features.html
+++ b/features.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -112,57 +113,6 @@
</div>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/howtohelp.html b/howtohelp.html
--- a/howtohelp.html
+++ b/howtohelp.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -55,57 +56,6 @@
</ul>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/index.html b/index.html
--- a/index.html
+++ b/index.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -67,57 +68,6 @@
<a class="reference external" href="compat.html">compatibility</a> reports!</p>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/js/script.js b/js/script.js
new file mode 100644
--- /dev/null
+++ b/js/script.js
@@ -0,0 +1,16 @@
+
+function py3k_donate() {
+ $.get("donate1.html", function (html) {
+ $("#sidebar").html(html);
+ });
+}
+
+function general_donate() {
+ $.get("donate2.html", function (html) {
+ $("#sidebar").html(html);
+ });
+}
+
+$(document).ready(function() {
+ py3k_donate();
+});
\ No newline at end of file
diff --git a/people.html b/people.html
--- a/people.html
+++ b/people.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -164,57 +165,6 @@
</div>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
diff --git a/py3donate.html b/py3donate.html
--- a/py3donate.html
+++ b/py3donate.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -52,7 +53,7 @@
continue using Python 2 while others work with Python 3, making it
harder for everyone.</p>
<p>The PyPy project is in a unique position in that it could support
-<strong>both Python 2 and Python 3</strong> versions from the same code base, fully
+Python 3 without having to discontinue supporting Python 2, with the possibility of reusing a large part of of code base and fully
reusing its unique translation and JIT-Compiler technologies.
However, it requires a lot of work, and it will take a long time
before we can complete a Python 3 port if we only wait for volunteer
@@ -67,43 +68,9 @@
Krekel and Jacob Hallen and they will - in close collaboration with
Conservancy and the core developers - select the best developers for
the Python 3 porting job among well known PyPy contributors.</p>
-<p>If you want to see PyPy support Python 3 and Python 2, donate here:</p>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="XBG5EK3URC5G8">
-<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-</form>
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
-}else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
- }
- </script>
- <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="Directed Donation for PyPy's Py3k project"/>
- <input name="item_description_1" type="hidden" value="Donation to Software Freedom Conservancy directed for PyPy's Py3k project: http://pypy.org/py3donate.html"/>
- <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"/>
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="10.00"/>
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
- </td>
- </tr>
- </table>
- </form><p>Should we not receive enough donations to complete all stages by 1st March 2012
+<p>If you want to see PyPy support Python 3 and Python 2, donate using buttons
+on the side.</p>
+<p>Should we not receive enough donations to complete all stages by 1st March 2012
at the latest, we will try our best to make PyPy support Python 3 anyway. We
however reserve the right to shift any unused funds to other PyPy activities
when that date is reached. Of course, since the Conservancy is a
@@ -173,7 +140,7 @@
2.7)</li>
<li>syntactic changes to make <tt class="docutils literal">io.py</tt> importable (in particular:
<tt class="docutils literal"><span class="pre">metaclass=...</span></tt> in class declarations)</li>
-<li><strong>Estimate cost</strong>: $37,000</li>
+<li><strong>Estimate cost</strong>: $35,000</li>
</ul>
</blockquote>
</li>
@@ -193,7 +160,7 @@
<tt class="docutils literal">del e</tt> at the end of the except block, etc.</li>
<li>changes to builtins: <tt class="docutils literal">super</tt>, <tt class="docutils literal">input</tt>, <tt class="docutils literal">next()</tt>, etc.</li>
<li>improved <tt class="docutils literal">with</tt> statement</li>
-<li><strong>Estimate cost</strong>: $26,000</li>
+<li><strong>Estimate cost</strong>: $28,000</li>
</ul>
</blockquote>
</li>
diff --git a/source/_layouts/page.genshi b/source/_layouts/page.genshi
--- a/source/_layouts/page.genshi
+++ b/source/_layouts/page.genshi
@@ -9,62 +9,5 @@
${Markup(content)}
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc."/>
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project."/>
- <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="5.0"/>
- <input name="item_max_price_1" type="hidden" value="25000.0"/>
- <input name="_charset_" type="hidden" value="utf-8"/>
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/>
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
-<py:if test="defined('__by__')">
-<h3>Meta</h3>
-<div class="sidebar-text">
-This page was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="http://github.com/tav/pypy-site/commits/master/${__id__}">${__updated__.strftime('%H:%M')}</a> <a href="http://github.com/tav/ampify/raw/master/LICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a>
</div>
-</py:if>
</div>
-</div>
diff --git a/source/_layouts/py3k.genshi b/source/_layouts/py3k.genshi
--- a/source/_layouts/py3k.genshi
+++ b/source/_layouts/py3k.genshi
@@ -9,11 +9,5 @@
${Markup(content)}
</div>
<div id="sidebar">
-<py:if test="defined('__by__')">
-<h3>Meta</h3>
-<div class="sidebar-text">
-This page was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="http://github.com/tav/pypy-site/commits/master/${__id__}">${__updated__.strftime('%H:%M')}</a> <a href="http://github.com/tav/ampify/raw/master/LICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a>
</div>
-</py:if>
</div>
-</div>
diff --git a/source/_layouts/site.genshi b/source/_layouts/site.genshi
--- a/source/_layouts/site.genshi
+++ b/source/_layouts/site.genshi
@@ -44,6 +44,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"/>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
diff --git a/source/py3donate.txt b/source/py3donate.txt
--- a/source/py3donate.txt
+++ b/source/py3donate.txt
@@ -1,5 +1,5 @@
---
-layout: py3k
+layout: page
title: (UNRELEASED DRAFT) Call for donations - PyPy to support Python3!
---
@@ -29,47 +29,8 @@
Conservancy and the core developers - select the best developers for
the Python 3 porting job among well known PyPy contributors.
-If you want to see PyPy support Python 3 and Python 2, donate here:
-
-.. raw:: html
-
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_s-xclick">
- <input type="hidden" name="hosted_button_id" value="XBG5EK3URC5G8">
- <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
- <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
- </form>
-
- <script type="text/javascript">
- function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
- }
- </script>
- <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="Directed Donation for PyPy's Py3k project"/>
- <input name="item_description_1" type="hidden" value="Donation to Software Freedom Conservancy directed for PyPy's Py3k project: http://pypy.org/py3donate.html"/>
- <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"/>
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="10.00"/>
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
- </td>
- </tr>
- </table>
- </form>
+If you want to see PyPy support Python 3 and Python 2, donate using buttons
+on the side.
Should we not receive enough donations to complete all stages by 1st March 2012
at the latest, we will try our best to make PyPy support Python 3 anyway. We
diff --git a/sponsor.html b/sponsor.html
--- a/sponsor.html
+++ b/sponsor.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
diff --git a/success.html b/success.html
--- a/success.html
+++ b/success.html
@@ -16,6 +16,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src="js/detect.js"></script>
+ <script type="text/javascript" src="js/script.js"></script>
</head>
<body>
<script type="text/javascript">
@@ -62,57 +63,6 @@
</div>
</div>
<div id="sidebar">
-<ul>
- <li>
- <div class="sidepic">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick" />
-<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
-<script type="text/javascript">
-function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
- }
-}
-</script>
-<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." />
- <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." />
- <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="5.0" />
- <input name="item_max_price_1" type="hidden" value="25000.0" />
- <input name="_charset_" type="hidden" value="utf-8" />
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" />
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" />
- </td>
- </tr>
- </table>
-</form>
- </div>
- </li>
- <li>
- <div class="sidepic">
- <a id="main_download" href="download.html">Download PyPy</a>
- </div>
- </li>
-</ul>
</div>
</div>
</div>
More information about the pypy-commit
mailing list