diff options
Diffstat (limited to 'extensions')
3 files changed, 14 insertions, 57 deletions
diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl index 816834c40..ff3f5adb6 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl @@ -11,8 +11,7 @@ [% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] -Privacy Policy: [% cgi.param('privacy_policy_project') %] -Privacy Policy Link: [% cgi.param('privacy_policy_project_link') %] -User Data: [% cgi.param('privacy_policy_user_data') %] -Data Safety [% terms.Bug %] ID: [% cgi.param('privacy_policy_user_data_bug') %] -Legal [% terms.Bug %] ID: [% cgi.param('privacy_policy_legal_bug') %] +Is there a privacy policy for this new feature/product?: +[%+ cgi.param('privacy_policy_project_link') %] +What assistance do you need from the privacy team (if any)?: +[%+ cgi.param('privacy_policy_project_assistance') %] 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 c64142a62..f4fc6ea7a 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 @@ -313,52 +313,18 @@ <div id="privacy_policy_project_questions" class="bz_default_hidden"> <div class="header">Privacy (Policy/Project)</div> - <div id="privacy_policy_project_row" class="field_row"> - <span class="field_label">Privacy Policy:</span> + <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> <span class="field_data"> - <div class="field_description">Do you currently have a privacy policy for your project / site / product?</div> - <select name="privacy_policy_project" id="privacy_policy_project"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </span> - </div> - - <div id="privacy_policy_project_link_row" class="field_row bz_default_hidden"> - <span class="field_label">Privacy Policy Link:</span> - <span class="field_data"> - <div class="field_description">Please provide link to policy</div> + <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"> </span> </div> - <div id="privacy_policy_project_user_data_row" class="field_row"> - <span class="field_label">User Data:</span> - <span class="field_data"> - <div class="field_description">Does your product/service/project collect, use or maintain any user data?</div> - <select name="privacy_policy_user_data" id="privacy_policy_user_data"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </span> - </div> - - <div id="privacy_policy_project_user_data_bug_row" class="bz_default_hidden"> - <span class="field_label">Data Safety [% terms.Bug %] ID:</span> - <span class="field_data"> - <div class="field_description">Please provide link to Data Safety [% terms.bug %]</div> - <input type="text" name="privacy_policy_user_data_bug" id="privacy_policy_user_data_bug" size="60"> - </span> - </div> - - <div id="privacy_policy_project_legal_bug_row" class="field_row"> - <span class="field_label">Legal [% terms.Bug %]:</span> + <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> <span class="field_data"> - <div class="field_description">For reference, please provide link to related Legal [% terms.bug %] or enter - "not filed" if a legal [% terms.bug %] has not yet been filed.</div> - <input type="text" name="privacy_policy_legal_bug" id="privacy_policy_legal_bug" size="60"> + <textarea name="privacy_policy_project_assistance" id="privacy_policy_project_assistance" rows="10" cols="80"></textarea> </span> </div> </div> diff --git a/extensions/MozProjectReview/web/js/moz_project_review.js b/extensions/MozProjectReview/web/js/moz_project_review.js index 5db0225df..5ea1d1a0e 100644 --- a/extensions/MozProjectReview/web/js/moz_project_review.js +++ b/extensions/MozProjectReview/web/js/moz_project_review.js @@ -50,6 +50,10 @@ var MPR = { "legal_sow_vendor_payment_schedule": "Please enter a value for SOW vendor payment schedule", "legal_sow_vendor_total_max": "Please enter a value for SOW vendor maximum total to be paid", "legal_sow_vendor_product_line": "Please enter a value for SOW vendor product line" + }, + "privacy_policy_project_questions": { + "privacy_policy_project_assistance": "Please enter a value for any assistance needed in the privacy policy project questions section", + "privacy_policy_project_link": "Please enter a value for project link in the privacy policy project questions section" } }, @@ -63,8 +67,6 @@ var MPR = { 'vendor_cost', 'po_needed', 'sec_affects_products', - 'privacy_policy_project', - 'privacy_policy_user_data', 'privacy_policy_vendor_user_data', 'privacy_policy_vendor_questionnaire', 'legal_priority', @@ -108,8 +110,6 @@ var MPR = { sec_review_questions: false, privacy_policy_project_questions: false, privacy_policy_vendor_questions: false, - privacy_policy_project_link_row: false, - privacy_policy_project_user_data_bug_row: false, privacy_policy_vendor_extra: false }; @@ -166,14 +166,6 @@ var MPR = { page_sections.legal_vendor_single_country = true; } - if (MPR.fieldValue('privacy_policy_project') == 'Yes') { - page_sections.privacy_policy_project_link_row = true; - } - - if (MPR.fieldValue('privacy_policy_user_data') == 'Yes') { - page_sections.privacy_policy_project_user_data_bug_row = true; - } - if (MPR.fieldValue('privacy_policy_vendor_user_data') == 'Yes') { page_sections.privacy_policy_vendor_extra = true; } |