[gnome-web-www] Add a Benefits field for applicants to specify if they plan to adopt either a @gnome.org mail alias

[Andrea Veri <av src gnome org>]

commit fe06d9543aeada8c45a06b33511374f85b6ffd59
Author: Andrea Veri <av gnome org>
Date:   Fri Apr 26 13:14:27 2013 +0200

    Add a Benefits field for applicants to specify if they plan to adopt either a @gnome.org mail alias or a 
Jabber account after being accepted.

 theme/page-apply.php  |   24 ++++++++++++++++++++++++
 theme/page-apply.php~ |   34 ++++++++++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 4 deletions(-)
---
diff --git a/theme/page-apply.php b/theme/page-apply.php
index 5bedc04..158f064 100644
--- a/theme/page-apply.php
+++ b/theme/page-apply.php
@@ -30,6 +30,10 @@ if (array_key_exists('submit', $_POST)) {
                     
                     "Full Name: " . $full_name . "\n".
                     "Email:     " . $obfuscated_email . "\n\n" .
+
+                   "Benefits\n" .
+                    "Mail alias:" . $gnome_mail_alias . "\n".
+                    "Jabber Account:" . $gnome_jabber . "\n\n" .
                     
                     "Contributions Summary:\n" .
                     $summary . "\n\n" .
@@ -164,6 +168,26 @@ if (array_key_exists('submit', $_POST)) {
                             <input name="email" id="email" type="text">
                         </div>
                         
+                       <h3>Benefits</h3>
+                            <p>
+                                Being a GNOME Foundation member takes in several benefits (see
+                               Membership benefits on the above paragraph), please answer either
+                               “yes” or “no” if you plan to adopt a @gnome.org mail alias or a
+                               Jabber account after being eventually accepted as a GNOME Foundation
+                               member. The alias will point to the e-mail you specified above as your
+                               permanent e-mail address.
+                            </p>                                               
+
+                        <div class="item">
+                            <label for="gnome_mail_alias">@gnome.org Mail Alias</label>
+                            <input name="gnome_mail_alias" id="gnome_mail_alias" type="text">
+                        </div>
+
+                        <div class="item">
+                            <label for="gnome_jabber">Jabber Account</label>
+                            <input name="gnome_jabber" id="gnome_jabber" type="text">
+                        </div>
+                       
                         <h3>Contributions</h3>
                         
                         <div class="item">
diff --git a/theme/page-apply.php~ b/theme/page-apply.php~
index d457206..786f908 100644
--- a/theme/page-apply.php~
+++ b/theme/page-apply.php~
@@ -30,6 +30,10 @@ if (array_key_exists('submit', $_POST)) {
                     
                     "Full Name: " . $full_name . "\n".
                     "Email:     " . $obfuscated_email . "\n\n" .
+
+                   "Benefits\n" .
+                    "Mail alias:" . $gnome_mail_alias . "\n".
+                    "Jabber Account:" . $gnome_jabber . "\n\n" .
                     
                     "Contributions Summary:\n" .
                     $summary . "\n\n" .
@@ -62,8 +66,12 @@ if (array_key_exists('submit', $_POST)) {
 <!-- container -->
     <div id="container" class="two_columns">
         <div class="container_12">
-        
-            <?php require_once('inc/page-title.php'); ?>
+
+ <div class="page_title" style="margin-bottom: 2px;">
+                <h1><?php the_title(); ?></h1>
+            </div>        
+<div class="clearfix"></div>
+            <?php wp_nav_menu(array('menu'=>'foundationnav','container_class'=>'foundation_nav')); ?>
             
             <div class="content without_sidebar">
             
@@ -83,7 +91,6 @@ if (array_key_exists('submit', $_POST)) {
 
                     <h2 style="text-align: center;">Application Form</h2>
 
-
                     <form action="" method="post" id="application_form">
 
                         <style type="text/css">
@@ -161,6 +168,26 @@ if (array_key_exists('submit', $_POST)) {
                             <input name="email" id="email" type="text">
                         </div>
                         
+                       <h3>Benefits</h3>
+                            <p>
+                                Being a GNOME Foundation member takes in several benefits (see
+                               Membership benefits on the above paragraph), please answer either
+                               “yes” or “no” if you plan to adopt a @gnome.org mail alias or a
+                               Jabber account hosted on the GNOME Infrastructure. The alias will
+                               point to the e-mail you specified above as your permanent e-mail
+                               address.
+                            </p>                                               
+
+                        <div class="item">
+                            <label for="gnome_mail_alias">@gnome.org Mail Alias</label>
+                            <input name="gnome_mail_alias" id="gnome_mail_alias" type="text">
+                        </div>
+
+                        <div class="item">
+                            <label for="gnome_jabber">Jabber Account</label>
+                            <input name="gnome_jabber" id="gnome_jabber" type="text">
+                        </div>
+                       
                         <h3>Contributions</h3>
                         
                         <div class="item">
@@ -197,7 +224,6 @@ if (array_key_exists('submit', $_POST)) {
                         </div>
                         
                     </form>
-                    
                 <?php endif; ?>
                 
                 <br />