From 57ac7e0a1ff5e29e0b90eccf59e8a79d322165c7 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Thu, 26 Feb 2015 21:53:26 +0000 Subject: Bug 1108823: removing the privacy review bug --- .htaccess | 1 - .../bug/create/comment-privacy-data.txt.tmpl | 30 --- .../bug/create/create-privacy-data.html.tmpl | 219 --------------------- .../en/default/bug/create/custom_forms.none.tmpl | 7 - 4 files changed, 257 deletions(-) delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-privacy-data.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-privacy-data.html.tmpl diff --git a/.htaccess b/.htaccess index 7c7057e08..a98688e7b 100644 --- a/.htaccess +++ b/.htaccess @@ -59,7 +59,6 @@ RewriteRule ^form[\.:]csa[\.:]discourse$ enter_bug.cgi?product=Infrastructure+\% RewriteRule ^form[\.:]employee[\.\-:]incident$ enter_bug.cgi?product=mozilla.org&format=employee-incident RewriteRule ^form[\.:]brownbag$ https://air.mozilla.org/requests RewriteRule ^form[\.:]finance$ enter_bug.cgi?product=Finance&format=finance -RewriteRule ^form[\.:]privacy[\.\-:]data$ enter_bug.cgi?product=Privacy&format=privacy-data RewriteRule ^form[\.:]moz[\.\-:]project[\.\-:]review$ enter_bug.cgi?product=mozilla.org&format=moz-project-review RewriteRule ^form[\.:]docs?$ enter_bug.cgi?product=Developer+Documentation&format=doc [QSA] RewriteRule ^form[\.:]mdn?$ enter_bug.cgi?product=Mozilla+Developer+Network&format=mdn diff --git a/extensions/BMO/template/en/default/bug/create/comment-privacy-data.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-privacy-data.txt.tmpl deleted file mode 100644 index 279d59b6b..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-privacy-data.txt.tmpl +++ /dev/null @@ -1,30 +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 %] - -Where does this data come from: - -[%+ cgi.param('source') %] - -What people and things does this data describe, and what fields does it contain: - -[%+ cgi.param('data_desc') %] - -What parts of this data do you want to release: - -[%+ cgi.param('release') %] - -Why are we releasing this data, and what do we hope people will do with it: - -[%+ cgi.param('why') %] - -Is there a particular time by which you would like to release this data: - -[%+ cgi.param('when') %] diff --git a/extensions/BMO/template/en/default/bug/create/create-privacy-data.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-privacy-data.html.tmpl deleted file mode 100644 index b99953282..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-privacy-data.html.tmpl +++ /dev/null @@ -1,219 +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. - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% inline_style = BLOCK %] - #bug_form input[type=text], #bug_form input[type=file], #cc_autocomplete, #bug_form textarea { - width: 100%; - } -[% END %] - -[% inline_js = BLOCK %] - function onSubmit() { - var error = ''; - if (!isFilledOut('short_desc')) error += 'Please enter a summary.\n'; - if (!isFilledOut('attachment')) error += 'Please attach the data set/representative sample.\n'; - if (!isFilledOut('source')) error += 'Please enter the data source.\n'; - if (!isFilledOut('data_desc')) error += 'Please enter the data description.\n'; - if (!isFilledOut('release')) error += 'Please enter the parts of data you want released.\n'; - if (!isFilledOut('why')) error += 'Please enter why you want to release this data.\n'; - if (!isFilledOut('when')) error += 'Please enter when you would like to release this data.\n'; - - if (error) { - alert(error); - return false; - } - - return true; - } -[% END %] - -[% PROCESS global/header.html.tmpl - title = "Privacy - Data Release Proposal" - style = inline_style - style_urls = [ 'skins/standard/enter_bug.css' ] - javascript = inline_js - javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', - 'js/attachment.js', 'js/field.js', 'js/util.js' ] - yui = [ 'autocomplete' ] -%] - -

Privacy - Data Release Proposal

- -

- Before filling out this form, please look at the - guide - for releasing info about people. -

- -

- All fields except for CC are required. -

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - [% INCLUDE global/userselect.html.tmpl - id => "cc" - name => "cc" - value => cc - size => 60 - multiple => 5 - %] - -  Optional -
- - - Please attach the data set, or a representative sample. -
- - - -
-
- - - Where does this data come from? -
- -
-
- - - What people and things does this data describe, and what fields does it contain? -
- -
-
- - - What parts of this data do you want to release? -
- -
-
- - - Why are we releasing this data, and what do we hope people will do with it? -
- -
-
- - - Is there a particular time by which you would like to release this data? -
- -
-
- Expect to discover that you've missed a few of things, so plan for a couple weeks to get them corrected. -
  - -
- -
- - - -[% 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 9ce7406e4..c8a6f05b4 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 @@ -77,13 +77,6 @@ custom_forms = { group => "mozilla-employee-confidential", }, ], - "Privacy" => [ - { - link => "form.privacy.data", - title => "Privacy - Data Release Proposal", - group => "mozilla-employee-confidential", - }, - ], "Mozilla PR" => [ { link => "form.mozpr", -- cgit v1.2.3-24-g4f1b