[gnomeweb-wml] Broke adoption types for adopt and annual to distinguish between monthly and annual plans.

[Og B. Maciel <ogmaciel src gnome org>]

commit a29488bc7b9aa19112c5474663a8e774b2ac612a
Author: Og B. Maciel <ogmaciel gnome org>
Date:   Mon Nov 8 20:46:55 2010 -0500

    Broke adoption types for adopt and annual to distinguish between monthly and annual plans.

 www.gnome.org/friends/index.wml |   10 ++++++++--
 www.gnome.org/friends/step2.wml |   18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/www.gnome.org/friends/index.wml b/www.gnome.org/friends/index.wml
index bd1618c..9defd0f 100644
--- a/www.gnome.org/friends/index.wml
+++ b/www.gnome.org/friends/index.wml
@@ -64,8 +64,14 @@ in 2008 we were able to:
 <div class="box active">
 <input type="radio" name="aidtype" value="adopt" checked>
 <img src="images/postcard.png">
-<h3>Adopt a hacker for $10 USD a month or commit for a year and save $20 USD!</h3>
-<strong>You get:</strong> A set of GNOME stickers, a thank you postcard from your favorite hacker, a FREE subscription to LWN and a t-shirt at the end of one year. Commit to a year now and receive your t-shirt immediately!
+<h3>Adopt a hacker for $10 USD a month!</h3>
+<strong>You get:</strong> A set of GNOME stickers, a thank you postcard from your favorite hacker, a FREE subscription to LWN and a t-shirt at the end of one year!
+</div>
+
+<input type="radio" name="aidtype" value="annual" checked>
+<img src="images/t-shirt.png">
+<h3>Commit to a year and save $20 USD!</h3>
+<strong>You get:</strong> A set of GNOME stickers, a thank you postcard from your favorite hacker, a FREE subscription to LWN and receive your t-shirt immediately!
 </div>
 
 <div class="box">
diff --git a/www.gnome.org/friends/step2.wml b/www.gnome.org/friends/step2.wml
index a23c3c7..c2b20ce 100644
--- a/www.gnome.org/friends/step2.wml
+++ b/www.gnome.org/friends/step2.wml
@@ -63,6 +63,12 @@ improve GNOME products.</li>
 				<input type="radio" value="You will receive a postcard from Luis Villa" name="os0"/><a href="http://live.gnome.org/LuisVilla4"; target="_blank">Luis Villa</a><br/>';
 				break;
 
+			case 'annual':
+				echo 'You have chosen our annual <strong>subscription</strong> <a href="index.html">(change)</a> <br />'; 
+				echo '<strong>One time amount:</strong> $<input type="text" id="amount" name="amount" value="100" size=5><br />';
+				echo 'Please increase the amount above if you want to make a larger difference.';
+				break;
+
 			case 'associate':
 				echo 'You have chosen to become a <strong>associate</strong> <a href="index.html">(change)</a> <br />'; 
 				echo '<strong>One time amount:</strong> $<input type="text" id="amount" name="amount" value="25" size=5><br />';
@@ -88,7 +94,7 @@ improve GNOME products.</li>
 		}
 
 		
-		if ($_POST['aidtype'] == 'adopt' || $_POST['aidtype'] == 'sponsor') {
+		if ($_POST['aidtype'] == 'adopt' || $_POST['aidtype'] == 'annual' || $_POST['aidtype'] == 'sponsor') {
 			echo '<h3>Select a t-shirt size:</h3>
                         <input type="hidden" value="T-shirt Size" name="on3"/>
                         <input type="radio" value="M" name="os3"/>M
@@ -136,7 +142,7 @@ improve GNOME products.</li>
 				<input type="hidden" name="t3" value="M">
 				<!-- "src" with a value of "1" causes it to repeat for every interval. -->
 				<input type="hidden" name="src" value="1">
-				<!-- Not sure what "sra" does. Doesn not seem to harm the form (part of sample). -->
+				<!-- Not sure what "sra" does. Does not seem to harm the form (part of sample). -->
 				<input type="hidden" name="sra" value="1">
 				<input type="hidden" name="currency_code" value="USD">
 				<!-- Display the payment button. --> 
@@ -144,6 +150,14 @@ improve GNOME products.</li>
 				<img alt="" border="0" width="1" height="1" src="https://www.paypal.com/en_US/i/scr/pixel.gif"; />';
 			break;
 
+			case 'annual':
+				echo '<input type="hidden" value="friends gnome org" name="business"/>
+				<input type="hidden" value="http://www.gnome.org/friends/thank-you.php"; name="return"/>
+				<input type="hidden" value="_xclick" name="cmd"/>
+				<input type="hidden" name="item_name" value="Friends of GNOME - Adopt a hacker annually subscription"/> 
+				<input type="image" alt="Donate" name="submit" src="images/donate-button.png"/>';
+			break;
+
 			case 'associate':
 				echo '<input type="hidden" value="friends gnome org" name="business"/>
 				<input type="hidden" value="http://www.gnome.org/friends/thank-you.php"; name="return"/>