Bug 712141 - Changes to BrownBag Request Form

2 files changed, 156 insertions, 64 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
new file mode 100644
index 000000000..d9aa35f17
--- /dev/null
+++ b/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl
@@ -0,0 +1,34 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the BMO Bugzilla Extension.
+  #
+  # The Initial Developer of the Original Code is the Mozilla Foundation
+  # Portions created by the Initial Developers are Copyright (C) 2011 the
+  # Initial Developer. All Rights Reserved.
+  #
+  # Contributor(s):
+  #   David Lawrence <dkl@mozilla.com>
+  #%]
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
+Topic: [% cgi.param('topic') %]
+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 %]
+Description: 
+[% cgi.param('description') %]
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 33ed80c1a..243a58945 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
@@ -23,8 +23,8 @@
 
 [% PROCESS global/header.html.tmpl
    title = "Mozilla Corporation Brownbag Requests"
-   style_urls = [ 'skins/standard/attachment.css', 'skins/custom/calendar.css' ]
    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' ]
    yui = [ 'autocomplete', 'calendar' ]
 %]
@@ -46,71 +46,58 @@ person who submitted the request and any persons designated in the CC line.</p>
 
 <script type="text/javascript">
 function trySubmit() {
-  var out = 'Topic: the_topic\r\nPresenter: the_presenter\r\nDate: the_date\r\nTime: the_time\r\nAudience: the_audience\r\nAir Mozilla: air_mozilla\r\nDial-in: dial_in\r\nArchive: to_archive\r\nMember of IT to help with A/V: it_help\r\nDescription: the_description';
-
   var topic = document.getElementById('topic').value;
-  var presenter = document.getElementById('presenter').value;
   var date = document.getElementById('date').value;
-  var time = document.getElementById('time_hour').value + ':' + document.getElementById('time_minute').value + document.getElementById('ampm').value;
-  var shortdesc = 'Brownbag Request - ' + topic + ' (' + date + ' ' + time + ')';
-  var airmozilla = document.getElementById('airmozilla').checked? 'yes' : 'no';
-  var dialin = document.getElementById('dialin').checked? 'yes' : 'no';
-  var archive = document.getElementById('archive').checked? 'yes' : 'no';
-  var ithelp = document.getElementById('ithelp').checked? 'yes' : 'no';
-  
-  out = out.replace( /the_topic/, topic );
-  out = out.replace( /the_presenter/, presenter );
-  out = out.replace( /the_date/, date);
-  out = out.replace( /the_time/, time);
-  out = out.replace( /the_audience/, document.getElementById('audience').value );
-  out = out.replace( /air_mozilla/, airmozilla);
-  out = out.replace( /dial_in/, dialin);
-  out = out.replace( /the_description/, document.getElementById('description').value );
-  out = out.replace( /to_archive/, archive);
-  out = out.replace( /it_help/, ithelp);
-  
-  document.getElementById('comment').value = out;
+  var time = document.getElementById('time_hour').value + ':' + 
+             document.getElementById('time_minute').value + 
+             document.getElementById('ampm').value + " " +
+             document.getElementById('time_zone').value;
+  var location = document.getElementById('location').value;
+  var shortdesc = 'Event - (' + date + ' ' + time + ') - ' + location + ' - ' + topic;
   document.getElementById('short_desc').value = shortdesc;
-  
   return true;
 }
-
 </script>
 
-<form method="post" action="post_bug.cgi" id="brownbagRequestForm" enctype="multipart/form-data"
-      onSubmit="return trySubmit();">
-
-        <input type="hidden" name="product" value="mozilla.org">
-        <input type="hidden" name="component" value="Server Operations: Desktop Issues">
-        <input type="hidden" name="rep_platform" value="All">
-        <input type="hidden" name="op_sys" value="Other">
-        <input type="hidden" name="priority" value="--">
-        <input type="hidden" name="version" value="other">
-        <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-        <input type="hidden" name="comment" id="comment" value="">
-        <input type="hidden" name="short_desc" id="short_desc" value="">
-        <input type="hidden" name="groups" value="mozilla-corporation-confidential">
-        <input type="hidden" name="token" value="[% token FILTER html %]">
+<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">
+  <input type="hidden" name="product" value="Air Mozilla">
+  <input type="hidden" name="component" value="Events">
+  <input type="hidden" name="rep_platform" value="All">
+  <input type="hidden" name="op_sys" value="Other">
+  <input type="hidden" name="priority" value="--">
+  <input type="hidden" name="version" value="other">
+  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
+  <input type="hidden" name="comment" id="comment" value="">
+  <input type="hidden" name="short_desc" id="short_desc" value="">
+  <input type="hidden" name="groups" value="mozilla-corporation-confidential">
+  <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <table>
 
 <tr>
-  <td align="right"><strong>Presenter:</strong></td>
+  <th class="field_label">
+    <label for="presenter">Presenter:</label>
+  </th>
   <td>
     <input type="text" name="presenter" id="presenter" value="" size="60" />
   </td>
-
 </tr>
 
 <tr>
-  <td align="right"><strong>Topic:</strong></td>
+  <th class="field_label">
+    <label for="topic">Topic:</label>
+  </th>
   <td>
     <input type="text" name="topic" id="topic" value="" size="60" />
   </td>
 </tr>
 
 <tr>
-  <td align="right"><strong>Date:</strong></td>
+  <th class="field_label">
+    <label for="date">Date:</label>
+  </th>
   <td>
     <input type="text" name="date" size="10" id="date"
            align="right" value="" maxlength="10"
@@ -123,7 +110,9 @@ function trySubmit() {
 </tr>
 
 <tr>
-  <td align="right"><strong>Start Time:</strong></td>
+  <th class="field_label">
+    <label for="time_hour">Start Time:</label>
+  </th>
   <td>
     <select name="time_hour" id="time_hour">
       <option value="12" selected>12</option>
@@ -138,21 +127,76 @@ function trySubmit() {
       <option value="9">9</option>
       <option value="10">10</option>
       <option value="11">11</option>
-    </select>:<select name="time_minute" id="time_minute">
+    </select>:
+    <select name="time_minute" id="time_minute">
       <option value="00" selected>00</option>
       <option value="15">15</option>
       <option value="30">30</option>
       <option value="45">45</option>
     </select>
     <select name="ampm" id="ampm">
-      <option value="AM" selected>AM</option>
-      <option value="PM">PM</option>
+      <option value="AM">AM</option>
+      <option value="PM" selected>PM</option>
     </select>
+    <select name="time_zone" id="time_zone">
+      <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-7">UTC-7</option>
+      <option value="UTC-6">UTC-6</option>
+      <option value="UTC-5">UTC-5</option>
+      <option value="UTC-4">UTC-4</option>
+      <option value="UTC-3">UTC-3</option>
+      <option value="UTC-2">UTC-2</option>
+      <option value="UTC-1">UTC-1</option>
+      <option value="UTC+0">UTC+0</option>
+      <option value="UTC+1">UTC+1</option>
+      <option value="UTC+2">UTC+2</option>
+      <option value="UTC+3">UTC+3</option>
+      <option value="UTC+4">UTC+4</option>
+      <option value="UTC+5">UTC+5</option>
+      <option value="UTC+6">UTC+6</option>
+      <option value="UTC+7">UTC+7</option>
+      <option value="UTC+8">UTC+8</option>
+      <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>
+    </select>
+  </td>					  
+</tr>
+
+<tr>
+  <th class="field_label">
+    <label for="duration_one_hour_radio">Duration:</label>
+  </th>
+  <td>
+    <input type="radio" name="duration" id="duration_one_hour_radio" value="1 Hour" checked="checked">
+    <label for="duration_one_hour_radio">1 Hour</label><br>
+    <input type="radio" name="duration" id="duration_one_day_radio" value="1 Day">
+    <label for="duration_one_day_radio">1 Day</label><br>
+    <input type="radio" name="duration" id="duration_other_radio" value="Other"
+           onclick="YAHOO.util.Dom.get('duration_other').focus();">
+    <label for="duration_other_radio">Other</label>
+    <input type="text" name="duration_other" id="duration_other" value="">
+  </td>
+</tr>  
+
+<tr>
+  <th class="field_label">
+    <label for="location">Location:</label>
+  </th>
+  <td>
+    <input type="text" name="location" id="location" 
+           value="[% default.location || 'Ten Forward' %]" size="60" />
   </td>
 </tr>
 
 <tr>
-  <td align="right"><strong>Intended Audience:</strong></td>
+  <th class="field_label">
+    <label for="audience">Intended Audience:</label>
+  </th>
   <td>
     <select name="audience" id="audience">
       <option value="Public" selected>Open to Public</option>
@@ -163,28 +207,37 @@ function trySubmit() {
 </tr>
 
 <tr>
-  <td align="right"><strong>Air Mozilla Broadcasting?</strong></td>
+  <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>
-  <td align="right"><strong>Dial In?</strong></td>
+  <th class="field_label">
+    <label for="dialin">Dial In?</label>
+  </th>
   <td align="left"><input type="checkbox" name="dialin" id="dialin"></td>
 </tr>
 
 <tr>
-<td align="right"><strong>Archive this?</strong></td>
-<td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td>
+  <th class="field_label">
+    <label for="archive">Archive this?</label>
+  </th>
+  <td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td>
 </tr>
 
-
 <tr>
-<td align="right"><strong>Need IT to help run A/V?</strong></td>
-<td align="left"><input type="checkbox" name="ithelp" id="ithelp" value="yes" checked></td>
+  <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>
-  <td align="right"><strong>CC&nbsp;(optional):</strong></td>
+  <th class="field_label">
+    <label for="cc">CC&nbsp;(optional):</label>
+  </th>
   <td colspan="3">
     [% INCLUDE global/userselect.html.tmpl
        id => "cc"
@@ -197,23 +250,28 @@ function trySubmit() {
 </tr>
 
 <tr>
-  <th><label for="description">Description</label>:</th>
+  <th class="field_label">
+    <label for="description">Description</label>:
+  </th>
   <td>
     <em>Please briefly describe the brownbag and any specific needs you might have.</em><br>
-
     <textarea id="description" name="description" rows="10" cols="80"></textarea>
   </td>
 </tr>
 
-  </table>
+<tr>
+  <td></td>
+  <td>
+    <input type="submit" id="commit" value="Submit Request">
+  </td>
+</tr>
+</table>
 
-  <br>
-  <input type="submit" id="commit" value="Submit Request">
 </form>
 
-<p>Thanks for contacting us.
-   You will be notified by email of any progress made in resolving your request.
-
+<p>
+  Thanks for contacting us.
+  You will be notified by email of any progress made in resolving your request.
 </p>
 
 <script type="text/javascript">