Bug 773764 - Changes to Air Mozilla Event (Brownbag) Request Form

1 files changed, 89 insertions, 50 deletions

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 e1886190c..a73ae73cb 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
@@ -22,7 +22,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
-   title = "Mozilla Corporation Brownbag Requests"
+   title = "Event Request"
    style = ".yui-skin-sam .yui-calcontainer { z-index: 1; }"
    style_urls = [ 'skins/standard/enter_bug.css' ]
    javascript_urls = [ 'js/attachment.js', 'js/field.js', 'js/util.js' ]
@@ -31,34 +31,28 @@
 
 [% USE Bugzilla %]
 
-<div style='text-align: center; width: 98%; font-size: 2em; font-weight: bold; margin: 10px;'>Brownbag Request</div>
-
-<p><strong>Brownbag Request:</strong>  Please use this form if you plan on hosting a brownbag so that IT will be able to properly provide support. </p>
-
-<p>Process:</p>
-
-<ol><li>Complete and submit request below.</li>
-    <li>Your request will be reviewed and assigned to the appropriate person in IT.</li>
-</ol>
- 
-<p>These requests will only be visible internally in all cases and only to the
-person who submitted the request and any persons designated in the CC line.</p>
-
 <script type="text/javascript">
 function trySubmit() {
+  var timeZone = document.getElementById('time_zone').value;
+  if (!timeZone) {
+    alert('You must select an appropriate time zone');
+    return false;    
+  }
   var topic = document.getElementById('topic').value;
   var date = document.getElementById('date').value;
   var time = document.getElementById('time_hour').value + ':' + 
-             document.getElementById('time_minute').value + 
-             document.getElementById('ampm').value + " " +
-             document.getElementById('time_zone').value;
+             document.getElementById('time_minute').value + ' ' + timeZone;  
   var location = document.getElementById('location').value;
   var shortdesc = 'Event - (' + date + ' ' + time + ') - ' + location + ' - ' + topic;
   document.getElementById('short_desc').value = shortdesc;
 
-  // If intended audience is employees only, add mozilla-corporation-confidential group
-  var audience = document.getElementById('audience').value;
-  if (audience == 'Employees Only') {
+  var public_yes = document.getElementById('public_yes').checked;
+  var public_no = document.getElementById('public_no').checked;
+  if (!public_yes && !public_no) {
+    alert('You must select whether the event is public or not');
+    return false;   
+  }
+  if (public_no) {
     var brownbagRequestForm = document.getElementById('brownbagRequestForm');
     var groups = document.createElement('input');
     groups.type = 'hidden';
@@ -71,6 +65,18 @@ function trySubmit() {
 }
 </script>
 
+<p>
+  <strong>Event Request:</strong> Please use this form to schedule an event 
+  in any of the Mozilla Common Spaces.</b>
+</p>
+
+<p>Process:</p>
+
+<ol>
+  <li>Complete and submit request below.</li>
+  <li>Your request will be reviewed and assigned to the appropriate person in IT.</li>
+</ol>
+ 
 <form method="post" action="post_bug.cgi" id="brownbagRequestForm" class="enter_bug_form"
       enctype="multipart/form-data" onSubmit="return trySubmit();">
   <input type="hidden" name="format" value="brownbag">
@@ -85,6 +91,15 @@ 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>
@@ -122,11 +137,11 @@ function trySubmit() {
 
 <tr>
   <th class="field_label">
-    <label for="time_hour">Start Time:</label>
+    <label for="time_hour">Start Time (24 hr clock):</label>
   </th>
   <td>
     <select name="time_hour" id="time_hour">
-      <option value="12" selected>12</option>
+      <option value="0">0</option>
       <option value="1">1</option>
       <option value="2">2</option>
       <option value="3">3</option>
@@ -138,6 +153,18 @@ function trySubmit() {
       <option value="9">9</option>
       <option value="10">10</option>
       <option value="11">11</option>
+      <option value="12" selected>12</option>
+      <option value="13">13</option>
+      <option value="14">14</option>
+      <option value="15">15</option>
+      <option value="16">16</option>
+      <option value="17">17</option>
+      <option value="18">18</option>
+      <option value="19">19</option>
+      <option value="20">20</option>
+      <option value="21">21</option>
+      <option value="22">22</option>
+      <option value="23">23</option>
     </select>:
     <select name="time_minute" id="time_minute">
       <option value="00" selected>00</option>
@@ -145,15 +172,15 @@ function trySubmit() {
       <option value="30">30</option>
       <option value="45">45</option>
     </select>
-    <select name="ampm" id="ampm">
-      <option value="AM">AM</option>
-      <option value="PM" selected>PM</option>
-    </select>
     <select name="time_zone" id="time_zone">
+      <option value="" selected>Select Time Zone</option>
+      <option value="UTC-14">UTC-14</option>
+      <option value="UTC-13">UTC-13</option>
+      <option value="UTC-12">UTC-12</option>
       <option value="UTC-11">UTC-11</option>
       <option value="UTC-10">UTC-10</option>
       <option value="UTC-9">UTC-9</option>
-      <option value="UTC-8" selected>UTC-8</option>
+      <option value="UTC-8">UTC-8</option>
       <option value="UTC-7">UTC-7</option>
       <option value="UTC-6">UTC-6</option>
       <option value="UTC-5">UTC-5</option>
@@ -173,7 +200,9 @@ function trySubmit() {
       <option value="UTC+9">UTC+9</option>
       <option value="UTC+10">UTC+10</option>
       <option value="UTC+11">UTC+11</option>
-      <option value="UTC+12">UTC+11</option>
+      <option value="UTC+12">UTC+12</option>
+      <option value="UTC+13">UTC+13</option>
+      <option value="UTC+14">UTC+14</option>
     </select>
   </td>
 </tr>
@@ -196,7 +225,7 @@ function trySubmit() {
 
 <tr>
   <th class="field_label">
-    <label for="location">Location:</label>
+    <label for="location">Originating Location:</label>
   </th>
   <td>
     <input type="text" name="location" id="location" 
@@ -206,36 +235,37 @@ function trySubmit() {
 
 <tr>
   <th class="field_label">
-    <label for="audience">Intended Audience:</label>
+    <label for="large_screen_loc_mtv_radio">Show on large screens in<br>these Mozilla Spaces Commons:</label>
   </th>
   <td>
-    <select name="audience" id="audience">
-      <option value="Public" selected>Open to Public</option>
-      <option value="Employees Only">Employees Only</option>
-      <option value="Interns">Interns</option>
-    </select>
+    <input type="checkbox" name="large_screen_loc" id="large_screen_loc_mtv_checkbox" value="MTV" checked="checked">
+    <label for="large_screen_loc_mtv_checkbox">MTV</label><br>
+    <input type="checkbox" name="large_screen_loc" id="large_screen_loc_sfo_checkbox" value="SFO">
+    <label for="large_screen_loc_sfo_checkbox">SFO</label><br>
+    <input type="checkbox" name="large_screen_loc" id="large_screen_loc_tor_checkbox" value="TOR">
+    <label for="large_screen_loc_tor_checkbox">TOR</label><br>
+    <input type="checkbox" name="large_screen_loc" id="large_screen_loc_lon_checkbox" value="LON">
+    <label for="large_screen_loc_lon_checkbox">LON</label><br>
   </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>  
 
 <tr>
-  <th class="field_label">
-    <label for="dialin">Dial In?</label>
-  </th>
-  <td align="left"><input type="checkbox" name="dialin" id="dialin"></td>
+  <th class="field_label">This event may be<br>viewed by the public:</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>
+  </td>
 </tr>
 
 <tr>
   <th class="field_label">
-    <label for="archive">Archive this?</label>
+    <label for="airmozilla">Air Mozilla Broadcasting?</label>
   </th>
-  <td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td>
+  <td align="left"><input type="checkbox" name="airmozilla" id="airmozilla"></td>
 </tr>
 
 <tr>
@@ -265,12 +295,21 @@ function trySubmit() {
     <label for="description">Description</label>:
   </th>
   <td>
-    <em>Please briefly describe the brownbag and any specific needs you might have.</em><br>
+    Please describe the event the way you would in a program guide listing<br>
     <textarea id="description" name="description" rows="10" cols="80"></textarea>
   </td>
 </tr>
 
 <tr>
+  <th class="field_label">
+    <label for="special_requirements">Special Requirements:</label>
+  </th>
+  <td>
+    <textarea id="special_requirements" name="special_requirements" rows="10" cols="80"></textarea>
+  </td>
+</tr>
+
+<tr>
   <td></td>
   <td>
     <input type="submit" id="commit" value="Submit Request">