2 files changed, 86 insertions, 5 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 e2c0e02fb..86b93693c 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
@@ -40,3 +40,12 @@ Desired Location:
 
 Comp Grade:
 [%+ cgi.param("comp_grade") %]
+
+Is this new headcount or backfill?
+[%+ cgi.param("new_or_backfill") %]
+
+What part of your strategic plan does this role impact?
+[%+ cgi.param("plan_impact") %]
+
+Why is this critical for success?
+[%+ cgi.param("critical_success") %]
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 6ea609743..9f54953ce 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
@@ -32,8 +32,8 @@
 p {
    max-width: 40%;
 }
-label.required:after {
-  content: " *";
+label.required:before {
+  content: "* ";
   color: red;
 }
 .required_star {
@@ -41,11 +41,28 @@ label.required:after {
 }
 [% END %]
 
+[% inline_javascript = BLOCK %]
+function jobDescToggle(what) {
+  switch (what) {
+  case 'text':
+    YAHOO.util.Dom.removeClass('jobDescText', 'bz_default_hidden');
+    YAHOO.util.Dom.addClass('jobDescFile', 'bz_default_hidden');
+    break;
+
+  case 'file':
+    YAHOO.util.Dom.addClass('jobDescText', 'bz_default_hidden');
+    YAHOO.util.Dom.removeClass('jobDescFile', 'bz_default_hidden');
+    break;
+  }
+}
+[% END %]
+
 [% PROCESS global/header.html.tmpl
    title           = "Mozilla Corporation HR and Recruiting Requests"
    style_urls      = [ 'skins/standard/attachment.css' ]
    javascript_urls = [ 'js/attachment.js', 'js/field.js' ]
    style           = inline_style
+   javascript      = inline_javascript
    yui             = [ 'autocomplete' ]
 %]
 
@@ -77,13 +94,15 @@ label.required:after {
     <input type="hidden" name="format" value="recruiting">
     <input type="hidden" name="created-format" value="recruiting">
     <input type="hidden" name="token" value="[% token FILTER html %]">
+    <input type="hidden" id="description" name="description" value="Job Descripion">
+    <input type="hidden" name="contenttypemethod" value="autodetect" />
     [% IF user.in_group('canconfirm') %]
       <input type="hidden" name="bug_status" value="NEW">
     [% END %]
 
     <table>
       <tr>
-        <th align="right" valign="top">
+        <th align="right" valign="top" width="170">
           <label class="required" for="short_desc">Position Title:</label>
         </th>
         <td>
@@ -108,7 +127,7 @@ label.required:after {
           <label class="required" for="hiring_manager_name">Hiring Manager Name:</label>
         </th>
         <td>
-          <input required name="hiring_manager_name" id="hiring_manager_name" size="60" value="[% hiring_manager_name FILTER html %]">
+          <input required name="hiring_manager_name" id="hiring_manager_name" size="60" >
         </td>
       </tr>
 
@@ -196,7 +215,60 @@ label.required:after {
           <label class="required" for="comp_grade">Comp Grade:</label>
         </th>
         <td>
-          <input required name="comp_grade" id="comp_grade" size="60" value="[% comp_grade FILTER html %]">
+          <input required name="comp_grade" id="comp_grade" size="60">
+        </td>
+      </tr>
+
+      <tr>
+        <th align="right" valign="top">
+          <label class="required" for="new_or_backfill">Is this new headcount or backfill?</label>
+        </th>
+        <td>
+          <select required name="new_or_backfill" id="new_or_backfill">
+            <option value="">Select...</option>
+            <option value="new">New</option>
+            <option value="backfill">Backfill</option>
+          </select>
+        </td>
+      </tr>
+
+      <tr id="jobDescFile">
+        <th align="right" valign="top">
+          <label for="data">Job Description:</label>
+        </th>
+        <td>
+          <em>Please upload a draft of the Job Description you would like to be associated with this requisition
+            (or <a href="javascript:jobDescToggle('text')">paste text as attachment</a>).</em><br>
+          <input type="file" id="data" name="data" size="60">
+        </td>
+      </tr>
+
+      <tr id="jobDescText" class="bz_default_hidden">
+        <th align="right" valign="top">
+          <label for="attach_text">Job Description:</label>
+        </th>
+        <td>
+          <em>Please copy/paste a draft of the Job Description you would like to be associated with this requisition
+            (or <a href="javascript:jobDescToggle('file')">attach a file</a>).</em><br>
+          <textarea id="attach_text" name="attach_text" cols="60" rows="4"></textarea>
+        </td>
+      </tr>
+
+      <tr>
+        <th align="right" valign="top">
+          <label for="plan_impact" class="required">What part of your strategic plan does this role impact?</label>
+        </th>
+        <td>
+          <textarea required id="plan_impact" name="plan_impact" cols="60" rows="4"></textarea>
+        </td>
+      </tr>
+
+      <tr>
+        <th align="right" valign="top">
+          <label for="critical_success" class="required">Why is this critical for success?</label>
+        </th>
+        <td>
+          <textarea required id="critical_success" name="critical_success" cols="60" rows="4"></textarea>
         </td>
       </tr>