From ae24301210daff35e5fc93313d8d4c13890fa0df Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Fri, 12 Aug 2016 18:55:04 -0400 Subject: Revert "Bug 1292907 - Create custom Name Clearance form" This reverts commit 1514a2ad792751120d5010a14d78575cb6c1a969. --- .../bug/create/comment-name-clearance.txt.tmpl | 39 ----- .../en/default/bug/create/create-legal.html.tmpl | 5 +- .../bug/create/create-name-clearance.html.tmpl | 178 --------------------- .../en/default/bug/create/create-nda.html.tmpl | 23 +-- .../en/default/bug/create/custom_forms.none.tmpl | 10 -- .../en/default/bug/create/user-message.html.tmpl | 16 +- 6 files changed, 20 insertions(+), 251 deletions(-) delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl (limited to 'extensions') 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 deleted file mode 100644 index f14d40a29..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-name-clearance.txt.tmpl +++ /dev/null @@ -1,39 +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 %] - ->>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 e894c5ce5..56ae2b7fc 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,8 +24,7 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Corporation Legal Requests" generate_api_token = 1 - style_urls = [ 'skins/standard/attachment.css', - 'skins/custom/create_bug.css' ] + style_urls = [ 'skins/standard/attachment.css' ] javascript_urls = [ 'js/attachment.js', 'js/field.js' ] %] @@ -35,8 +34,6 @@
MoLegal
-[% PROCESS 'bug/create/user-message.html.tmpl' no_bug_guidelines = 1, no_guided_bug_link = 1 %] -

Welcome to MoLegal. For legal help please fill in the form below completely.

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 deleted file mode 100644 index ad143be24..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl +++ /dev/null @@ -1,178 +0,0 @@ -[%# 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 - # Reed Loden - #%] - -[% 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 -%] - -

Name Clearance
- -

Note: 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.

- -

[ * Required Field ]

- -
- - - - - - - - - - - [% IF user.in_group('canconfirm') %] - - [% END %] - -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- - - -
-
- -
- -
- - -
- -[% 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 a03a5ca0f..4c1dcdbe4 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,10 +37,8 @@ $(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 %] @@ -80,7 +78,7 @@ $(function() { party or provide them with ours at this stage of the relationship? - @@ -93,7 +91,7 @@ $(function() { If yes, please explain. - +
@@ -102,7 +100,7 @@ $(function() { What is the purpose of exchanging confidential information with the other party?
- +
@@ -111,7 +109,7 @@ $(function() { What confidential information will Mozilla be sharing?
- +
@@ -120,7 +118,7 @@ $(function() { What confidential information will the other party be sharing?
- +
@@ -132,29 +130,32 @@ $(function() { - + - + - + - +
+

+ [ * Required Field ] +

[% 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 f02f753a3..6ca3624c5 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,15 +209,5 @@ 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 e01ac4845..1612f98b3 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,20 +9,18 @@ [% PROCESS global/variables.none.tmpl %]

- [% UNLESS cloned_bug_id || no_guided_bug_link %] + [% UNLESS cloned_bug_id %] Consider using the [%+ terms.Bugzilla %] Helper instead of this form. [% END +%] - [% UNLESS no_bug_guidelines %] - Before reporting a [% terms.bug %], make sure you've read our - - [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already - been reported. Consult our list of - most frequently reported [% terms.bugs %] and - search through descriptions of previously reported [% terms.bugs %]. - [% END %] + Before reporting a [% terms.bug %], make sure you've read our + + [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already + been reported. Consult our list of + most frequently reported [% terms.bugs %] and + search through descriptions of previously reported [% terms.bugs %].

[% -- cgit v1.2.3-24-g4f1b