From 3442a95983bcdcf6a6df320bd01e45725dfeb167 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Thu, 8 Sep 2016 02:16:42 +0000 Subject: Revert "Bug 1297522 - changes to legal form" This reverts commit c0e3802031e2e874724f02d488cdae574e152d1d. --- .../en/default/bug/create/comment-legal.txt.tmpl | 19 +- .../en/default/bug/create/create-legal.html.tmpl | 336 +++++++++++---------- .../en/default/bug/create/custom_forms.none.tmpl | 20 +- 3 files changed, 186 insertions(+), 189 deletions(-) (limited to 'extensions') diff --git a/extensions/BMO/template/en/default/bug/create/comment-legal.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-legal.txt.tmpl index 1dcad573a..eb00a88d9 100644 --- a/extensions/BMO/template/en/default/bug/create/comment-legal.txt.tmpl +++ b/extensions/BMO/template/en/default/bug/create/comment-legal.txt.tmpl @@ -20,11 +20,20 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] ->> Business Unit -[%+ cgi.param('business_unit') %] +Priority for your Team: +[%+ cgi.param('teampriority') %] ->> Important Dates -[%+ cgi.param('important_dates') %] +Timeframe for Completion: +[%+ cgi.param('timeframe') %] ->> Description +Goal: +[%+ cgi.param('goal') %] + +Business Objective: +[%+ cgi.param('busobj') %] + +Other Party: +[%+ cgi.param('otherparty') %] + +Description: [%+ cgi.param("comment") %] 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 5ca47bc5a..e894c5ce5 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 @@ -21,48 +21,36 @@ [% PROCESS global/variables.none.tmpl %] -[% inline_style = BLOCK %] -.field_label { - width: 170px; - padding-top: 10px; -} -label.required:before { - content: "* "; - color: red; -} -.required_star { - color: red; -} -[% END %] - [% PROCESS global/header.html.tmpl title = "Mozilla Corporation Legal Requests" generate_api_token = 1 - style = inline_style style_urls = [ 'skins/standard/attachment.css', 'skins/custom/create_bug.css' ] javascript_urls = [ 'js/attachment.js', 'js/field.js' ] %] -[% IF NOT user.in_group("mozilla-employee-confidential") - AND NOT user.in_group("mozilla-messaging-confidential") - AND NOT user.in_group("mozilla-foundation-confidential") %] -

Sorry, you do not have access to this page.

- [% PROCESS global/footer.html.tmpl %] - [% RETURN %] -[% END %] +[% IF user.in_group("mozilla-employee-confidential") + OR user.in_group("mozilla-messaging-confidential") + OR user.in_group("mozilla-foundation-confidential") %] + +
MoLegal
[% PROCESS 'bug/create/user-message.html.tmpl' no_bug_guidelines = 1, no_guided_bug_link = 1 %] -

Mozilla Legal

+

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

-

All submissions, and information provided in response to this request, are confidential and - subject to the Attorney-Client Privilege and Work Product Doctrine.

+

Legal [% terms.bugs %] are only visible to the reporter, members of the legal team, and those on the +CC list. This is necessary to maintain attorney-client privilege. Please do not add non- +employees to the cc list.

-

Legal [% terms.bugs %] are only available to the reporter, the cc list, and members of the legal team. - This is to maintain confidentiality and privilege. Non-employees should not be included on legal [% terms.bugs %]. +

All Submissions, And Information Provided In Response To This Request, +Are Confidential And Subject To The Attorney-Client Privilege And Work Product Doctrine.

-

[ * Required Field ]

+

If you are requesting legal review of a new product or service, a new feature of an existing product + or service, or any type of contract, please go + here + to kick-off review of your project. If you are requesting another type of legal action, e.g patent analysis, + trademark misuse investigation, HR issue, or standards work, please use this form.

@@ -72,154 +60,170 @@ label.required:before { - [% IF user.in_group('canconfirm') %] [% END %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [% IF user.in_group('editbugs', product.id) %] - - - - - - - - - - [% END %] +
- - - -
- - - -
- - - -
- - - -
- - - [% INCLUDE global/userselect.html.tmpl - id => "cc" - name => "cc" - size => 60 - classes => ["bz_userfield"] - multiple => 5 - %] -
- - - -
- - - -
- - - -
- - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - -
Request Type: + +
+ Goal: + + Identify the company goal this request maps to.
+ +
+ Priority to your Team: + + +
+ Timeframe for Completion: + + +
+ Summary: + + Include the name of the vendor, partner, product, or other identifier.
+ +
+ CC (optional): + + [% INCLUDE global/userselect.html.tmpl + id => "cc" + name => "cc" + value => cc + size => 60 + multiple => 5 + %] +
+ Name of Other Party: + + If applicable, include full legal entity name, address, and any other relevant contact information.
+ +
+ Business Objective: + + +
+ Description: + + Describe your question, what you want and/or provide any relevant deal terms, restrictions,
+ or provisions that are applicable. Also provide context and background.
+ +
URL (optional): + +
Attachment (this is optional)
+ + + Enter the path to the file on your computer.
+ + +
+ + + Describe the attachment briefly.
+ +
- Please attach any additional information needed for this request. - -
- - - -
- - - -
+
+ +

Thanks for contacting us. You will be notified by email of any progress made in resolving your request.

+[% ELSE %] + +

Sorry, you do not have access to this page.

+ +[% END %] + [% 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 9ec71766b..f02f753a3 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 @@ -211,27 +211,11 @@ custom_forms = { ], "Legal" => [ { - title => 'Mozilla Foundation Vendor Request', - link => 'enter_bug.cgi?product=Mozilla%20Foundation%20Operations', - }, - { - title => 'Mozilla Corporation Vendor Request', - link => 'form.moz.project.review' - }, - { - title => 'Commercial (Partner) Agreement', - link => 'form.moz.project.review' - }, - { - title => 'Independant Contractor Request', - link => 'form.moz.project.review' - }, - { - title => "NDA Request", + title => "NDA Request Form", link => "form.nda", }, { - title => "Name Clearance Request", + title => "Name Clearance Request Form", link => "form.name.clearance", } ], -- cgit v1.2.3-24-g4f1b