From a2f813d8d4a129455feae4cb9b1fe97c23bac588 Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Mon, 29 Aug 2016 12:26:52 -0400
Subject: Bug 1267347 - Editing the Dev-Events Form to be current

---
 .../create/comment-dev-engagement-event.txt.tmpl   | 10 ++++----
 .../create/create-dev-engagement-event.html.tmpl   | 29 +++++++++++++--------
 extensions/BMO/web/js/dev_engagement.js            | 30 +++++++++++-----------
 3 files changed, 39 insertions(+), 30 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 b4e6514c5..1a4aec7b8 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
@@ -80,12 +80,12 @@ Event Description:
 ::
 
 Relevant Products:
-[% "\n* Firefox OS" IF cgi.param('product_fxos') %]
 [% "\n* Firefox Web Browser" IF cgi.param('product_fx') %]
-[% "\n* Webmaker" IF cgi.param('product_webmaker') %]
-[% "\n* Persona" IF cgi.param('product_persona') %]
-[% "\n* Marketplace" IF cgi.param('product_marketplace') %]
-[% "\n* Thunderbird" IF cgi.param('product_tb') %]
+[% "\n* Encryption" IF cgi.param('product_encryption') %]
+[% "\n* Web Assembly/Platform" IF cgi.param('product_web_asm') %]
+[% "\n* Rust" IF cgi.param('product_rust') %]
+[% "\n* Servo" IF cgi.param('product_servo') %]
+[% "\n* webVR" IF cgi.param('product_webvr') %]
 [% "\n* The Free and Open Web" IF cgi.param('product_fow') %]
 [% "\n* Developer Tools" IF cgi.param('product_devtools') %]
 [% "\n* Other: " _ cgi.param('product_other_text') IF cgi.param('product_other') %]
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 db680abe6..d0d34069b 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
@@ -321,22 +321,30 @@
     <a href="https://www.mozilla.org/en-US/products/" target="_blank">
     mozilla.org/products</a> for more information about Mozilla products.
   </div>
-  <input type="checkbox" name="product_fxos" id="product_fxos">
-  <label for="product_fxos">Firefox OS</label><br>
   <input type="checkbox" name="product_fx" id="product_fx">
   <label for="product_fx">Firefox Web Browser</label><br>
-  <input type="checkbox" name="product_webmaker" id="product_webmaker">
-  <label for="product_webmaker">Webmaker</label><br>
-  <input type="checkbox" name="product_persona" id="product_persona">
-  <label for="product_persona">Persona</label><br>
-  <input type="checkbox" name="product_marketplace" id="product_marketplace">
-  <label for="product_marketplace">Marketplace</label><br>
-  <input type="checkbox" name="product_tb" id="product_tb">
-  <label for="product_tb">Thunderbird</label><br>
+
+  <input type="checkbox" name="product_encryption" id="product_encryption">
+  <label for="product_encryption">Encryption</label><br>
+
+  <input type="checkbox" name="product_web_asm" id="product_web_asm">
+  <label for="product_web_asm">Web Assembly/Platform</label><br>
+
+  <input type="checkbox" name="product_rust" id="product_rust">
+  <label for="product_rust">Rust</label><br>
+
+  <input type="checkbox" name="product_servo" id="product_servo">
+  <label for="product_servo">Servo</label><br>
+
+  <input type="checkbox" name="product_webvr" id="product_webvr">
+  <label for="product_webvr">webVR</label><br>
+
   <input type="checkbox" name="product_fow" id="product_fow">
   <label for="product_fow">The Free and Open Web</label><br>
+
   <input type="checkbox" name="product_devtools" id="product_devtools">
   <label for="product_devtools">Developer Tools</label><br>
+
   <input type="checkbox" name="product_other" id="product_other">
   <label for="product_other">Other:</label>
   <input type="text" name="product_other_text" id="product_other_text"
@@ -455,6 +463,7 @@
   </div>
   <div class="field_desc">
     Include Sponsorship Amounts and quick summary of benefits.
+    Should be edited to List the tiers of sponsorship amount and benefit that we can review.
   </div>
   <textarea name="sponsorship_suggestion" id="sponsorship_suggestion" rows="10" cols="40" class="wide"></textarea>
 </div>
diff --git a/extensions/BMO/web/js/dev_engagement.js b/extensions/BMO/web/js/dev_engagement.js
index ae6551617..f025b4ac7 100644
--- a/extensions/BMO/web/js/dev_engagement.js
+++ b/extensions/BMO/web/js/dev_engagement.js
@@ -111,12 +111,12 @@ var DE = {
     }
 
     var relevant_products = [
-      'product_fxos',
       'product_fx',
-      'product_webmaker',
-      'product_persona',
-      'product_marketplace',
-      'product_tb',
+      'product_encryption',
+      'product_web_asm',
+      'product_rust',
+      'product_servo',
+      'product_webvr',
       'product_fow',
       'product_devtools',
       'product_other',
@@ -189,18 +189,18 @@ var DE = {
     wb += '[requesting:' + request_items.join(',') + '] ';
 
     var product_items = [];
-    if (document.getElementById('product_fxos').checked)
-      product_items.push('firefox-os');
     if (document.getElementById('product_fx').checked)
       product_items.push('firefox-web-browser');
-    if (document.getElementById('product_webmaker').checked)
-      product_items.push('webmaker');
-    if (document.getElementById('product_persona').checked)
-      product_items.push('persona');
-    if (document.getElementById('product_marketplace').checked)
-      product_items.push('marketplace');
-    if (document.getElementById('product_tb').checked)
-      product_items.push('thunderbird');
+    if (document.getElementById('product_encryption').checked)
+      product_items.push('encryption');
+    if (document.getElementById('product_web_asm').checked)
+      product_items.push('web-assembly-or-platform');
+    if (document.getElementById('product_rust').checked)
+      product_items.push('servo');
+    if (document.getElementById('product_servo').checked)
+      product_items.push('rust');
+    if (document.getElementById('product_webvr').checked)
+      product_items.push('webvr');
     if (document.getElementById('product_fow').checked)
       product_items.push('open-web');
     if (document.getElementById('product_devtools').checked)
-- 
cgit v1.2.3-24-g4f1b