diff options
4 files changed, 2 insertions, 284 deletions
diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-safety.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-safety.txt.tmpl deleted file mode 100644 index 5a6ffbbbd..000000000 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-safety.txt.tmpl +++ /dev/null @@ -1,40 +0,0 @@ -[%# 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 %] - -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] - -Data Safety Questions: - -User Data: [% cgi.param('data_safety_user_data') %] -How many involved?: [% cgi.param('data_safety_user_count') %] -How many users do you anticipate to be involved?: [% cgi.param('data_safety_user_count_anticipated') %] -Type of Data: -[%+ cgi.param('data_safety_data_type') %] -Data Reason: -[%+ cgi.param('data_safety_data_reason') %] -Community Benefit: -[%+ cgi.param('data_safety_community_benefit') %] -Data Collection: -[%+ cgi.param('data_safety_community_collection') %] -Data Retention: [% cgi.param('data_safety_retention') %] -Data Retention Length: [% cgi.param('data_safety_retention_length') %] -Separate Party: [% cgi.param('data_safety_separate_party') %] -Separate Party Data Type: -[%+ cgi.param('data_safety_separate_party_data') %] -Separate Party Data Communication: -[%+ cgi.param('data_safety_separate_party_data_communication') %] -Who are the separate parties?: -[%+ cgi.param('data_safety_separate_party_who') %] -Community Visibility and Input: [% cgi.param('data_safety_community_visibility') %] -Communication Channels: -[%+ cgi.param('data_safety_communication_channels') %] -Public Communication Plan: -[%+ cgi.param('data_safety_communication_plan') %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl index 6a88aadd8..07d5fa5ad 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl @@ -17,15 +17,12 @@ Description: [%+ cgi.param('description') %] Additional Information: [%+ cgi.param('additional') %] -Urgency: [% cgi.param('urgency') %] Key Initiative: [% cgi.param('key_initiative') == 'Other' ? cgi.param('key_initiative_other') : cgi.param('key_initiative') %] Release Date: [% cgi.param('release_date') %] Project Status: [% cgi.param('project_status') %] Mozilla Data: [% cgi.param('mozilla_data') %] -New or Change: [% cgi.param('new_or_change') %] -Mozilla Project: [% cgi.param('mozilla_project') %] Mozilla Related: [% cgi.param('mozilla_related') %] Separate Party: [% cgi.param('separate_party') %] [% IF cgi.param('separate_party') == 'Yes' %] 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 33f5e02eb..653058bc2 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 @@ -92,20 +92,6 @@ </span> </div> - <div id="urgency_row" class="field_row"> - <span class="field_label required">Urgency:</span> - <span class="field_data"> - <div class="field_description">What is the urgency of this project?</div> - <select id="urgency" name="urgency"> - <option value="">Select One</option> - <option value="no rush">no rush</option> - <option value="2-4 weeks">2-4 weeks</option> - <option value="a week">a week</option> - <option value="2 days">2 days</option> - </select> - </span> - </div> - <div id="key_initiative_row" class="field_row"> <span class="field_label required">Key Initiative:</span> <span class="field_data"> @@ -183,34 +169,6 @@ </span> </div> - <div id="new_or_change_row" class="field_row"> - <span class="field_label required">New or Change:</span> - <span class="field_data"> - <div class="field_description">Is this a NEW product, service, project, feature, or functionality, - a change to an EXISTING one, or neither?</div> - <select name="new_or_change" id="new_or_change"> - <option value="">Select One</option> - <option value="New">New</option> - <option value="Existing">Existing</option> - <option value="Neither">Neither</option> - </select> - </span> - </div> - - <div id="mozilla_project_row" class="field_row bz_default_hidden"> - <span class="field_label">Mozilla Project:</span> - <span class="field_data"> - <div class="field_description">What product/service/project does this pertain to?</div> - <select name="mozilla_project" id="mozilla_project"> - <option value="General">None</option> - <option value="Firefox OS">FirefoxOS</option> - <option value="Marketplace">Marketplace</option> - <option value="Persona">Persona</option> - <option value="Marketing">Marketing Initiative</option> - </select> - </span> - </div> - <div id="mozilla_related_row" class="field_row"> <span class="field_label">Mozilla Related:</span> <span class="field_data"> @@ -751,160 +709,6 @@ </div> </div> - <div id="data_safety_questions" class="bz_default_hidden"> - <div class="header">Data Safety</div> - - <div id="data_safety_user_data_row" class="field_row"> - <span class="field_label">User Data:</span> - <span class="field_data"> - <div class="field_description">Does your project collect data from users?</div> - <select name="data_safety_user_data" id="data_safety_user_data"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </span> - </div> - - <div id="data_safety_extra_questions" class="bz_default_hidden"> - <div id="data_safety_user_count_row" class="field_row"> - <span class="field_label">How many involved?:</span> - <span class="field_data"> - <div class="field_description">How many users are currently involved?</div> - <input type="text" name="data_safety_user_count" id="data_safety_user_count" size="60"> - </span> - </div> - - <div id="data_safety_user_count_anticipated_row" class="field_row"> - <span class="field_label">How many antcipated?:</span> - <span class="field_data"> - <div class="field_description">How many users do you anticipate to be involved?</div> - <input type="text" name="data_safety_user_count_anticipated" id="data_safety_user_count_anticipated" size="60"> - </span> - </div> - - <div id="data_safety_data_type_row" class="field_row"> - <span class="field_label">Type of Data:</span> - <span class="field_data"> - <div class="field_description">Please provide examples of the types of user data you collect.</div> - <textarea name="data_safety_data_type" id="data_safety_data_type" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_data_reason_row" class="field_row"> - <span class="field_label">Data Reason:</span> - <span class="field_data"> - <div class="field_description">Why do you need to collect user data?</div> - <textarea name="data_safety_data_reason" id="data_safety_data_reason" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_community_benefit_row" class="field_row"> - <span class="field_label">Community Benefit:</span> - <span class="field_data"> - <div class="field_description">What community benefits are derived from the collection of user data for your project?</div> - <textarea name="data_safety_community_benefit" id="data_safety_community_benefit" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_community_collection_row" class="field_row"> - <span class="field_label">Data Collection:</span> - <span class="field_data"> - <div class="field_description">How is the data being collected? (e.g., forms on web site, provided directly by user, - observed data collection, etc.) (Consider that you may be collecting data unintentionally - such as automatic logging by web servers)</div> - <textarea name="data_safety_community_collection" id="data_safety_community_collection" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_retention_row" class="field_row"> - <span class="field_label">Data Retention:</span> - <span class="field_data"> - <div class="field_description">Will your project / team members need to retain user data?</div> - <select name="data_safety_retention" id="data_safety_retention"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </span> - </div> - - <div id="data_safety_retention_length_row" class="field_row bz_default_hidden"> - <span class="field_label">Data Retention Length:</span> - <span class="field_data"> - <div class="field_description">If the data is being retained, for how long?</div> - <input type="text" name="data_safety_retention_length" id="data_safety_retention_length" size="60"></textarea> - </span> - </div> - - <div id="data_safety_separate_party_row" class="field_row"> - <span class="field_label">Separate Party:</span> - <span class="field_data"> - <div class="field_description">Will any user data be shared or accessed by third party partners, customers or providers?</div> - <select name="data_safety_separate_party" id="data_safety_separate_party"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </span> - </div> - - <div id="data_safety_separate_party_extra" class="bz_default_hidden"> - <div id="data_safety_separate_party_data_row" class="field_row"> - <span class="field_label">Separate Party Data Type:</span> - <span class="field_data"> - <div class="field_description">What is the data being shared or accessed?</div> - <textarea name="data_safety_separate_party_data" id="data_safety_community_separate_party_data" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_separate_party_data_communication_row" class="field_row"> - <span class="field_label">Separate Party<br>Data Communication:</span> - <span class="field_data"> - <div class="field_description">How would the data be communicated / transferred to the third parties?</div> - <textarea name="data_safety_separate_party_data_communication" id="data_safety_separate_party_data_communication" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_separate_party_who_row" class="field_row"> - <span class="field_label">Who are the separate parties?:</span> - <span class="field_data"> - <div class="field_description">Who are the third party vendors and in what countries are they based?</div> - <textarea name="data_safety_separate_party_who" id="data_safety_separate_party_who" rows="10" cols="80"></textarea> - </span> - </div> - </div> - - <div id="data_safety_community_visibility_row" class="field_row"> - <span class="field_label">Community Visibility and Input:</span> - <span class="field_data"> - <div class="field_description">Has your proposal been shared publicly, including requirements for Mozilla to collect and host user data?</div> - <select name="data_safety_community_visibility" id="data_safety_community_visibility"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </span> - </div> - - <div id="data_safety_communication_channels_row" class="field_row bz_default_hidden"> - <span class="field_label">Communication Channels:</span> - <span class="field_data"> - <div class="field_description">What communication channels are you using and what kind of input have you received thus far?</div> - <textarea name="data_safety_communication_channels" id="data_safety_communication_channels" rows="10" cols="80"></textarea> - </span> - </div> - - <div id="data_safety_communication_plan_row" class="field_row bz_default_hidden"> - <span class="field_label">Public Communication Plan:</span> - <span class="field_data"> - <div class="field_description">Data Safety discussion needed. Provide your plan for publicly sharing your proposal.</div> - <textarea name="data_safety_communication_plan" id="data_safety_communication_plan" rows="10" cols="80"></textarea> - </span> - </div> - </div> - </div> - <input type="submit" id="commit" value="Submit Review"> </form> diff --git a/extensions/MozProjectReview/web/js/moz_project_review.js b/extensions/MozProjectReview/web/js/moz_project_review.js index dca67f2ae..2625c765a 100644 --- a/extensions/MozProjectReview/web/js/moz_project_review.js +++ b/extensions/MozProjectReview/web/js/moz_project_review.js @@ -18,7 +18,6 @@ var MPR = { "key_initiative": "Please select a value for key initiative in the initial questions section", "project_status": "Please select a value for project status in the initial questions section", "mozilla_data": "Please select a value for mozilla data in the initial questions section", - "new_or_change": "Please select a value for new or change to existing project in the initial questions section", "separate_party": "Please select a value for separate party in the initial questions section" }, "finance_questions": { @@ -58,8 +57,6 @@ var MPR = { 'key_initiative', 'project_status', 'mozilla_data', - 'new_or_change', - 'mozilla_project', 'separate_party', 'relationship_type', 'data_access', @@ -74,11 +71,7 @@ var MPR = { 'legal_sow_vendor_product_line', 'legal_vendor_services_where', 'finance_purchase_inbudget', - 'finance_purchase_urgency', - 'data_safety_user_data', - 'data_safety_retention', - 'data_safety_separate_party', - 'data_safety_community_visibility' + 'finance_purchase_urgency' ], init: function () { @@ -106,34 +99,18 @@ var MPR = { sec_review_questions: false, privacy_policy_project_questions: false, privacy_policy_vendor_questions: false, - data_safety_questions: false, - data_safety_extra_questions: false, - mozilla_project_row: false, privacy_policy_project_link_row: false, privacy_policy_project_user_data_bug_row: false, - privacy_policy_vendor_extra: false, - data_safety_extra_questions: false, - data_safety_retention_length_row: false, - data_safety_separate_party_data_row: false, - data_safety_communication_channels_row: false, - data_safety_communication_plan_row: false, + privacy_policy_vendor_extra: false }; if (Dom.get('key_initiative').value == 'Other') { page_sections.key_initiative_other_row = true; } - if (Dom.get('new_or_change').value == 'Existing') { - page_sections.mozilla_project_row = true; - } - - if (Dom.get('new_or_change').value == 'New') - page_sections.legal_questions = true; - if (Dom.get('mozilla_data').value == 'Yes') { page_sections.legal_questions = true; page_sections.privacy_policy_project_questions = true; - page_sections.data_safety_questions = true; page_sections.sec_review_questions = true; } @@ -196,26 +173,6 @@ var MPR = { page_sections.privacy_policy_vendor_extra = true; } - if (Dom.get('data_safety_user_data').value == 'Yes') { - page_sections.data_safety_extra_questions = true; - } - - if (Dom.get('data_safety_retention').value == 'Yes') { - page_sections.data_safety_retention_length_row = true; - } - - if (Dom.get('data_safety_separate_party').value == 'Yes') { - page_sections.data_safety_separate_party_data_row = true; - } - - if (Dom.get('data_safety_community_visibility').value == 'Yes') { - page_sections.data_safety_communication_channels_row = true; - } - - if (Dom.get('data_safety_community_visibility').value == 'No') { - page_sections.data_safety_communication_plan_row = true; - } - // Toggle the individual page_sections for (section in page_sections) { MPR.toggleShowSection(section, page_sections[section]); |