Bug 963195 - Need field added on gear/budget request form to designate if this is a Firefox Student Ambassador event

4 files changed, 63 insertions, 1 deletions

diff --git a/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
index 2ac4d9caa..40b08331b 100644
--- a/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
@@ -33,6 +33,8 @@ Requester info:
 Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] 
 Profile page: [% cgi.param('profilepage') %]
 Event page: [% cgi.param('eventpage') %]
+Event hosted by a Firefox Student Ambassador(s)?: [% cgi.param('ambassador_hosted') %]
+Main audience of the event are Firefox Student Ambassadors: [% cgi.param('ambassador_audience') %]
 Mentor Email: [% cgi.param('mentoremail') %]
 Paypal Account: [% cgi.param('paypal') %]
 Country You Reside: [% cgi.param('country') %]
diff --git a/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
index dba982310..ef7419dc9 100644
--- a/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
@@ -36,6 +36,8 @@ Profile page: [% cgi.param('profilepage') %]
 Event name: [% cgi.param('eventname') %]
 Event page: [% cgi.param('eventpage') %]
 Estimated attendance: [% cgi.param('attendance') %]
+Event hosted by a Firefox Student Ambassador(s)?: [% cgi.param('ambassador_hosted') %]
+Main audience of the event are Firefox Student Ambassadors: [% cgi.param('ambassador_audience') %]
 
 Shipping details:
 
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
index f616b6ba2..6e393612c 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
@@ -41,6 +41,8 @@ function validateAndSubmit() {
   if(!isFilledOut('profilepage')) alert_text += "Please enter a Mozilla Reps profile page.\n";
   if(!isFilledOut('eventpage')) alert_text += "Please enter an event page address.\n";
   if(!isFilledOut('cf_due_date')) alert_text += "Please enter an event date.\n";
+  if(!isFilledOut('ambassador_hosted')) alert_text += "Please select whether this event is hosted by ambassadors.\n";
+  if(!isFilledOut('ambassador_audience')) alert_text += "Please select whether this event's main audience is ambassadors.\n";
   if(!isFilledOut('mentoremail')) alert_text += "Please enter a valid [% terms.Bugzilla %] email for mentor.\n";
   if(!isFilledOut('country')) alert_text += "Please enter a valid value for country.\n";
   if(!isFilledOut('budgettotal')) alert_text += "Please enter the total budget for the event.\n";
@@ -135,6 +137,32 @@ function validateAndSubmit() {
 </tr>
 
 <tr class="even">
+  <th class="field_label required">
+    Is this event being hosted by a<br>Firefox Student Ambassador(s)?:
+  </th>
+  <td>
+    <select id="ambassador_hosted" name="ambassador_hosted">
+      <option value="">Select One</option>
+      <option value="Yes">Yes</option>
+      <option value="No">No</option>
+    </select>
+  </td>
+</tr>
+
+<tr class="odd">
+  <th class="field_label required">
+    Is the main audience of this event<br>Firefox Student Ambassadors?:
+  </th>
+  <td>
+    <select id="ambassador_audience" name="ambassador_audience">
+      <option value="">Select One</option>
+      <option value="Yes">Yes</option>
+      <option value="No">No</option>
+    </select>
+  </td>
+</tr>
+
+<tr class="even">
   <th class="field_label required">[% terms.Bugzilla %] Email of Your Mentor:</th>
   <td>
     [% INCLUDE global/userselect.html.tmpl
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
index e618be726..076faef24 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
@@ -43,6 +43,8 @@ function validateAndSubmit() {
   if(!isFilledOut('eventname')) alert_text += "Please enter your event name\n";
   if(!isFilledOut('eventpage')) alert_text += "Please enter the event page.\n";
   if(!isFilledOut('attendance')) alert_text += "Please enter the estimated attendance.\n";
+  if(!isFilledOut('ambassador_hosted')) alert_text += "Please select whether this event is hosted by ambassadors.\n";
+  if(!isFilledOut('ambassador_audience')) alert_text += "Please select whether this event's main audience is ambassadors.\n";
   if(!isFilledOut('shiptofirstname')) alert_text += "Please enter the shipping first name\n";
   if(!isFilledOut('shiptolastname')) alert_text += "Please enter the shipping last name\n";
   if(!isFilledOut('shiptoaddress1')) alert_text += "Please enter the ship to address\n";
@@ -130,7 +132,35 @@ function validateAndSubmit() {
       <option value="501-1000+">501-1000+</option>
     </select>
   </td>
-</tr
+</tr>
+
+<tr class="odd">
+  <td>
+    <strong>Is this event being hosted by a<br>Firefox Student Ambassador(s)?:
+      <span style="color: red;" title="Required">*</span></strong>
+  </td>
+  <td>
+    <select id="ambassador_hosted" name="ambassador_hosted">
+      <option value="">Select One</option>
+      <option value="Yes">Yes</option>
+      <option value="No">No</option>
+    </select>
+  </td>
+</tr>
+
+<tr class="even">
+  <td>
+    <strong>Is the main audience of this event<br>Firefox Student Ambassadors?:
+      <span style="color: red;" title="Required">*</span></strong>
+  </td>
+  <td>
+    <select id="ambassador_audience" name="ambassador_audience">
+      <option value="">Select One</option>
+      <option value="Yes">Yes</option>
+      <option value="No">No</option>
+    </select>
+  </td>
+</tr>
 
 <tr class="odd">
   <td><!--spacer-->&nbsp;</td>