Bug 1108816: Project kickoff form, changes to privacy review

2 files changed, 113 insertions, 36 deletions

diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl
new file mode 100644
index 000000000..889543c0c
--- /dev/null
+++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl
@@ -0,0 +1,28 @@
+[%# 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 %]
+
+> Request Type
+[%+ cgi.param('data_comp_request_type') %]
+
+> Area
+[%+ cgi.param('data_comp_area') %]
+
+> Description
+[%+ cgi.param('data_comp_desc') %]
+
+> Does this request involve a change in data collection or handling?
+[%+ cgi.param('data_comp_handling_change') %]
+
+> Does this request involve a change in to the business unit's data practices?
+[%+ cgi.param('data_comp_practice_change') %]
+
+> Other Information
+[%+ cgi.param('data_comp_other') || "None" %]
diff --git a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
index 0dd3da5a8..d3a2a7253 100644
--- a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
+++ b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
@@ -323,60 +323,109 @@
     </div>
   </div>
 
-  <div id="privacy_policy_project_questions" class="bz_default_hidden">
-    <div class="header">Privacy (Policy/Project)</div>
+  <div id="data_compliance_questions" class="bz_default_hidden">
+    <div class="header">Data Compliance</div>
+
+    <div id="data_comp_request_type_row" class="field_row">
+      <span class="field_label required">Type of request</span>
+      <span class="field_data">
+        <select id="data_comp_request_type" name="data_comp_request_type">
+          <option value="">-- Select --</option>
+          <option value="General">General</option>
+          <option value="Data Compliance">Data Compliance</option>
+          <option value="Vendor Review">Vendor Review</option>
+          <option value="Privacy Policy">Privacy Policy</option>
+          <option value="Other">Other</option>
+        </select>
+      </span>
+    </div>
 
-    <div id="privacy_policy_project_link_row" class="field_row">
-      <span class="field_label">Is there a privacy policy for<br>this new feature/product?:</span>
+    <div class="data_comp_area_row">
+      <span class="field_label required">Area</span>
       <span class="field_data">
-        <div class="field_description">If yes, please enter a url to the policy.</div>
-        <input type="text" name="privacy_policy_project_link" id="privacy_policy_project_link" size="60">
+        <select id="data_comp_area" name="data_comp_area">
+          <option value="">-- Select --</option>
+          <option value="Firefox">Firefox</option>
+          <option value="Cloud Services">Cloud Services</option>
+          <option value="FxOS">FxOS</option>
+          <option value="Foundation">Foundation</option>
+          <option value="Engagement">Engagement</option>
+          <option value="IT">IT</option>
+          <option value="Content Services">Content Services</option>
+          <option value="Platform">Platform</option>
+          <option value="Other">Other</option>
+        </select>
       </span>
     </div>
 
-    <div id="privacy_policy_project_assistance_row" class="field_row">
-      <span class="field_label required">What assistance do you need from the privacy team (if any)?:</span>
+    <div id="data_comp_description_row">
+      <span class="field_label required">Description</span>
       <span class="field_data">
-        <textarea name="privacy_policy_project_assistance" id="privacy_policy_project_assistance" rows="10" cols="80"></textarea>
+        <div class="field_description">
+          Describe the data compliance issue: If your request involves changes
+          or additional data collection, please describe that collection,
+          including specific fields, where the data will be stored, how long it
+          will be stored, and who will have access to the data.
+        </div>
+        <textarea name="data_comp_desc" id="data_comp_desc" rows="10" cols="60"
+                  class="wide"></textarea>
       </span>
     </div>
-  </div>
 
-  <div id="privacy_policy_vendor_questions" class="bz_default_hidden">
-    <div class="header">Privacy (Policy/Vendor)</div>
+    <div id="data_comp_urgency_row">
+      <span class="field_label required">Urgency</span>
+      <span class="field_data">
+        <select id="data_comp_urgency" name="data_comp_urgency">
+          <option value="">-- Select --</option>
+          <option value="blocker">blocker</option>
+          <option value="critical">critical</option>
+          <option value="major">major</option>
+          <option value="normal">normal</option>
+          <option value="minor">minor</option>
+          <option value="trivial">trivial</option>
+          <option value="enhancement">enhancement</option>
+        </select>
+      </span>
+    </div>
 
-    <div id="privacy_policy_vendor_user_data_row" class="field_row">
-      <span class="field_label">Privacy Policy:</span>
+    <div id="data_comp_handling_change_row">
+      <span class="field_label required">Collection/Handling Change</span>
       <span class="field_data">
-        <div class="field_description">Will the vendor have access to Mozilla (customer, contributor, user, employee) data?</div>
-        <select name="privacy_policy_vendor_user_data" id="privacy_policy_vendor_user_data">
-          <option value="">Select One</option>
+        <div class="field_description">
+          Does this request involve a change in data collection or handling?
+        </div>
+        <select id="data_comp_handling_change" name="data_comp_handling_change">
+          <option value="">-- Select --</option>
           <option value="Yes">Yes</option>
           <option value="No">No</option>
         </select>
       </span>
     </div>
 
-    <div id="privacy_policy_vendor_extra" class="bz_default_hidden">
-      <div id="privacy_policy_vendor_link_row" class="field_row">
-        <span class="field_label">Vendor's Privacy Policy:</span>
-        <span class="field_data">
-          <div class="field_description">Please provide link to vendor's privacy policy</div>
-          <input type="text" name="privacy_policy_vendor_link" id="privacy_policy_vendor_link" size="60">
-        </span>
-      </div>
+    <div id="data_comp_practice_change_row">
+      <span class="field_label required">Practice Change</span>
+      <span class="field_data">
+        <div class="field_description">
+          Does this request involve a change in to the business unit's data practices?
+        </div>
+        <select id="data_comp_practice_change" name="data_comp_practice_change">
+          <option value="">-- Select --</option>
+          <option value="Yes">Yes</option>
+          <option value="No">No</option>
+        </select>
+      </span>
+    </div>
 
-      <div id="privacy_policy_vendor_questionnaire_row" class="field_row">
-        <span class="field_label">Privacy Questionnaire:</span>
-        <span class="field_data">
-          <div class="field_description">Has vendor completed Mozilla Vendor Privacy Questionnaire?</div>
-          <select name="privacy_policy_vendor_questionnaire" id="privacy_policy_vendor_questionnaire">
-            <option value="">Select One</option>
-            <option value="Yes">Yes</option>
-            <option value="No">No</option>
-          </select>
-        </span>
-      </div>
+    <div id="data_comp_other_row">
+      <span class="field_label">Other</span>
+      <span class="field_data">
+        <div class="field_description">
+          Please include any additional information, including links to relevant
+          material, details regarding user benefit, etc.
+        </div>
+        <textarea name="data_comp_other" id="data_comp_other" rows="10" cols="60"
+                  class="wide"></textarea>
+      </span>
     </div>
   </div>