From 6fed7d428af3bacf2220e16cd4f3dd21c3e9bfb6 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Fri, 23 Sep 2016 19:33:10 +0000
Subject: Bug 1304174 - Updates for custom Name Clearance form

---
 .../bug/create/comment-name-clearance.txt.tmpl     | 19 ++++++++-------
 .../bug/create/create-name-clearance.html.tmpl     | 27 ++++++++++++++++++++--
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl
index f14d40a29..370dee481 100644
--- a/extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl
@@ -9,25 +9,28 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
->>Business unit requesting the search
+>> Business unit requesting the search
 [%+ cgi.param("business_unit") %]
 
->>Describe the thing you are naming
+>> Describe the thing you are naming
 [%+ cgi.param("description") %]
 
->>If available, link to more info (Google doc, wiki page, etc)
+>> If available, link to more info (Google doc, wiki page, etc)
 [%+ cgi.param("more_info_link") || 'None' %]
 
->>What is your first choice for the name?
+>> What is your first choice for the name?
 [%+ cgi.param("name_choice") %]
 
->>What are your 2nd & 3rd choices if #1 isn’t available?
+>> What are your 2nd & 3rd choices if #1 isn’t available?
 [%+ cgi.param("other_choices") %]
 
->>Has the brand team been involved in the naming process?
+>> Has the brand team been involved in the naming process?
 [%+ cgi.param("brand_team_involved") %]
 
->>Are other companies using this name?
+>> How soon do you need the results?
+[%+ cgi.param('timeframe') %]
+
+>> Are other companies using this name?
 [%+ cgi.param("other_company_name") %]
 
 [% IF cgi.param("other_company_name") == "Yes" %]
@@ -35,5 +38,5 @@
 [%+ cgi.param("other_companies") %]
 
 [% END %]
->>Anything else you want us to know?
+>> Anything else you want us to know?
 [%+ cgi.param("extra_info") %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
index ad143be24..499ca0d82 100644
--- a/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
@@ -41,6 +41,13 @@ label.required:before {
 
 [% inline_javascript = BLOCK %]
 $(function() {
+  $('#nameForm').submit(function () {
+    var short_desc = $('#short_desc');
+    var name = $('#name_choice').val();
+    var business_unit = $('#business_unit').val();
+    short_desc.val('New Name Clearance Request for ' + encodeURIComponent(name) +
+                   ' for ' + encodeURIComponent(business_unit));
+  });
   $('#other_company_name').on('change', function() {
     if ($('#other_company_name').val() == 'Yes') {
       $('#other_companies_row').show();
@@ -141,6 +148,21 @@ $(function() {
     </select>
   </div>
 
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="timeframe">
+        <strong>How soon do you need the results?</strong>
+      </label>
+    </div>
+    <select required="true" name="timeframe" id="timeframe">
+      <option value="">-- Select --</option>
+      <option value="2 days">2 days</option>
+      <option value="a week">a week</option>
+      <option value="2-3 weeks">2-3 weeks</option>
+      <option value="no rush">no rush</option>
+    </select>
+  </div>
+
   <div class="row">
     <div class="row_desc">
       <label class="required" for="other_company_name">
@@ -151,6 +173,7 @@ $(function() {
       <option value="">-- Select --</option>
       <option value="Yes">Yes</option>
       <option value="No">No</option>
+      <option value="Don't know">Don't know</option>
     </select>
   </div>
 
@@ -165,11 +188,11 @@ $(function() {
 
   <div class="row">
     <div class="row_desc">
-      <label class="required" for="extra_info">
+      <label for="extra_info">
         <strong>Anything else you want us to know?</strong>
       </label>
     </div>
-    <textarea required="true" name="extra_info" id="extra_info" cols="80" rows="10"></textarea>
+    <textarea name="extra_info" id="extra_info" cols="80" rows="10"></textarea>
   </div>
 
   <input type="submit" id="commit" value="Submit Request">
-- 
cgit v1.2.3-24-g4f1b