Bug 1134392: Need edits to Recruiting Component

3 files changed, 62 insertions, 21 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/comment-recruiting.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-recruiting.txt.tmpl
index 86b93693c..579d385f9 100644
--- a/extensions/BMO/template/en/default/bug/create/comment-recruiting.txt.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/comment-recruiting.txt.tmpl
@@ -32,8 +32,8 @@ VP Authority:
 HRBP:
 [%+ cgi.param('hrbp_name') %]
 
-Full Time or Seasonal?
-[%+ cgi.param('ft_or_seasonal') %]
+Regular or Seasonal?
+[%+ cgi.param('reg_or_seasonal') %]
 
 Desired Location:
 [%+ cgi.param("desired_location") %]
@@ -44,6 +44,12 @@ Comp Grade:
 Is this new headcount or backfill?
 [%+ cgi.param("new_or_backfill") %]
 
+Are you hiring multiple of this position this year?
+[%+ cgi.param("multiple") %]
+
+Please include Job Family:
+[%+ cgi.param("job_family") %]
+
 What part of your strategic plan does this role impact?
 [%+ cgi.param("plan_impact") %]
 
diff --git a/extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl b/extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl
index 8e56a20ed..68682faf4 100644
--- a/extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl
@@ -1,4 +1,13 @@
-<option value="1000 - Office of CEO">1000 - Office of CEO</option>
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+<option value="900 - Mozilla Foundation">900 - Mozilla Foundation</option>
+<option value="1000 - Support Services">1000 - Support Services</option>
 <option value="1001 - Office of Chair">1001 - Office of Chair</option>
 <option value="1002 - Participation">1002 - Participation</option>
 <option value="1010 - Office of CTO">1010 - Office of CTO</option>
@@ -10,7 +19,7 @@
 <option value="1100 - Policy">1100 - Policy</option>
 <option value="1120 - Legal">1120 - Legal</option>
 <option value="1150 - Business Development">1150 - Business Development</option>
-<option value="1210 - Finance & Accounting">1210 - Finance & Accounting</option>
+<option value="1210 - Finance and Accounting">1210 - Finance and Accounting</option>
 <option value="1211 - Accounting">1211 - Accounting</option>
 <option value="1212 - Finance">1212 - Finance</option>
 <option value="1213 - Payroll">1213 - Payroll</option>
@@ -19,33 +28,34 @@
 <option value="1340 - People">1340 - People</option>
 <option value="1350 - Recruiting">1350 - Recruiting</option>
 <option value="1360 - Metrics">1360 - Metrics</option>
-<option value="1400 - IT & Network">1400 - IT & Network</option>
-<option value="1500 - Content Services">1500 - Content Services</option>
+<option value="1400 - IT and Network">1400 - IT and Network</option>
+<option value="1500 - General Content Services">1500 - General Content Services</option>
+<option value="1501 - Engineering">1501 - Engineering</option>
+<option value="1502 - Sales">1502 - Sales</option>
+<option value="1503 - Product">1503 - Product</option>
 <option value="1700 - Strategic Initiative">1700 - Strategic Initiative</option>
 <option value="2000 - Engagement">2000 - Engagement</option>
 <option value="2200 - PR">2200 - PR</option>
 <option value="2300 - Community Engagement">2300 - Community Engagement</option>
 <option value="2320 - MDN">2320 - MDN</option>
 <option value="2400 - Brand Engagement">2400 - Brand Engagement</option>
-<option value="2500 - Websites">2500 - Websites</option>
+<option value="2500 - Engagement Websites">2500 - Engagement Websites</option>
 <option value="2600 - SUMO">2600 - SUMO</option>
-<option value="3000 - Cloud Services">3000 - Cloud Services</option>
+<option value="3000 - Cloud and Services">3000 - Cloud and Services</option>
 <option value="3100 - Infrastructure (servers)">3100 - Infrastructure (servers)</option>
 <option value="3110 - Production Cloud Infra">3110 - Production Cloud Infra</option>
 <option value="3120 - Development Cloud Infra">3120 - Development Cloud Infra</option>
 <option value="3130 - Production DC Infra">3130 - Production DC Infra</option>
-<option value="3210 - FxA Engineering">3210 - FxA Engineering</option>
+<option value="3210 - Services Engineering">3210 - Services Engineering</option>
 <option value="3220 - Cloud Services Operation">3220 - Cloud Services Operation</option>
 <option value="3230 - Cloud Services UX">3230 - Cloud Services UX</option>
-<option value="3240 - Cloud Services Product & Project Management">3240 - Cloud Services Product & Project Management</option>
-<option value="4000 - Insights and Strategy">4000 - Insights and Strategy</option>
+<option value="3240 - Cloud Services Product and Project Management">3240 - Cloud Services Product and Project Management</option>
 <option value="5000 - Firefox">5000 - Firefox</option>
 <option value="5100 - Firefox Product Marketing">5100 - Firefox Product Marketing</option>
 <option value="5200 - Firefox Desktop">5200 - Firefox Desktop</option>
 <option value="5210 - Firefox Desktop Engineering">5210 - Firefox Desktop Engineering</option>
 <option value="5220 - Firefox Desktop UX">5220 - Firefox Desktop UX</option>
 <option value="5230 - Firefox Desktop Product Management">5230 - Firefox Desktop Product Management</option>
-<option value="5240 - Firefox Desktop Platform Integration">5240 - Firefox Desktop Platform Integration</option>
 <option value="5250 - Firefox Hello">5250 - Firefox Hello</option>
 <option value="5300 - Firefox Mobile">5300 - Firefox Mobile</option>
 <option value="5310 - Firefox Android Engineering">5310 - Firefox Android Engineering</option>
@@ -54,7 +64,7 @@
 <option value="5400 - Firefox Dev Tools">5400 - Firefox Dev Tools</option>
 <option value="5500 - Firefox iOS">5500 - Firefox iOS</option>
 <option value="6000 - Mobile">6000 - Mobile</option>
-<option value="6110 - Firefox OS Engineering">6110 - Firefox OS Engineering</option>
+<option value="6110 - Firefox OS Engineering I">6110 - Firefox OS Engineering I</option>
 <option value="6140 - Firefox OS Automation">6140 - Firefox OS Automation</option>
 <option value="6150 - Firefox OS Engineering Program Management">6150 - Firefox OS Engineering Program Management</option>
 <option value="6160 - Firefox OS QA">6160 - Firefox OS QA</option>
@@ -62,7 +72,7 @@
 <option value="6220 - Firefox OS Product Marketing">6220 - Firefox OS Product Marketing</option>
 <option value="6300 - Firefox OS UX">6300 - Firefox OS UX</option>
 <option value="6500 - Mobile Business Development">6500 - Mobile Business Development</option>
-<option value="7000 - Mobile Planning & Ecosystem">7000 - Mobile Planning & Ecosystem</option>
+<option value="7000 - Mobile Planning and Ecosystem">7000 - Mobile Planning and Ecosystem</option>
 <option value="7110 - Mobile Partner Engineering">7110 - Mobile Partner Engineering</option>
 <option value="7120 - Mobile Planning">7120 - Mobile Planning</option>
 <option value="7130 - Mobile Apps Engineering">7130 - Mobile Apps Engineering</option>
@@ -79,16 +89,15 @@
 <option value="8420 - Platform Security">8420 - Platform Security</option>
 <option value="8430 - Platform Fuzzing">8430 - Platform Fuzzing</option>
 <option value="8440 - Platform DOM">8440 - Platform DOM</option>
-<option value="8450 - Platform Rendering, Media & Graphics">8450 - Platform Rendering, Media & Graphics</option>
+<option value="8450 - Platform Rendering, Media and Graphics">8450 - Platform Rendering, Media and Graphics</option>
 <option value="8460 - Platform Android">8460 - Platform Android</option>
 <option value="8470 - Platform WebRTC">8470 - Platform WebRTC</option>
-<option value="8480 - Platform Integration">8480 - Platform Integration</option>
 <option value="8490 - Platform Accessibility">8490 - Platform Accessibility</option>
 <option value="8500 - QA">8500 - QA</option>
 <option value="8510 - Platform QE">8510 - Platform QE</option>
 <option value="8520 - QA Automation">8520 - QA Automation</option>
 <option value="8530 - QA Web">8530 - QA Web</option>
 <option value="8550 - QA Android">8550 - QA Android</option>
-<option value="8600 - Development Tools & Automation">8600 - Development Tools & Automation</option>
+<option value="8600 - Development Tools and Automation">8600 - Development Tools and Automation</option>
 <option value="8700 - JavaScript">8700 - JavaScript</option>
 <option value="8750 - Localization (l10n)">8750 - Localization (l10n)</option>
diff --git a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
index 9f54953ce..62ca60e61 100644
--- a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
@@ -165,19 +165,19 @@ function jobDescToggle(what) {
             <option value="">Select...</option>
             <option value="Joanne Nguyen">Joanne Nguyen</option>
             <option value="Jess Amann">Jess Amann</option>
-            <option value="Michael Auckland">Michael Auckland</option>
+            <option value="Michael Aukland">Michael Aukland</option>
           </select>
         </td>
       </tr>
 
       <tr>
         <th align="right">
-          <label class="required" for="ft_or_seasonal">Full time or Seasonal?</label>
+          <label class="required" for="reg_or_seasonal">Regular or Seasonal?</label>
         </th>
         <td>
-          <select required id="ft_or_seasonal" name="ft_or_seasonal">
+          <select required id="reg_or_seasonal" name="reg_or_seasonal">
             <option value="">Select...</option>
-            <option value="Full Time">Full Time</option>
+            <option value="Regular">Regular</option>
             <option value="Seasonal">Seasonal</option>
           </select>
         </td>
@@ -232,6 +232,32 @@ function jobDescToggle(what) {
         </td>
       </tr>
 
+      <tr>
+        <th align="right" valign="top">
+          <label class="required" for="multiple">
+            Are you hiring multiple of this position this year?
+          </label>
+        </th>
+        <td>
+          <select required name="multiple" id="multiple">
+            <option value="">Select...</option>
+            <option value="Yes">Yes</option>
+            <option value="No">No</option>
+          </select>
+        </td>
+      </tr>
+
+      <tr>
+        <th align="right" valign="top">
+          <label class="required" for="job_family">
+            Please include Job Family<br>(if you know what it is)
+          </label>
+        </th>
+        <td>
+          <input required name="job_family" id="job_family" size="60">
+        </td>
+      </tr>
+
       <tr id="jobDescFile">
         <th align="right" valign="top">
           <label for="data">Job Description:</label>