Bug 1125320: form.dev-engagement-event: Two new questions

3 files changed, 43 insertions, 24 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/comment-dev-engagement-event.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-dev-engagement-event.txt.tmpl
index 0cfcf7887..b4e6514c5 100644
--- a/extensions/BMO/template/en/default/bug/create/comment-dev-engagement-event.txt.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/comment-dev-engagement-event.txt.tmpl
@@ -71,6 +71,9 @@ Weblink:
 Expected Attendees:
 [%+ cgi.param('attendees') || "-" %]
 
+Primary Audience:
+[%+ cgi.param('audience') %]
+
 Event Description:
 [%+ cgi.param('desc') || "-" %]
 
@@ -98,9 +101,6 @@ Speaker Needed Topic:
 [%+ cgi.param('speaker_needed_topic') %]
 [% END %]
 
-Development Session?:
-[%+ cgi.param('development_session') %]
-
 ::
 
 Requests:
@@ -124,5 +124,11 @@ Previous Event Name:
 Suggested sponsorship amount/level:
 [%+ cgi.param('sponsorship_suggestion') || "-" %]
 
+How would the conference/event support Mozilla's mission and goals?:
+[%+ cgi.param('support_mission') || "-" %]
+
+How would we receive feedback to evaluate the success of the conference/event?:
+[%+ cgi.param('feedback_method') || "-" %]
+
 Anything Else:
 [%+ cgi.param('else') || "-" %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl
index 5d1771013..c2f609727 100644
--- a/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl
@@ -288,6 +288,17 @@
 
 <div class="form_section">
   <div class="field_label required">
+    Who is the primary audience for this event? [% mandatory FILTER none %]
+  </div>
+  <div class="field_desc">
+    Developers (specify coding language and platform), business development,
+    marketing associates, corporate executives, etc.
+  </div>
+  <input type="text" name="audience" id="audience" size="40" class="wide">
+</div>
+
+<div class="form_section">
+  <div class="field_label required">
     Please give a [short] description of the event.
   </div>
   <div class="field_desc">
@@ -353,6 +364,28 @@
   </select>
 </div>
 
+<div class="form_section">
+  <div class="field_label">
+    How would the conference/event support <a href="https://www.mozilla.org/mission/">
+    Mozilla's mission and goals</a>?
+  </div>
+  <div class="field_desc">
+    Are there specific portions of the conference/event that can be described to be
+    specifically beneficial to our mission?
+  </div>
+  <textarea name="support_mission" id="support_mission" rows="10" cols="40" class="wide"></textarea>
+</div>
+
+<div class="form_section">
+  <div class="field_label">
+    How would we receive feedback to evaluate the success of the conference/event?
+  </div>
+  <div class="field_desc">
+    Please be specific in measurements or feedback process.
+  </div>
+  <textarea name="feedback_method" id="feedback_method" rows="10" cols="40" class="wide"></textarea>
+</div>
+
 <div id="speaker_needed_detail_section" class="form_section bz_default_hidden">
   <div class="field_label required">
     What topic do you want someone to speak about?
@@ -365,19 +398,6 @@
          id="speaker_needed_topic" size="40" class="wide">
 </div>
 
-<div class="form_section">
-  <div class="field_label required">
-    Will this event include a session about developing with HTML, CSS, or
-    JavaScript?
-  </div>
-  <select id="development_session" name="development_session">
-    <option value="">Select</option>
-    <option value="Yes">Yes</option>
-    <option value="No">No</option>
-    <option value="To be determined">To be determined</option>
-  </select>
-</div>
-
 <div class="head_desc">
   Tell us more about what you're looking for!
 </div>
diff --git a/extensions/BMO/web/js/dev_engagement.js b/extensions/BMO/web/js/dev_engagement.js
index 0bb7313b1..ae6551617 100644
--- a/extensions/BMO/web/js/dev_engagement.js
+++ b/extensions/BMO/web/js/dev_engagement.js
@@ -81,6 +81,7 @@ var DE = {
       'end_date' : 'Please enter the event end date.',
       'location' : 'Please enter a location description for the event.',
       'attendees' : 'Please enter number of expected attendees.',
+      'audience' : 'Please enter the intended audience for the event.',
       'desc' : 'Please enter a description of the event.',
     };
 
@@ -91,7 +92,6 @@ var DE = {
       'code_of_conduct' : 'Please select if the event has a code of conduct.',
       'event_location' : 'Please a location for the event.',
       'previous_event' : 'Please select if Mozilla has sponsored this event before.',
-      'development_session' : 'Please select if this event includes a development session.',
     };
 
     if (fieldValue('vouched_mozillian') == 'Yes')
@@ -223,13 +223,6 @@ var DE = {
     wb += '[needs-speaker:' + needs_speaker + '] ';
     var sponsor_booth = fieldValue('sponsor_booth') == 'Yes' ? 'true' : 'false';
     wb += '[option-to-sponsor-booth:' + sponsor_booth + '] ';
-    var dev_session_map = {
-     'Yes' : 'true',
-     'No' : 'false',
-     'To be determined' : 'tbd',
-    };
-    wb += '[open-web-session-at-event:' +
-           dev_session_map[fieldValue('development_session')] + '] ';
     wb += '[expected-attendees:' + fieldValue('attendees') + '] ';
     var prospectus = fieldValue('data') ? 'true' : 'false';
     wb += '[prospectus:' + prospectus + '] ';