Re-applying Bug 1292907 to test staging weirdness.

6 files changed, 251 insertions, 20 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
new file mode 100644
index 000000000..f14d40a29
--- /dev/null
+++ b/extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl
@@ -0,0 +1,39 @@
+[%# 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.
+  #%]
+
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
+>>Business unit requesting the search
+[%+ cgi.param("business_unit") %]
+
+>>Describe the thing you are naming
+[%+ cgi.param("description") %]
+
+>>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?
+[%+ cgi.param("name_choice") %]
+
+>>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?
+[%+ cgi.param("brand_team_involved") %]
+
+>>Are other companies using this name?
+[%+ cgi.param("other_company_name") %]
+
+[% IF cgi.param("other_company_name") == "Yes" %]
+>> If yes, tell us which companies and how their use of the name is different from yours.
+[%+ cgi.param("other_companies") %]
+
+[% END %]
+>>Anything else you want us to know?
+[%+ cgi.param("extra_info") %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
index 56ae2b7fc..e894c5ce5 100644
--- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
@@ -24,7 +24,8 @@
 [% PROCESS global/header.html.tmpl
    title = "Mozilla Corporation Legal Requests"
    generate_api_token = 1
-   style_urls = [ 'skins/standard/attachment.css' ]
+   style_urls = [ 'skins/standard/attachment.css',
+                  'skins/custom/create_bug.css' ]
    javascript_urls = [ 'js/attachment.js', 'js/field.js' ]
 %]
 
@@ -34,6 +35,8 @@
 
 <div style='text-align: center; width: 98%; font-size: 2em; font-weight: bold; margin: 10px;'>MoLegal</div>
 
+[% PROCESS 'bug/create/user-message.html.tmpl' no_bug_guidelines = 1, no_guided_bug_link = 1 %]
+
 <p><strong>Welcome to MoLegal.</strong> For legal help please fill in the form below completely.</p>
 
 <p>Legal [% terms.bugs %] are only visible to the reporter,  members of the legal team,  and those on the
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
new file mode 100644
index 000000000..ad143be24
--- /dev/null
+++ b/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
@@ -0,0 +1,178 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Mozilla Corporation.
+  # Portions created by Mozilla are Copyright (C) 2008 Mozilla
+  # Corporation. All Rights Reserved.
+  #
+  # Contributor(s): Mark Smith <mark@mozilla.com>
+  #                 Reed Loden <reed@mozilla.com>
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% inline_style = BLOCK %]
+#heading {
+  font-size:   2em;
+  font-weight: bold;
+}
+.row {
+  padding-bottom: 10px;
+}
+label.required:before {
+  content: "* ";
+  color: red;
+}
+.required_star {
+  color: red;
+}
+[% END %]
+
+[% inline_javascript = BLOCK %]
+$(function() {
+  $('#other_company_name').on('change', function() {
+    if ($('#other_company_name').val() == 'Yes') {
+      $('#other_companies_row').show();
+      $('#other_companies').attr('disabled', false);
+    } else {
+      $('#other_companies_row').hide();
+      $('#other_companies').attr('disabled', true);
+    }
+  });
+});
+[% END %]
+
+[% PROCESS global/header.html.tmpl
+   title              = "Name Clearance"
+   generate_api_token = 1
+   style              = inline_style
+   javascript         = inline_javascript
+%]
+
+<div id="heading">Name Clearance</div>
+
+<p><b>Note:</b> Do NOT add non-employees to this [% terms.bug %]. To maintain attorney-client privilege
+  and confidentiality, legal [% terms.bugs %] are only visible to the reporter, the legal team, and the
+  cc list.</p>
+
+<p>[ <span class="required_star">*</span> <span class="required_explanation">Required Field</span> ]</p>
+
+<form method="post" action="post_bug.cgi" id="nameForm">
+  <input type="hidden" id="short_desc" name="short_desc" value="New Name Clearance Request">
+  <input type="hidden" name="product" value="Legal">
+  <input type="hidden" name="component" value="Name Clearance (Trademark Search)">
+  <input type="hidden" name="rep_platform" value="All">
+  <input type="hidden" name="op_sys" value="Other">
+  <input type="hidden" name="version" value="unspecified">
+  <input type="hidden" name="priority" value="--">
+  <input type="hidden" name="bug_severity" value="normal">
+  <input type="hidden" name="format" value="name-clearance">
+  <input type="hidden" name="token" value="[% token FILTER html %]">
+  [% IF user.in_group('canconfirm') %]
+    <input type="hidden" name="bug_status" value="NEW">
+  [% END %]
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="business_unit">
+        <strong>Business unit requesting the search</strong>
+      </label>
+    </div>
+    <input type="text" name="business_unit" id="business_unit" size="60" required>
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="description">
+        <strong>Describe the thing you are naming</strong>
+      </label>
+    </div>
+    <textarea required  name="description" id="description" cols="80" rows="10"></textarea>
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label for="more_info_link">
+        <strong>If available, link to more info (Google doc, wiki page, etc)</strong>
+      </label>
+    </div>
+    <input name="more_info_link" id="more_info_link" size="60">
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="name_choice">
+        <strong>What is your first choice for the name?</strong>
+      </label>
+    </div>
+    <input required="true" name="name_choice" id="name_choice" size="60">
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="other_choices">
+        <strong>What are your 2nd & 3rd choices if #1 isn’t available?</strong>
+      </label>
+    </div>
+    <textarea required="true" name="other_choices" id="other_choices" cols="80" rows="10"></textarea>
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="brand_team_involved">
+        <strong>Has the brand team been involved in the naming process?</strong>
+      </label>
+    </div>
+    <select required="true" name="brand_team_involved" id="branch_team_involved">
+      <option value="">-- Select --</option>
+      <option value="Yes">Yes</option>
+      <option value="No">No</option>
+    </select>
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" for="other_company_name">
+        <strong>Are other companies using the name?</strong>
+      </label>
+    </div>
+    <select required="true" name="other_company_name" id="other_company_name">
+      <option value="">-- Select --</option>
+      <option value="Yes">Yes</option>
+      <option value="No">No</option>
+    </select>
+  </div>
+
+  <div id="other_companies_row" class="row" style="display:none;">
+    <div class="row_desc">
+      <label class="required" for="other_companies">
+        <strong>If yes, tell us which companies and how their use of the name is different from yours.</strong>
+      </label>
+    </div>
+    <textarea required="true" name="other_companies" id="other_companies" cols="80" rows="10"></textarea>
+  </div>
+
+  <div class="row">
+    <div class="row_desc">
+      <label class="required" 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>
+  </div>
+
+  <input type="submit" id="commit" value="Submit Request">
+</form>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
index 4c1dcdbe4..a03a5ca0f 100644
--- a/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
@@ -37,8 +37,10 @@ $(function() {
   $('#nda_needed').on('change', function() {
     if ($('#nda_needed').val() == 'Yes')
       $('#nda_needed_reason_row').show();
+      $('#nda_needed_reason').attr('disabled', false);
     else
       $('#nda_needed_reason_row').hide();
+      $('#nda_needed_reason').attr('disabled', true);
   });
 });
 [% END %]
@@ -78,7 +80,7 @@ $(function() {
         party or provide them with ours at this stage of the relationship?</strong>
       </label>
     </div>
-    <select required name="nda_needed" id="nda_needed">
+    <select required="true" name="nda_needed" id="nda_needed">
       <option value="">-- Select --</option>
       <option value="Yes">Yes</option>
       <option value="No">No</option>
@@ -91,7 +93,7 @@ $(function() {
         <strong>If yes, please explain.</strong>
       </label>
     </div>
-    <textarea required  name="nda_needed_reason" id="nda_needed_reason" cols="80" rows="10"></textarea>
+    <textarea required="true"  name="nda_needed_reason" id="nda_needed_reason" cols="80" rows="10"></textarea>
   </div>
 
   <div class="row">
@@ -100,7 +102,7 @@ $(function() {
         <strong>What is the purpose of exchanging confidential information with the other party?</strong>
       </label>
     </div>
-    <textarea required name="nda_purpose" id="nda_purpose" cols="80" rows="10"></textarea>
+    <textarea required="true" name="nda_purpose" id="nda_purpose" cols="80" rows="10"></textarea>
   </div>
 
   <div class="row">
@@ -109,7 +111,7 @@ $(function() {
         <strong>What confidential information will Mozilla be sharing?</strong>
       </label>
     </div>
-    <textarea required name="mozilla_sharing" id="mozilla_sharing" cols="80" rows="10"></textarea>
+    <textarea required="true" name="mozilla_sharing" id="mozilla_sharing" cols="80" rows="10"></textarea>
   </div>
 
   <div class="row">
@@ -118,7 +120,7 @@ $(function() {
         <strong>What confidential information will the other party be sharing?</strong>
       </label>
     </div>
-    <textarea required name="other_sharing" id="other_sharing" cols="80" rows="10"></textarea>
+    <textarea required="true" name="other_sharing" id="other_sharing" cols="80" rows="10"></textarea>
   </div>
 
   <div class="row">
@@ -130,32 +132,29 @@ $(function() {
       <td>
         <label for="party_name">Party Name</label>
       </td>
-      <td><input type="text" name="party_name" id="party_name" size="60" required></td>
+      <td><input type="text" name="party_name" id="party_name" size="60" required="true"></td>
     </tr>
     <tr>
       <td>
         <label for="party_address">Business Address</label>
       </td>
-      <td><input type="text" name="party_address" id="party_address" size="60" required></td>
+      <td><input type="text" name="party_address" id="party_address" size="60" required="true"></td>
     </tr>
     <tr>
       <td>
         <label for="party_contact_name">Name of Contact Person</label>
       </td>
-      <td><input type="text" name="party_contact_name" id="party_contact_name" size="60" required></td>
+      <td><input type="text" name="party_contact_name" id="party_contact_name" size="60" required="true"></td>
     <tr>
       <td>
         <label for="party_contact_email">Email of Contact Person</label>
       </td>
-      <td><input type="text" name="party_contact_email" id="party_contact_email" size="60" required></td>
+      <td><input type="text" name="party_contact_email" id="party_contact_email" size="60" required="true"></td>
     </tr>
     </table>
   </div>
 
   <input type="submit" id="commit" value="Submit Request">
-  <p>
-    [ <span class="required_star">*</span> <span class="required_explanation">Required Field</span> ]
-  </p>
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl b/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl
index 6ca3624c5..f02f753a3 100644
--- a/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl
@@ -209,5 +209,15 @@ custom_forms = {
       title => "Report issue with Personas Plus on Github"
     }
   ],
+  "Legal" => [
+    {
+      title => "NDA Request Form",
+      link  => "form.nda",
+    },
+    {
+      title => "Name Clearance Request Form",
+      link  => "form.name.clearance",
+    }
+  ],
 }
 %]
diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index 1612f98b3..e01ac4845 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -9,18 +9,20 @@
 [% PROCESS global/variables.none.tmpl %]
 
 <p>
-  [% UNLESS cloned_bug_id %]
+  [% UNLESS cloned_bug_id || no_guided_bug_link %]
     Consider using the
     <a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided"
     ><img src="extensions/BMO/web/images/guided.png" width="16" height="16" align="absmiddle" border="0">
     [%+ terms.Bugzilla %] Helper</a> instead of this form.
   [% END +%]
-  Before reporting a [% terms.bug %], make sure you've read our
-  <a href="https://developer.mozilla.org/en/Bug_writing_guidelines">
-  [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
-  been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi">
-  most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
-  search through descriptions</a> of previously reported [% terms.bugs %].
+  [% UNLESS no_bug_guidelines %]
+    Before reporting a [% terms.bug %], make sure you've read our
+    <a href="https://developer.mozilla.org/en/Bug_writing_guidelines">
+    [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
+    been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi">
+    most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
+    search through descriptions</a> of previously reported [% terms.bugs %].
+  [% END %]
 </p>
 
 [%