Bug 826296 - Changes to Air Mozilla Event Request Form

2 files changed, 35 insertions, 41 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl
index d9aa35f17..158c08f19 100644
--- a/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl
@@ -25,10 +25,9 @@ Presenter: [% cgi.param('presenter') %]
 Date: [% cgi.param('date') %]
 Time: [% cgi.param('time_hour') %]:[% cgi.param('time_minute') %][% cgi.param('ampm') +%] [%+ cgi.param('time_zone') %]
 Duration: [% IF cgi.param('duration') == 'Other' %][% cgi.param('duration_other') %][% ELSE %][% cgi.param('duration') %][% END %]
-Audience: [% cgi.param('audience') %]
-Air Mozilla: [% IF cgi.param('airmozilla') %]Yes[% ELSE %]No[% END %]
-Dial-in: [% IF cgi.param('dialin') %]Yes[% ELSE %]No[% END %]
-Archive: [% IF cgi.param('archive') %]Yes[% ELSE %]No[% END %]
-Member of IT to help with A/V: [% IF cgi.param('ithelp') %]Yes[% ELSE %]No[% END %]
+Privacy: [% cgi.param('public') %]
+Large Screen Location: [% FOREACH location = cgi.param('large_screen_loc') %][% location FILTER html %], [% END %]
 Description: 
-[% cgi.param('description') %]
+[%+ cgi.param('description') %]
+Special Requirements:
+[%+ cgi.param('special_requirements') %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
index a73ae73cb..07c749f02 100644
--- a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
@@ -46,13 +46,12 @@ function trySubmit() {
   var shortdesc = 'Event - (' + date + ' ' + time + ') - ' + location + ' - ' + topic;
   document.getElementById('short_desc').value = shortdesc;
 
-  var public_yes = document.getElementById('public_yes').checked;
-  var public_no = document.getElementById('public_no').checked;
-  if (!public_yes && !public_no) {
+  var public = document.getElementById('public');
+  if (!public.value) {
     alert('You must select whether the event is public or not');
     return false;   
   }
-  if (public_no) {
+  if (public.value != 'The Public') {
     var brownbagRequestForm = document.getElementById('brownbagRequestForm');
     var groups = document.createElement('input');
     groups.type = 'hidden';
@@ -91,17 +90,7 @@ function trySubmit() {
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 
-[% FOREACH type = product.flag_types.bug %]
-  [% NEXT IF type.name != 'pr-review' %]
-  <input type="hidden" id="flag_type-[% type.id FILTER html %]" 
-         name="flag_type-[% type.id FILTER html %]" value="?">
-  <input type="hidden" id="flag_type-[% type.id FILTER html %]" 
-         name="requestee_type-[% type.id FILTER html %]"
-         value="PRreview@mozilla.com">
-[% END %]
-
 <table>
-
 <tr>
   <th class="field_label">
     <label for="presenter">Presenter:</label>
@@ -204,6 +193,24 @@ function trySubmit() {
       <option value="UTC+13">UTC+13</option>
       <option value="UTC+14">UTC+14</option>
     </select>
+    <br>
+    <table>
+    <tr>
+      <th>Summer:</th>
+      <td>MTV/SFO/PDX/YVR UTC-7</td>
+      <td>TOR/BOS UTC-4</td>
+      <td>LON UTC+1</td>
+      <td>PAR/BER UTC+2</td>
+    </tr>
+    <tr>
+      <th>Winter:</th>
+      <td>MTV/SFO/PDX/YVR UTC-8</td>
+      <td>TOR/BOS UTC-3</td>
+      <td>LON UTC</td>
+      <td>PAR/BER UTC+1</td>
+    </tr>
+    </table>
+    </div>
   </td>
 </tr>
 
@@ -250,33 +257,21 @@ function trySubmit() {
 </tr>  
 
 <tr>
-  <th class="field_label">This event may be<br>viewed by the public:</th>
+  <th class="field_label">This event may be seen by:</th>
   <td>
-    If <strong>No</strong> is chosen, this request will only be visible internally as well
-    as the reporter and anyone designated in the CC field.<br>
-    <input type="radio" name="public" id="public_yes" value="Yes">
-    <label for="public_yes">Yes</label><br>
-    <input type="radio" name="public" id="public_no" value="No">
-    <label for="public_no">No</label>
+    If anything other than <strong>The Public</strong> is chosen, this request will only be 
+    visible internally as well as the reporter and anyone designated in the CC field.<br>
+    <select name="public" id="public">
+      <option value="">Select One</option>
+      <option value="The Public">The Public</option>
+      <option value="Vouched Mozillians and MoCo/MoFo Staff">Vouched Mozillians and MoCo/MoFo Staff</option>
+      <option value="MoCo/MoFo Staff Only">MoCo/MoFo Staff Only</option>
+    </select>
   </td>
 </tr>
 
 <tr>
   <th class="field_label">
-    <label for="airmozilla">Air Mozilla Broadcasting?</label>
-  </th>
-  <td align="left"><input type="checkbox" name="airmozilla" id="airmozilla"></td>
-</tr>
-
-<tr>
-  <th class="field_label">
-    <label for="ithelp">Need IT to help run A/V?</label>
-  </th>
-  <td align="left"><input type="checkbox" name="ithelp" id="ithelp" value="yes" checked></td>
-</tr>
-
-<tr>
-  <th class="field_label">
     <label for="cc">CC&nbsp;(optional):</label>
   </th>
   <td colspan="3">