From 57584dc4744fea59833ef355f7513690d246c70f Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 4 Oct 2011 18:25:23 -0400 Subject: more porting work --- .../template/en/default/account/create.html.tmpl | 10 +- .../en/default/bug/create/comment-mozreps.txt.tmpl | 81 ------ .../bug/create/comment-remo-budget.txt.tmpl | 64 ----- .../default/bug/create/comment-remo-swag.txt.tmpl | 68 ----- .../default/bug/create/create-brownbag.html.tmpl | 35 +-- .../default/bug/create/create-itrequest.html.tmpl | 27 +- .../default/bug/create/create-mktgevent.html.tmpl | 23 +- .../en/default/bug/create/create-mozlist.html.tmpl | 26 +- .../en/default/bug/create/create-mozpr.html.tmpl | 31 +-- .../en/default/bug/create/create-mozreps.html.tmpl | 204 -------------- .../bug/create/create-presentation.html.tmpl | 4 +- .../bug/create/create-remo-budget.html.tmpl | 248 ----------------- .../default/bug/create/create-remo-swag.html.tmpl | 292 --------------------- .../en/default/bug/create/create-swag.html.tmpl | 30 +-- .../en/default/bug/create/user-message.html.tmpl | 22 +- .../en/default/global/choose-product.html.tmpl | 5 +- .../hook/bug/create/create-guided-form.html.tmpl | 2 +- .../hook/bug/edit-after_custom_fields.html.tmpl | 1 + .../hook/global/header-additional_header.html.tmpl | 2 +- .../user-error-auth_failure_object.html.tmpl | 3 + .../hook/global/user-error-errors.html.tmpl | 19 +- .../auth_failure/permissions.html.tmpl | 2 +- .../default/hook/pages/fields-resolution.html.tmpl | 13 + .../en/default/hook/reports/menu-end.html.tmpl | 6 + .../en/default/list/list.microsummary.tmpl | 3 +- .../template/en/default/list/server-push.html.tmpl | 2 +- .../pages/comment-remo-form-payment.txt.tmpl | 37 --- .../template/en/default/pages/etiquette.html.tmpl | 42 +-- .../en/default/pages/group_admins.html.tmpl | 53 ++++ .../en/default/pages/remo-form-payment.html.tmpl | 243 ----------------- .../en/default/pages/triage_reports.html.tmpl | 6 +- .../en/default/pages/user_activity.html.tmpl | 8 +- 32 files changed, 219 insertions(+), 1393 deletions(-) delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl create mode 100644 extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl create mode 100644 extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl delete mode 100644 extensions/BMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl create mode 100644 extensions/BMO/template/en/default/pages/group_admins.html.tmpl delete mode 100644 extensions/BMO/template/en/default/pages/remo-form-payment.html.tmpl (limited to 'extensions/BMO/template') diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index 275df01f8..47355cf00 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -122,17 +122,17 @@ function onSubmit() {
  1. Please consider reading our - [% terms.bug %] writing guidelines. + bug writing guidelines.
  2. - [% terms.Bugzilla %] is a public place, so what you type and your email address will be visible + Bugzilla is a public place, so what you type and your email address will be visible to all logged-in users. Some people use an alternative email address for this reason.
  3. Please give us an email address you want to use. Once we confirm that it works, - you'll be asked to set a password and then you can start filing [% terms.bugs %] and helping fix them. + you'll be asked to set a password and then you can start filing bugs and helping fix them.
@@ -158,9 +158,9 @@ function onSubmit() {

- If you think there's something wrong with [% terms.Bugzilla %], you can + If you think there's something wrong with Bugzilla, you can send an email to the admins, but - remember, they can't file [% terms.bugs %] for you, or solve tech support problems. + remember, they can't file bugs for you, or solve tech support problems.

[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl deleted file mode 100644 index 6c9d7c6b7..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl +++ /dev/null @@ -1,81 +0,0 @@ -[%# 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 BMO Bugzilla Extension. - # - # The Initial Developer of the Original Code is the Mozilla Foundation - # Portions created by the Initial Developers are Copyright (C) 2011 the - # Initial Developer. All Rights Reserved. - # - # Contributor(s): Byron Jones - #%] -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] -First Name: -[%+ cgi.param('first_name') %] - -Last Name: -[%+ cgi.param('last_name') %] - -Under 18 years old: -[%+ IF cgi.param('underage') %]Yes[% ELSE %]No[% END %] - -Sex: -[%+ cgi.param('sex') %] - -City: -[%+ cgi.param('city') %] - -Country: -[%+ cgi.param('country') %] - -Local Community: -[% IF cgi.param('community') %] -[%+ cgi.param('community') %] -[% ELSE %] -- -[% END %] - -IM: -[% IF cgi.param('im') %] -[%+ cgi.param('im') %] -[% ELSE %] -- -[% END %] - -References: -[% IF cgi.param('references') %] -[%+ cgi.param('references') %] -[% ELSE %] -- -[% END %] - -Currently Involved with Mozilla: -[% IF cgi.param('involved') %] -[%+ cgi.param('involved') %] -[% ELSE %] -- -[% END %] - -Languages Spoken: -[%+ cgi.param('languages') %] - -How did you lean about Mozilla Reps: -[%+ cgi.param('learn') %] - -What motivates you most about joining Mozilla Reps: -[%+ cgi.param('motivation') %] - -Comments: -[% IF cgi.param('comments') %] -[%+ cgi.param('comments') %] -[% ELSE %] -- -[% END %] diff --git a/extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl deleted file mode 100644 index 9486c56fe..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl +++ /dev/null @@ -1,64 +0,0 @@ -[%# 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 Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham - #%] -[%# INTERFACE: - # This template has no interface. - # - # Form variables from a bug submission (i.e. the fields on a template from - # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to - # pull out various custom fields and format an initial Description entry - # from them. - #%] -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -Requester info: - -Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] -Wiki user profile: [% cgi.param('wikiprofile') %] -Event wiki page: [% cgi.param('wikipage') %] -Advance payment needed: [% IF cgi.param('advancepayment') %]Yes[% ELSE %]No[% END %] - -Budget breakdown: - -Total amount requested in $USD: [% cgi.param('budgettotal') %] -Costs per service: -Service 1: [% cgi.param('service1') %] Cost: [% cgi.param('cost1') %] -Service 2: [% cgi.param('service2') %] Cost: [% cgi.param('cost2') %] -Service 3: [% cgi.param('service3') %] Cost: [% cgi.param('cost3') %] -Service 4: [% cgi.param('service4') %] Cost: [% cgi.param('cost4') %] -Service 5: [% cgi.param('service5') %] Cost: [% cgi.param('cost5') %] - -Additional costs: (add comment box) -[% cgi.param('costadditional') %] - -Success measurement: - -How will the event help push the Mozilla project forward? -[%+ cgi.param('successmeasure') %] - -Metric 1: [% cgi.param('metric1') %] Success scenario: [% cgi.param('success1') %] -Metric 2: [% cgi.param('metric2') %] Success scenario: [% cgi.param('success2') %] -Metric 3: [% cgi.param('metric3') %] Success scenario: [% cgi.param('success3') %] - -Additional information: -[%+ cgi.param('successadditional') %] - -[%+ cgi.param("comment") IF cgi.param("comment") %] - diff --git a/extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl deleted file mode 100644 index 0b98178b2..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl +++ /dev/null @@ -1,68 +0,0 @@ -[%# 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 Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham - #%] -[%# INTERFACE: - # This template has no interface. - # - # Form variables from a bug submission (i.e. the fields on a template from - # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to - # pull out various custom fields and format an initial Description entry - # from them. - #%] -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -Requester info: - -Requester name: [% cgi.param('firstname') %][% " " %][% cgi.param('lastname') %] -Wiki user profile: [% cgi.param('wikiprofile') %] -Event wiki page: [% cgi.param('wikipage') %] -Estimated Attendance: [% cgi.param('attendance') %] - -Shipping details: - -Ship swag before: [% cgi.param('shipdate') %] - -[%+ cgi.param("shiptofirstname") +%] [%+ cgi.param("shiptolastname") +%] -[%+ cgi.param("shiptoaddress") +%] -[%+ cgi.param("shiptoaddress2") +%] -[%+ cgi.param("shiptocity") +%] [%+ cgi.param("shiptostate") +%] [%+ cgi.param("shiptopcode") +%] -[%+ cgi.param("shiptocountry") %] - -Phone: [% cgi.param("shiptophone") %] -[%+ IF cgi.param("shiptoidrut") %]Personal ID/RUT: [% cgi.param("shiptoidrut") %][% END %] - -Addition information for delivery person: -[%+ cgi.param('shipadditional') %] - -Swag requested: - -Stickers: [% IF cgi.param('stickers') %]Yes[% ELSE %]No[% END %] -Buttons: [% IF cgi.param('buttons') %]Yes[% ELSE %]No[% END %] -Posters: [% IF cgi.param('posters') %]Yes[% ELSE %]No[% END %] -Lanyards: [% IF cgi.param('lanyards') %]Yes[% ELSE %]No[% END %] -T-shirts: [% IF cgi.param('tshirts') %]Yes[% ELSE %]No[% END %] -Roll-up banners: [% IF cgi.param('rollupbanners') %]Yes[% ELSE %]No[% END %] -Horizontal banners: [% IF cgi.param('horizontalbanners') %]Yes[% ELSE %]No[% END %] -Booth cloth: [% IF cgi.param('boothcloth') %]Yes[% ELSE %]No[% END %] -Pens: [% IF cgi.param('pens') %]Yes[% ELSE %]No[% END %] -Other: [% IF cgi.param('otherswag') %][% cgi.param('otherswag') %][% ELSE %]No[% END %] - -[%+ cgi.param("comment") IF cgi.param("comment") %] - diff --git a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl index 72d520dd4..e4c6cabfb 100644 --- a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl @@ -80,17 +80,16 @@ function trySubmit() {
- - - - - - - - - - - + + + + + + + + + + @@ -98,6 +97,7 @@ function trySubmit() { + @@ -146,7 +146,7 @@ function trySubmit() { - + @@ -171,14 +171,14 @@ function trySubmit() { - - + + - - + + @@ -198,11 +198,12 @@ function trySubmit() { -
Archive this?Archive this?
Need IT to help run A/V?Need IT to help run A/V?
: Please briefly describe the brownbag and any specific needs you might have.
+
+
diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl index d2f30475d..08207fd8c 100644 --- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl @@ -32,7 +32,7 @@ [% USE Bugzilla %]

Please use this form for IT requests only!

-

If you have a [% terms.bug %] to file, go here.

+

If you have a bug to file, go here.

@@ -75,12 +75,12 @@ @@ -96,13 +96,16 @@
-
- +
+
- -
+ +
+ +

+ Mailing list requests should be filed here instead. @@ -169,7 +172,7 @@
- +
(please uncheck this box if it isn't)

diff --git a/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl index 92354eac3..d6b6c188f 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl @@ -91,18 +91,19 @@ function validateAndSubmit() { - - - - - - - - - - - + + + + + + + + + + + + @@ -287,7 +287,7 @@
First Name: * diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl index 0a2edb5ee..138f1754b 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl @@ -88,21 +88,21 @@ var listName = document.getElementById('listName').value; var listAdmin = document.getElementById('listAdmin').value; var listTypeRadio = document.getElementsByName('listType'); - var listType = ""; + var listType = ""; - for (var i = 0; i < listTypeRadio.length; i++) { - if (listTypeRadio[i].checked) { - listType = listTypeRadio[i].value; - } - } + for (var i = 0; i < listTypeRadio.length; i++) { + if (listTypeRadio[i].checked) { + listType = listTypeRadio[i].value; + } + } var alert_text = ""; var short_desc = ""; - if (listType) { + if (listType) { if (listType == "lists.mozilla.org") { document.getElementById('component').value = "Discussion Forums"; - short_desc = "Discussion Forum: " + listName; + short_desc = "Discussion Forum: " + listName; } else if (listType == "mozilla.com" ) { document.getElementById('component').value = "Server Operations: Desktop Issues"; short_desc = "[Zimbra Distribution List Request] " + listName + "@" + listType; @@ -112,7 +112,7 @@ } } else { alert_text += "Please select a list type\n"; - } + } if (!isFilledOut('listName')) { alert_text += "Please enter the list name\n"; @@ -127,7 +127,7 @@ return false; } - document.getElementById('short_desc').value = short_desc; + document.getElementById('short_desc').value = short_desc; return true; } @@ -220,8 +220,8 @@
Note:The list administrator is also initially considered to be the list moderator and will be responsible for moderation tasks unless delegated to someone else. For - convenience, [% terms.Bugzilla %] user accounts will autocomplete. The administrator is not required - to have a [% terms.Bugzilla %] account, and you can enter an address that doesn't autocomplete if + convenience, Bugzilla user accounts will autocomplete. The administrator is not required + to have a Bugzilla account, and you can enter an address that doesn't autocomplete if necessary.
- - - + + + @@ -335,18 +333,17 @@ TUI_hide_default('expert_fields'); %] - [% IF product.flag_types.bug.size > 0 %] + [% IF product.flag_types(is_active=>1).bug.size > 0 %] [% display_flag_headers = 0 %] [% any_flags_requesteeble = 0 %] - [% FOREACH flag_type = product.flag_types.bug %] - [% NEXT UNLESS flag_type.is_active %] + [% FOREACH flag_type = product.flag_types(is_active=>1).bug %] [% display_flag_headers = 1 %] [% SET any_flags_requesteeble = 1 IF flag_type.is_requestable && flag_type.is_requesteeble %] [% END %] [% IF display_flag_headers %] - [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug + [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types(is_active=>1).bug any_flags_requesteeble = any_flags_requesteeble flag_table_id = "bug_flags" %] @@ -469,7 +466,7 @@ TUI_hide_default('expert_fields'); [% defaultcontent = BLOCK %] [% IF cloned_bug_id %] -+++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id FILTER html %] +++ ++++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id %] +++ [% END %] @@ -526,7 +523,7 @@ TUI_hide_default('expert_fields'); Add an attachment [% PROCESS attachment/createformcontents.html.tmpl - flag_types = product.flag_types.attachment + flag_types = product.flag_types(is_active=>1).attachment any_flags_requesteeble = 1 flag_table_id ="attachment_flags" %]
@@ -555,7 +552,7 @@ TUI_hide_default('expert_fields'); Status Whiteboard: + value="[% status_whiteboard %]"> @@ -592,10 +589,10 @@ TUI_hide_default('expert_fields'); [% FOREACH g = group %]      - -
+
[% END %] diff --git a/extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl deleted file mode 100644 index 914e1f54d..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl +++ /dev/null @@ -1,204 +0,0 @@ -[%# 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 BMO Bugzilla Extension. - # - # The Initial Developer of the Original Code is the Mozilla Foundation - # Portions created by the Initial Developers are Copyright (C) 2011 the - # Initial Developer. All Rights Reserved. - # - # Contributor(s): Byron Jones - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% PROCESS global/header.html.tmpl - title = "Mozilla Reps - Application Form" - style_urls = [ "extensions/BMO/web/styles/moz_reps.css" ] -%] - -[% USE Bugzilla %] -[% mandatory = '*' %] - - - - - -

Mozilla Reps - Application Form

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
First Name:[% mandatory FILTER html %]
Last Name:[% mandatory FILTER html %]
Are you under 18 years old?:
Sex:[% mandatory FILTER html %] - -
City:[% mandatory FILTER html %]
Country:[% mandatory FILTER html %]
Local Community you participate in:
IM (specify service):
- References: -
- -
- How are you involved with Mozilla? -
- -
Languages Spoken:[% mandatory FILTER html %]
How did you learn about Mozilla Reps?[% mandatory FILTER html %]
What motivates you most about joining Mozilla Reps?[% mandatory FILTER html %]
Comments:
- I have read the - Mozilla Privacy Policy:[% mandatory FILTER html %] -
 
- - - -[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl index 584b14912..cdbce5c8c 100644 --- a/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl @@ -86,7 +86,7 @@ function trySubmit() { - + @@ -142,7 +142,7 @@ function trySubmit() { - + diff --git a/extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl deleted file mode 100644 index 0aa18e41d..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl +++ /dev/null @@ -1,248 +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): Reed Loden - # David Tran - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% PROCESS global/header.html.tmpl - title = "Mozilla Reps Budget Request Form" - style_urls = [ 'extensions/BMO/web/styles/moz_reps.css' ] - javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', - 'js/util.js', - 'js/field.js' ] -%] - -

These requests will only be visible to the person who submitted the request, -any persons designated in the CC line, and authorized members of the Mozilla -Rep team.

- - - -

Mozilla Reps - Budget Request Form

- -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
First Name: * - -
Last Name: * - -
Wiki user profile:* - -
Event wiki page: * - -
  
- Is advance payment needed? - - -
  
- Budget breakdown:
- Total amount requested in $USD: * -
- Costs per service: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Service 1: *Cost 1: *
Service 2:Cost 2:
Service 3:Cost 3:
Service 4:Cost 4:
Service 5:Cost 5:
- Additional costs:
- -
  
- Success measurement:
- How will the event help push the Mozilla project forward? - *
- - - - - - - - - - - - - - -
Metric 1: * - Success scenario: * -
Metric 2: - Success scenario: -
Metric 3: - Success scenario: -
- Additional information:
- -
  - -
- - - -

- * - Required field
- Thanks for contacting us. -

- -[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl deleted file mode 100644 index 0b15240fd..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl +++ /dev/null @@ -1,292 +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): Reed Loden - # David Tran - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% PROCESS global/header.html.tmpl - title = "Mozilla Reps Swag Request Form" - javascript_urls = [ 'extensions/BMO/web/js/swag.js', - 'extensions/BMO/web/js/form_validate.js', - 'js/field.js', - 'js/util.js' ] - style_urls = [ "extensions/BMO/web/styles/moz_reps.css", - "skins/custom/calendar.css" ] - yui = [ 'calendar' ] -%] - -

These requests will only be visible to the person who submitted the request, -any persons designated in the CC line, and authorized members of the Mozilla Rep team.

- - - -

Mozilla Reps - Swag Request Form

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
First Name: * - -
Last Name: * - -
Wiki User Profile: * - -
Event Wiki Page: * - -
Estimated Attendance: * - -
  
Shipping Details:
Ship Before: - - - -
-
First Name: *
Last Name: *
Address: *
Address 2:
City: *
State:
Country: *
Postal Code: *
Contact Number: *
Personal ID/RUT:
(if your country requires this)
- Addition information for delivery person:
- -
  
Swag Requested:
Stickers:
Buttons:
Posters:
Lanyards:
T-Shirts:
Roll-Up Banners:
Horizontal Banner:
Booth Cloth:
Pens:
Other: (please specify)
  - -
- -

- Quantities of different swag items requested that will actually be shipped - depend on stock availability and number of attendees. Mozilla cannot guarantee - that all items requested will be in stock at the time of shipment and you will - be notified in case an item cannot be shipped. Please request swag at least 1 - month before desired delivery date. -

- -

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

- - - -[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl index b2698ae72..f7edccbe1 100644 --- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl @@ -34,7 +34,7 @@

Swag Request: Please use this form to file a request for swag.

    -
  1. You first need submit a Event Request Form. You'll be asked for the [% terms.bug %] number below.
    2. +
  2. You first need submit a Event Request Form. You'll be asked for the bug number below.
  3. Complete and submit request below.
  4. Your request will be reviewed by the appropriate person in the Engagement team.
  5. Your swag request will be reviewed and if approved shipped to you from @@ -70,7 +70,7 @@ function validateAndSubmit() { var alert_text = ''; if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n"; if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n"; - if(!isFilledOut('dependson')) alert_text += "Please enter the [% terms.bug %] number for your Event Request Form\n"; + if(!isFilledOut('dependson')) alert_text += "Please enter the bug number for your Event Request Form\n"; if(!isValidEmail(document.getElementById('email').value)) alert_text += "Please enter a valid email address\n"; //Everything required is filled out..try to submit the form! @@ -88,25 +88,25 @@ function validateAndSubmit() { - - - - - - - - - - - + + + + + + + + + + + + - - + 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 70a51b9ab..e7cea5d2b 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 @@ -62,9 +62,9 @@ the full product list.

    The product you have chosen is for [% terms.bug %] reports and enhancement requests for the -[% terms.Bugzilla %] [% terms.bug %] tracking software only. -If your [% terms.bug %] is not reporting that [% terms.Bugzilla %] is broken or that you'd like -a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belong in this product. +Bugzilla [% terms.bug %] tracking software only. +If your [% terms.bug %] is not reporting that Bugzilla is broken or that you'd like +a new feature in Bugzilla, your [% terms.bug %] report does not belong in this product. [% IF format == "guided" %] See the instructions next to the stop sign above. [% ELSE %] @@ -72,22 +72,22 @@ a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belo [% END %]

    -

    We WILL NOT accept [% terms.bug %] reports for [% terms.Bugzilla %] -installed via the Debian packaging system. If you obtained [% terms.Bugzilla %] from Debian, +

    We WILL NOT accept [% terms.bug %] reports for Bugzilla +installed via the Debian packaging system. If you obtained Bugzilla from Debian, please visit the Debian Support page, -or file a [% terms.bug %] on the Debian -[% terms.Bug %] Tracker. The Debian package maintainer will then determine whether the [% terms.bug %] -is specific to the package or not, and can move the [% terms.bug %] "upstream" if needed.

    +or file a bug on the Debian +Bug Tracker. The Debian package maintainer will then determine whether the bug +is specific to the package or not, and can move the bug "upstream" if needed.

    -[% terms.Bugs %] specific to bugzilla.mozilla.org, rather than the [% terms.Bugzilla %] software in +Bugs specific to bugzilla.mozilla.org, rather than the Bugzilla software in general (which is used by many sites), should be filed in the mozilla.org product.

    Please do not file test [% terms.bugs %] or support requests here! You -can test [% terms.Bugzilla %] at +can test Bugzilla at landfill.bugzilla.org and ask for support in the @@ -106,7 +106,7 @@ support-bugzilla@lists.mozilla.org mailing list, or [% UNLESS cloned_bug_id %] Consider using the -[% terms.Bugzilla %] Helper instead of this form. +Bugzilla Helper instead of this form. [% END +%] Before reporting a [% terms.bug %], make sure you've read our diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl index c957edca7..a65605a93 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -42,8 +42,7 @@

    -

    Looking for technical support or help getting your site to work with Mozilla? Visit the -mozilla.org support page before filing [% terms.bugs %].

    +

    Looking for technical support or help getting your site to work with Mozilla? Visit the mozilla.org support page before filing bugs.

    @@ -147,7 +146,7 @@ mozilla.org support page before filing [% terms.bugs %].


    [% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %] -

    You can choose to get this screen by default when you click "New [% terms.Bug %]" by changing your preferences.

    +

    You can choose to get this screen by default when you click "New Bug" by changing your preferences.

    [% END %] [% END %]
    diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl index 5b58a9637..ee88aac7c 100644 --- a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl @@ -1,4 +1,4 @@ - + diff --git a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl index ba6eeb78c..0c68d8e72 100644 --- a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl @@ -49,6 +49,7 @@ [% FOREACH field = Bugzilla.active_custom_fields %] [% NEXT IF NOT user.id AND field.value == "---" %] [% NEXT IF cf_hidden_in_product(field.name, bug.product, bug.component, 2) %] + [% NEXT IF cf_flag_disabled(field.name, bug) %] [% custom_flags.push(field.name) %] diff --git a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl index 05276d5f7..0277f3e7e 100644 --- a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl @@ -21,7 +21,7 @@ [% IF bug %] - + [% END %]
    First Name: *
    Last Name: * @@ -143,7 +143,7 @@ function validateAndSubmit() {
    [% terms.Bug %] number assigned to previously-   
    submitted Event Request Form: *    		Bug number assigned to previously-   
    submitted Event Request Form: *
    Security