diff options
Diffstat (limited to 'extensions/BMO/template/en/default/bug/create')
14 files changed, 100 insertions, 1055 deletions
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 <glob@mozilla.com> - #%] -[% 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 <gerv@gerv.net> - #%] -[%# 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 <gerv@gerv.net> - #%] -[%# 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() { <form method="post" action="post_bug.cgi" id="brownbagRequestForm" enctype="multipart/form-data" onSubmit="return trySubmit();"> - <input type="hidden" name="product" value="mozilla.org"> - <input type="hidden" name="component" value="Server Operations: Desktop Issues"> - <input type="hidden" name="rep_platform" value="All"> - <input type="hidden" name="op_sys" value="Other"> - <input type="hidden" name="priority" value="--"> - <input type="hidden" name="version" value="other"> - <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> - <input type="hidden" name="comment" id="comment" value=""> - <input type="hidden" name="short_desc" id="short_desc" value=""> - <input type="hidden" name="groups" value="mozilla-corporation-confidential"> - + <input type="hidden" name="product" value="mozilla.org"> + <input type="hidden" name="component" value="Server Operations: Desktop Issues"> + <input type="hidden" name="rep_platform" value="All"> + <input type="hidden" name="op_sys" value="Other"> + <input type="hidden" name="priority" value="--"> + <input type="hidden" name="version" value="other"> + <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> + <input type="hidden" name="comment" id="comment" value=""> + <input type="hidden" name="short_desc" id="short_desc" value=""> + <input type="hidden" name="groups" value="mozilla-corporation-confidential"> <table> <tr> @@ -98,6 +97,7 @@ function trySubmit() { <td> <input type="text" name="presenter" id="presenter" value="" size="60" /> </td> + </tr> <tr> @@ -146,7 +146,7 @@ function trySubmit() { <option value="AM" selected>AM</option> <option value="PM">PM</option> </select> - </td> + </td> </tr> <tr> @@ -171,14 +171,14 @@ function trySubmit() { </tr> <tr> - <td align="right"><strong>Archive this?</strong></td> - <td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td> +<td align="right"><strong>Archive this?</strong></td> +<td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td> </tr> <tr> - <td align="right"><strong>Need IT to help run A/V?</strong></td> - <td align="left"><input type="checkbox" name="ithelp" id="ithelp" value="yes" checked></td> +<td align="right"><strong>Need IT to help run A/V?</strong></td> +<td align="left"><input type="checkbox" name="ithelp" id="ithelp" value="yes" checked></td> </tr> <tr> @@ -198,11 +198,12 @@ function trySubmit() { <th><label for="description">Description</label>:</th> <td> <em>Please briefly describe the brownbag and any specific needs you might have.</em><br> + <textarea id="description" name="description" rows="10" cols="80"></textarea> </td> </tr> -</table> + </table> <br> <input type="submit" id="commit" value="Submit Request"> 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 %] <p><strong>Please use this form for IT requests only!</strong></p> -<p>If you have a [% terms.bug %] to file, go <a href="enter_bug.cgi">here</a>.</p> +<p>If you have a bug to file, go <a href="enter_bug.cgi">here</a>.</p> <form method="post" action="post_bug.cgi" id="itRequestForm" enctype="multipart/form-data"> <input type="hidden" name="product" value="mozilla.org"> @@ -75,12 +75,12 @@ <td> <select id="bug_severity" name="bug_severity" onchange="setsevdesc(this)"> - <option value="blocker">All work stops until this is done</option> - <option value="critical">As soon as possible (urgent)</option> - <option value="major">Within 24 hours</option> - <option value="normal">Within the next week</option> - <option value="minor" selected="selected">No rush</option> - <option value="trivial">Whenever you get around to it</option> + <option value="blocker">All work for IT stops until this is done</option> + <option value="critical">IT should work on it soon as possible (urgent)</option> + <option value="major">IT should get to it within 24 hours</option> + <option value="normal">IT should get to it within the next week</option> + <option value="minor" selected="selected">No rush, but hopefully IT can get to it soon</option> + <option value="trivial">Whenever IT can get around to it</option> <option value="enhancement">This is just an idea, filing it so we don't forget</option> </select> </td> @@ -96,13 +96,16 @@ <input type="radio" name="component" id="componentac" onclick="setcompdesc(this)" value="Server Operations: Account Requests"> <label for="componentac">Request an LDAP/E-mail/etc. account</label><br> <input type="radio" name="component" id="componentmvd" onclick="setcompdesc(this)" value="Server Operations: Desktop Issues"> - <label for="componentmvd">Desktop/Laptop/Printer/Phone problem/order/request</label><br> - <input type="radio" name="component" id="componenttbm" onclick="setcompdesc(this)" value="Server Operations: Tinderbox Maintenance"> + <label for="componentmvd">Desktop/Laptop/Printer/Phone/Tablet/License problem/order/request</label><br> + <input type="radio" name="component" id="componenttbm" onclick="setcompdesc(this)" value="Server Operations: RelEng"> <label for="componenttbm">Report a problem with a tinderbox machine</label><br> - <input type="radio" name="component" id="componentwcp" onclick="setcompdesc(this)" value="Server Operations: Web Content Push"> - <label for="componentwcp">Deploy a change to a production website</label><br> + <input type="radio" name="component" id="componentwcp" onclick="setcompdesc(this)" value="Server Operations: Web Operations"> + <label for="componentwcp">Report a problem with a Mozilla website, or to request a change or push</label><br> + <input type="radio" name="component" id="componentacl" onclick="setcompdesc(this)" value="Server Operations: ACL Request"> + <label for="componentacl">Request a firewall change</label><br> <input type="radio" name="component" id="componentso" onclick="setcompdesc(this)" value="Server Operations"> <label for="componentso">Any other issue</label><br> + Mailing list requests should be filed <a href="[% ulrbase FILTER none %]enter_bug.cgi?product=mozilla.org&format=mozlist">here</a> instead. </td> <td id="compdescription" align="left" style="color: green; padding-left: 1em"> </td> @@ -169,7 +172,7 @@ </table> <br> - <!-- infra [% terms.bugs %] --> + <!-- infra bugs --> <input type="checkbox" name="groups" id="groups" value="infra" checked="checked"><label for="groups"><strong>This is an internal issue which should not be publicly visible.</strong></label><br>(please uncheck this box if it isn't) <br><br> 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() { <form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data" onSubmit="return validateAndSubmit();"> - <input type="hidden" name="format" value="mktgevent"> - <input type="hidden" name="product" value="Marketing"> - <input type="hidden" name="component" value="Event Requests"> - <input type="hidden" name="rep_platform" value="All"> - <input type="hidden" name="op_sys" value="Other"> - <input type="hidden" name="priority" value="--"> - <input type="hidden" name="version" value="unspecified"> - <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> - <input type="hidden" name="short_desc" id="short_desc" value=""> - <input type="hidden" name="groups" value="mozilla-corporation-confidential"> - + <input type="hidden" name="format" value="mktgevent"> + <input type="hidden" name="product" value="Marketing"> + <input type="hidden" name="component" value="Event Requests"> + <input type="hidden" name="rep_platform" value="All"> + <input type="hidden" name="op_sys" value="Other"> + <input type="hidden" name="priority" value="--"> + <input type="hidden" name="version" value="unspecified"> + <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> + + <input type="hidden" name="short_desc" id="short_desc" value=""> + <input type="hidden" name="groups" value="mozilla-corporation-confidential"> <table> + <tr> <td align="right"><strong>First Name: <span style="color: red;">*</span></strong></td> <td align="left"> 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 @@ <br> <b>Note:</b>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.<hr /> </td> </tr> @@ -287,7 +287,7 @@ <br> <div id="groups" style="display:none;"> - <!-- infra [% terms.bugs %] --> + <!-- infra bugs --> <input type="checkbox" name="groups" id="group_35" value="infra" disabled="true"> <label for="group_35"><strong>This is an internal issue which should not be publicly visible.</strong></label> <br><br> diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl index 5b4cbf999..28a37a31e 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl @@ -57,12 +57,10 @@ var flags = new Array([% product.components.size %]); comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]"; initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]"; [% flag_list = [] %] - [% FOREACH f = c.flag_types.bug %] - [% NEXT UNLESS f.is_active %] + [% FOREACH f = c.flag_types(is_active=>1).bug %] [% flag_list.push(f.id) %] [% END %] - [% FOREACH f = c.flag_types.attachment %] - [% NEXT UNLESS f.is_active %] + [% FOREACH f = c.flag_types(is_active=>1).attachment %] [% flag_list.push(f.id) %] [% END %] flags[[% count %]] = [[% flag_list.join(",") FILTER js %]]; @@ -301,9 +299,9 @@ TUI_hide_default('expert_fields'); </td> </tr> </table> - <input type="hidden" name="bug_severity" value="[% default.bug_severity FILTER html %]"> - <input type="hidden" name="rep_platform" value="[% default.rep_platform FILTER html %]"> - <input type="hidden" name="op_sys" value="[% default.op_sys FILTER html %]"> + <input type="hidden" name="bug_severity" value="[% default.bug_severity %]"> + <input type="hidden" name="rep_platform" value="[% default.rep_platform %]"> + <input type="hidden" name="op_sys" value="[% default.op_sys %]"> <input type="hidden" name="version" value="unspecified"> </td> </tr> @@ -335,18 +333,17 @@ TUI_hide_default('expert_fields'); %] <td rowspan="[% num_rows FILTER html %]"> - [% 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'); <td colspan="3"> [% 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'); <legend>Add an attachment</legend> <table class="attachment_entry"> [% 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" %] </table> @@ -555,7 +552,7 @@ TUI_hide_default('expert_fields'); <th>Status Whiteboard:</th> <td colspan="3"> <input id="status_whiteboard" name="status_whiteboard" size="70" - value="[% status_whiteboard FILTER html %]"> + value="[% status_whiteboard %]"> </td> </tr> <tr> @@ -592,10 +589,10 @@ TUI_hide_default('expert_fields'); <!-- Checkboxes --> [% FOREACH g = group %] - <input type="checkbox" id="bit-[% g.bit FILTER html %]" - name="bit-[% g.bit FILTER html %]" value="1" + <input type="checkbox" id="bit-[% g.bit %]" + name="bit-[% g.bit %]" value="1" [% " checked=\"checked\"" IF g.checked %]> - <label for="bit-[% g.bit FILTER html %]">[% g.description FILTER html_light %]</label><br> + <label for="bit-[% g.bit %]">[% g.description FILTER html_light %]</label><br> [% END %] </td> </tr> 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 <glob@mozilla.com> - #%] - -[% 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 = '<span class="mandatory" title="Required">*</span>' %] - -<script type="text/javascript"> -var Dom = YAHOO.util.Dom; - -function mandatory(ids) { - result = true; - for (i in ids) { - id = ids[i]; - el = Dom.get(id); - - if (el.type.toString() == "checkbox") { - value = el.checked; - } else { - value = el.value.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); - el.value = value; - } - - if (value == '') { - Dom.addClass(id, 'missing'); - result = false; - } else { - Dom.removeClass(id, 'missing'); - } - } - return result; -} - -function submitForm() { - if (!mandatory([ 'first_name', 'last_name', 'sex', 'city', 'country', - 'languages', 'learn', 'motivation', 'privacy' ]) - ) { - alert('Please enter all the required fields.'); - return false; - } - - Dom.get('short_desc').value = - "Application Form: " + Dom.get('first_name').value + ' ' + Dom.get('last_name').value; - - return true; -} - -</script> - -<noscript> -<h1>Javascript is required to use this form.</h1> -</noscript> - -<h1>Mozilla Reps - Application Form</h1> - -<form method="post" action="post_bug.cgi" id="tmRequestForm"> -<input type="hidden" name="product" value="Mozilla Reps"> -<input type="hidden" name="component" value="Mentorship"> -<input type="hidden" name="bug_severity" value="normal"> -<input type="hidden" name="rep_platform" value="All"> -<input type="hidden" name="priority" value="--"> -<input type="hidden" name="op_sys" value="Other"> -<input type="hidden" name="version" value="unspecified"> -<input type="hidden" name="groups" value="mozilla-reps"> -<input type="hidden" name="format" value="[% format FILTER html %]"> -<input type="hidden" name="created-format" value="[% format FILTER html %]"> -<input type="hidden" name="comment" id="comment" value=""> -<input type="hidden" name="short_desc" id="short_desc" value=""> - -<table id="reps-form"> - -<tr class="odd"> - <th>First Name:[% mandatory FILTER html %]</th> - <td><input id="first_name" name="first_name" size="40" placeholder="John"></td> -</tr> - -<tr class="even"> - <th>Last Name:[% mandatory FILTER html %]</th> - <td><input id="last_name" name="last_name" size="40" placeholder="Doe"></td> -</tr> - -<tr class="odd"> - <th>Are you under 18 years old?:</th> - <td><input type="checkbox" id="underage" name="underage" value="1"></td> -</tr> - -<tr class="even"> - <th>Sex:[% mandatory FILTER html %]</th> - <td> - <select id="sex" name="sex"> - <option value="Male">Male</option> - <option value="Female">Female</option> - <option value="Other">Other</option> - </select> - </td> -</tr> - -<tr class="odd"> - <th>City:[% mandatory FILTER html %]</th> - <td><input id="city" name="city" size="40" placeholder="Your city"></td> -</tr> - -<tr class="even"> - <th>Country:[% mandatory FILTER html %]</th> - <td><input id="country" name="country" size="40" placeholder="Your country"></td> -</tr> - -<tr class="odd"> - <th>Local Community you participate in:</th> - <td><input id="community" name="community" size="40" placeholder="Name of your community"></td> -</tr> - -<tr class="even"> - <th>IM (specify service):</th> - <td><input id="im" name="im" size="40"></td> -</tr> - -<tr class="odd"> - <th colspan="2"> - References: - </th> -</tr> -<tr class="odd"> - <td colspan="2"> - <textarea id="references" name="references" rows="4" - placeholder="Add contact info of people referencing you."></textarea> - </td> -</tr> - -<tr class="even"> - <th colspan="2"> - How are you involved with Mozilla? - </th> -</tr> -<tr class="even"> - <td colspan="2"> - <textarea id="involved" name="involved" rows="4" placeholder="Add-ons, l10n, SUMO, QA, ..."></textarea> - </td> -</tr> - -<tr class="odd"> - <th>Languages Spoken:[% mandatory FILTER html %]</th> - <td><input id="languages" name="languages" size="40"></td> -</tr> - -<tr class="even"> - <th>How did you learn about Mozilla Reps?[% mandatory FILTER html %]</th> - <td><input id="learn" name="learn" size="40"></td> -</tr> - -<tr class="odd"> - <th colspan="2">What motivates you most about joining Mozilla Reps?[% mandatory FILTER html %]</th> -</tr> -<tr class="odd"> - <td colspan="2"><textarea id="motivation" name="motivation" rows="4"></textarea></td> -</tr> - -<tr class="even"> - <th colspan="2">Comments:</th> -</tr> -<tr class="even"> - <td colspan="2"><textarea id="comments" name="comments" rows="4"></textarea></td> -</tr> - -<tr class="odd"> - <th> - I have read the - <a href="http://www.mozilla.com/en-US/privacy-policy" target="_blank">Mozilla Privacy Policy</a>:[% mandatory FILTER html %] - </th> - <td><input id="privacy" type="checkbox"></td> -</tr> - -<tr class="even"> - <td> </td> - <td align="right"><input type="submit" value="Submit" onclick="return submitForm()"></td> -</tr> - -</table> - -</form> - -[% 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() { <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> <input type="hidden" name="comment" id="comment" value=""> <input type="hidden" name="short_desc" id="short_desc" value=""> - <input type="hidden" name="groups" value="mozilla-corporation-confidential"> + <input type="hidden" name="groups" value="mozilla-corporation-confidential"> <table> <tr> @@ -142,7 +142,7 @@ function trySubmit() { <option value="AM" selected>AM</option> <option value="PM">PM</option> </select> - </td> + </td> </tr> <tr> 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 <reed@mozilla.com> - # David Tran <dtran@mozilla.com> - #%] - -[% 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' ] -%] - -<p>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.</p> - -<script language="javascript" type="text/javascript"> -function trySubmit() { - var firstname = document.getElementById('firstname').value; - var lastname = document.getElementById('lastname').value; - var wikipage = document.getElementById('wikipage').value; - var shortdesc = 'Budget Request - ' + firstname + ' ' + lastname + ' - ' + wikipage; - document.getElementById('short_desc').value = shortdesc; - return true; -} - -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('wikiprofile')) alert_text += "Please enter a wiki user profile.\n"; - if(!isFilledOut('wikipage')) alert_text += "Please enter a wiki page address.\n"; - if(!isFilledOut('successmeasure')) alert_text += "Please enter how you will measure the success of the event.\n"; - if(!isFilledOut('budgettotal')) alert_text += "Please enter the total budget for the event.\n"; - if(!isFilledOut('service1') || !isFilledOut('cost1')) alert_text += "Please enter at least one service and cost value.\n"; - if(!isFilledOut('metric1') || !isFilledOut('success1')) alert_text += "Please enter at least one metric and success scenario.\n"; - - //Everything required is filled out..try to submit the form! - if(alert_text == '') { - return trySubmit(); - } - - //alert text, stay here on the pagee - alert(alert_text); - return false; -} - -function togglePaymentInfo (e) { - var div = document.getElementById('paymentinfo'); - if (e.checked == true) { - div.style.display = 'block'; - } - else { - div.style.display = 'none'; - } -} - -</script> - -<h1>Mozilla Reps - Budget Request Form</h1> - -<form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data" - onSubmit="return validateAndSubmit();"> - - <input type="hidden" name="format" value="remo-budget"> - <input type="hidden" name="product" value="Mozilla Reps"> - <input type="hidden" name="component" value="Budget Requests"> - <input type="hidden" name="rep_platform" value="All"> - <input type="hidden" name="op_sys" value="Other"> - <input type="hidden" name="priority" value="--"> - <input type="hidden" name="version" value="unspecified"> - <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> - <input type="hidden" name="short_desc" id="short_desc" value=""> - <input type="hidden" name="groups" value="mozilla-reps"> - -<table id="reps-form"> - -<tr class="odd"> - <td><strong>First Name: <span style="color: red;">*</span></strong></td> - <td> - <input type="text" name="firstname" id="firstname" value="" size="40" placeholder="John"> - </td> -</tr> - -<tr class="even"> - <td><strong>Last Name: <span style="color: red;">*</span></strong></td> - <td> - <input type="text" name="lastname" id="lastname" value="" size="40" placeholder="Doe"> - </td> -</tr> - -<tr class="odd"> - <td><strong>Wiki user profile:<span style="color: red;">*</span></strong></td> - <td> - <input type="text" name="wikiprofile" id="wikiprofile" value="" size="40" placeholder="JohnDoe"> - </td> -</tr> - -<tr class="even"> - <td><strong>Event wiki page: <span style="color: red;">*</span></strong></td> - <td> - <input type="text" name="wikipage" id="wikipage" value="" size="40" placeholder="http://wiki.mozilla.org/JohnDoe"> - </td> -</tr> - -<tr class="odd"> - <td><!--spacer--> </td> - <td><!--spacer--> </td> -</tr> - -<tr class="even"> - <td colspan="2"> - <strong>Is advance payment needed?</strong> - <input type="checkbox" name="advancepayment" id="advancepayment" value="1" - onchange="togglePaymentInfo(this);"> - <div id="paymentinfo" style="display:none;"> - Please send an email to William at mozilla.com with all the information below:<br> - <br> - Payment information:<br> - Bank name:<br> - Bank address: <br> - IBAN:<br> - Swift code/BIC:<br> - Additional bank details (if necessary): - </div> - </td> -</tr> - -<tr class="odd"> - <td><!--spacer--> </td> - <td><!--spacer--> </td> -</tr> - -<tr class="even"> - <td colspan="2"> - <strong>Budget breakdown:</strong><br> - Total amount requested in $USD: <span style="color: red;">*</span> - <input type="text" name="budgettotal" id="budgettotal" value="" size="40"><br> - Costs per service: - <table> - <tr> - <td>Service 1: <span style="color: red;">*</span></td> - <td><input type="text" id="service1" name="service1" size="30"></td> - <td>Cost 1: <span style="color: red;">*</span></td> - <td><input type="text" id="cost1" name="cost1" size="30"></td> - </tr> - <tr> - <td>Service 2:</td> - <td><input type="text" id="service2" name="service2" size="30"></td> - <td>Cost 2:</td> - <td><input type="text" id="cost2" name="cost2" size="30"></td> - </tr> - <tr> - <td>Service 3:</td> - <td><input type="text" id="service3" name="service3" size="30"></td> - <td>Cost 3:</td> - <td><input type="text" id="cost3" name="cost3" size="30"></td> - </tr> - <tr> - <td>Service 4:</td> - <td><input type="text" id="service4" name="service4" size="30"></td> - <td>Cost 4:</td> - <td><input type="text" id="cost4" name="cost4" size="30"></td> - </tr> - <tr> - <td>Service 5:</td> - <td><input type="text" id="service5" name="service5" size="30"></td> - <td>Cost 5:</td> - <td><input type="text" id="cost5" name="cost5" size="30"></td> - </tr> - </table> - Additional costs:<br> - <textarea id="costadditional" name="costadditional" rows="5" cols="50"></textarea> - </td> -</tr> - -<tr class="odd"> - <td><!--spacer--> </td> - <td><!--spacer--> </td> -</tr> - -<tr class="even"> - <td colspan="2"> - <strong>Success measurement:</strong><br> - How will the event help push the Mozilla project forward? - <span style="color: red;">*</span><br> - <textarea id="successmeasure" name="successmeasure" rows="5" cols="50"></textarea> - <table> - </tr> - <td>Metric 1: <span style="color: red;">*</span></td> - <td><input type="text" id="metric1" name="metric1" size="30"> - <td>Success scenario: <span style="color: red;">*</span></td> - <td><input type="text" id="success1" name="success1" size="30"> - </tr> - <tr> - <td>Metric 2:</td> - <td><input type="text" id="metric2" name="metric2" size="30"> - <td>Success scenario:</td> - <td><input type="text" id="success2" name="success2" size="30"> - </tr> - <tr> - <td>Metric 3:</td> - <td><input type="text" id="metric3" name="metric3" size="30"> - <td>Success scenario:</td> - <td><input type="text" id="success3" name="success3" size="30"> - </tr> - </table> - Additional information:<br> - <textarea id="successadditional" name="successadditional" rows="5" cols="50"></textarea> - </td> -</tr> - -<tr class="odd"> - <td> </td> - <td align="right"> - <input type="submit" id="commit" value="Submit Request"> - </td> -</tr> - -</table> - -</form> - -<p> - <strong><span style="color: red;">*</span></strong> - Required field<br /> - Thanks for contacting us. -</p> - -[% 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 <reed@mozilla.com> - # David Tran <dtran@mozilla.com> - #%] - -[% 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' ] -%] - -<p>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.</p> - -<script language="javascript" type="text/javascript"> -function trySubmit() { - var firstname = document.getElementById('firstname').value; - var lastname = document.getElementById('lastname').value; - var requester = firstname + ' ' + lastname; - var shortdesc = 'Swag Request - ' + requester; - document.getElementById('short_desc').value = shortdesc; - return true; -} - -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('wikiprofile')) alert_text += "Please enter your wiki user profile\n"; - if(!isFilledOut('wikipage')) alert_text += "Please enter the event wiki page.\n"; - if(!isFilledOut('attendance')) alert_text += "Please enter the estimated attendance.\n"; - if(!isFilledOut('shiptofirstname')) alert_text += "Please enter the shipping first name\n"; - if(!isFilledOut('shiptolastname')) alert_text += "Please enter the shipping last name\n"; - if(!isFilledOut('shiptoaddress')) alert_text += "Please enter the ship to address\n"; - if(!isFilledOut('shiptocity')) alert_text += "Please enter the ship to city\n"; - if(!isFilledOut('shiptocountry')) alert_text += "Please enter the ship to country\n"; - if(!isFilledOut('shiptopcode')) alert_text += "Please enter the ship to postal code\n"; - if(!isFilledOut('shiptophone')) alert_text += "Please enter the ship to contact number\n"; - - //Everything required is filled out..try to submit the form! - if(alert_text == '') { - return trySubmit(); - } - - //alert text, stay here on the pagee - alert(alert_text); - return false; -} - -</script> - -<h1>Mozilla Reps - Swag Request Form</h1> - -<form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data" - onSubmit="return validateAndSubmit();"> - - <input type="hidden" name="format" value="remo-swag"> - <input type="hidden" name="product" value="Mozilla Reps"> - <input type="hidden" name="component" value="Swag Requests"> - <input type="hidden" name="rep_platform" value="All"> - <input type="hidden" name="op_sys" value="Other"> - <input type="hidden" name="priority" value="--"> - <input type="hidden" name="version" value="unspecified"> - <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> - <input type="hidden" name="short_desc" id="short_desc" value=""> - <input type="hidden" name="groups" value="mozilla-reps"> - -<table id="reps-form"> - -<tr class="odd"> - <td><strong>First Name: <span style="color: red;" title="Required">*</span></strong></td> - <td> - <input type="text" name="firstname" id="firstname" placeholder="John" size="40"> - </td> -</tr> - -<tr class="even"> - <td><strong>Last Name: <span style="color: red;" title="Required">*</span></strong></td> - <td> - <input type="text" name="lastname" id="lastname" placeholder="Doe" size="40"> - </td> -</tr> - -<tr class="odd"> - <td><strong>Wiki User Profile: <span style="color: red;" title="Required">*</span></strong></td> - <td> - <input type="text" name="wikiprofile" id="wikiprofile" size="40"> - </td> -</tr> - -<tr class="even"> - <td><strong>Event Wiki Page: <span style="color: red;" title="Required">*</span></strong></td> - <td> - <input type="text" name="wikipage" id="wikipage" size="40"> - </td> -</tr> - -<tr class="even"> - <td><strong>Estimated Attendance: <span style="color: red;" title="Required">*</span></strong></td> - <td> - <input type="text" name="attendance" id="attendance" size="40"> - </td> -</tr - -<tr class="odd"> - <td><!--spacer--> </td> - <td><!--spacer--> </td> -</tr> - -<tr class="even"> - <td colspan="2"><strong>Shipping Details:</strong></td> -</tr> - -<tr class="odd"> - <td><strong>Ship Before:</strong> - <td> - <input type="text" id="shipdate" name="shipdate" size="10" - onchange="updateCalendarFromField(this)"> - <button type="button" class="calendar_button" id="button_calendar_date" - onclick="showCalendar('shipdate')"><span>Calendar</span> - </button> - <div id="con_calendar_shipdate"></div> - </td> -</tr> - -<tr class="even"> - <td><strong>First Name: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptofirstname" id="shiptofirstname" placeholder="John" size="40"></td> -</tr> - -<tr class="odd"> - <td><strong>Last Name: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptolastname" id="shiptolastname" placeholder="Doe" size="40"></td> -</tr> - -<tr class="even"> - <td><strong>Address: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptoaddress" id="shiptoaddress" placeholder="123 Main St." size="40"></td> -</tr> - -<tr class="odd"> - <td><strong>Address 2:</strong></td> - <td><input name="shiptoaddress2" id="shiptoaddress2" size="40"></td> -</tr> - -<tr class="even"> - <td><strong>City: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptocity" id="shiptocity" size="40" placeholder="Anytown"></td> -</tr> - -<tr class="odd"> - <td><strong>State:</strong></td> - <td><input name="shiptostate" id="shiptostate" placeholder="CA" size="40"></td> -</tr> - -<tr class="even"> - <td><strong>Country: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptocountry" id="shiptocountry" placeholder="USA" size="40"></td> -</tr> - -<tr class="odd"> - <td><strong>Postal Code: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptopcode" id="shiptopcode" placeholder="90210" size="40"></td> -</tr> - -<tr class="even"> - <td><strong>Contact Number: <span style="color: red;" title="Required">*</span></strong></td> - <td><input name="shiptophone" id="shiptophone" placeholder="919-555-1212" size="40"></td> -</tr> - -<tr class="odd"> - <td><strong>Personal ID/RUT:</strong><br><small>(if your country requires this)</small></td> - <td><input name="shiptoidrut" id="shiptoidrut" size="40"></td> -</tr> - -<tr class="even"> - <td colspan="2"> - <strong>Addition information for delivery person:</strong><br> - <textarea id="shipadditional" name="shipadditional" rows="4"></textarea> - </td> -</tr> - -<tr class="odd"> - <td><!--spacer--> </td> - <td><!--spacer--> </td> -</tr> - -<tr class="even"> - <td colspan="2"><strong>Swag Requested:</strong></td> -</tr> - -<tr class="odd"> - <td><strong>Stickers:</strong></td> - <td><input type="checkbox" id="stickers" name="stickers" value="1"></td> -</tr> - -<tr class="odd"> - <td><strong>Buttons:</strong></td> - <td><input type="checkbox" id="buttons" name="buttons" value="1"></td> -</tr> - -<tr class="even"> - <td><strong>Posters:</strong></td> - <td><input type="checkbox" id="posters" name="posters" value="1"></td> -</tr> - -<tr class="odd"> - <td><strong>Lanyards:</strong></td> - <td><input type="checkbox" id="lanyards" name="lanyards" value="1"></td> -</tr> - -<tr class="even"> - <td><strong>T-Shirts:</strong></td> - <td><input type="checkbox" id="tshirts" name="tshirts" value="1"></td> -</tr> - -<tr class="odd"> - <td><strong>Roll-Up Banners:</strong></td> - <td><input type="checkbox" id="rollupbanners" name="rollupbanners" value="1"></td> -</tr> - -<tr class="even"> - <td><strong>Horizontal Banner:</strong></td> - <td><input type="checkbox" id="horizontalbanner" name="horizontalbanner" value="1"></td> -</tr> - -<tr class="odd"> - <td><strong>Booth Cloth:</strong></td> - <td><input type="checkbox" id="boothcloth" name="boothcloth" value="1"></td> -</tr> - -<tr class="even"> - <td><strong>Pens:</strong></td> - <td><input type="checkbox" id="pens" name="pens" value="1"></td> -</tr> - -<tr class="odd"> - <td><strong>Other:</strong> (please specify)</td> - <td><input type="text" id="otherswag" name="otherswag" size="40"></td> -</tr> - -<tr class="even"> - <td> </td> - <td align="right"> - <input type="submit" id="commit" value="Submit Request"> - </td> -</tr> - -</table> - -<p> - 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. -</p> - -<p> - <strong><span style="color: red;">*</span></strong> - Required field<br /> - Thanks for contacting us. - You will be notified by email of any progress made in resolving your request. -</p> - -<script type="text/javascript"> - createCalendar('shipdate'); -</script> - -[% 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 @@ <p><strong>Swag Request:</strong> Please use this form to file a request for swag. </p> <ol> - <li>You first need submit a <a href="/enter_bug.cgi?product=Marketing&format=mktgevent">Event Request Form</a>. You'll be asked for the [% terms.bug %] number below.</li> + <li>You first need submit a <a href="/enter_bug.cgi?product=Marketing&format=mktgevent">Event Request Form</a>. You'll be asked for the bug number below.</li> <li>Complete and submit request below.</li> <li>Your request will be reviewed by the appropriate person in the Engagement team.</li> <li>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() { <form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data" onSubmit="return validateAndSubmit();"> - <input type="hidden" name="format" value="swag"> - <input type="hidden" name="product" value="Marketing"> - <input type="hidden" name="component" value="Swag Requests"> - <input type="hidden" name="rep_platform" value="All"> - <input type="hidden" name="op_sys" value="Other"> - <input type="hidden" name="priority" value="--"> - <input type="hidden" name="version" value="unspecified"> - <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> - <input type="hidden" name="short_desc" id="short_desc" value=""> - <input type="hidden" name="groups" value="mozilla-corporation-confidential"> - + <input type="hidden" name="format" value="swag"> + <input type="hidden" name="product" value="Marketing"> + <input type="hidden" name="component" value="Swag Requests"> + <input type="hidden" name="rep_platform" value="All"> + <input type="hidden" name="op_sys" value="Other"> + <input type="hidden" name="priority" value="--"> + <input type="hidden" name="version" value="unspecified"> + <input type="hidden" name="bug_severity" id="bug_severity" value="normal"> + + <input type="hidden" name="short_desc" id="short_desc" value=""> + <input type="hidden" name="groups" value="mozilla-corporation-confidential"> <table> + <tr> <td align="right"><strong>First Name: <span style="color: red;">*</span></strong></td> <td align="left"> <input type="text" name="firstname" id="firstname" value="" size="20" maxlength="20" /> </td> </tr> - <tr> <td align="right"><strong>Last Name: <span style="color: red;">*</span></strong></td> <td align="left"> @@ -143,7 +143,7 @@ function validateAndSubmit() { </tr> <tr> - <td align="right"><strong>[% terms.Bug %] number assigned to previously- <br>submitted <a href="/enter_bug.cgi?product=Marketing&format=mktgevent">Event Request Form</a>: <span style="color: red;">*</span></strong></td> + <td align="right"><strong>Bug number assigned to previously- <br>submitted <a href="/enter_bug.cgi?product=Marketing&format=mktgevent">Event Request Form</a>: <span style="color: red;">*</span></strong></td> <td colspan="3"><input name="dependson" id="dependson"></td> </tr> 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 <a href="https://bugzilla.mozilla.org/enter_bug.cgi">full product list</a>. <p> <b>The product you have chosen is for [% terms.bug %] reports and enhancement requests for the -<a href="http://www.bugzilla.org/">[% terms.Bugzilla %] [% terms.bug %] tracking software</a> only.</b> -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. +<a href="http://www.bugzilla.org/">Bugzilla [% terms.bug %] tracking software</a> only.</b> +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 %] </p> -<p><b>We WILL NOT accept [% terms.bug %] reports for [% terms.Bugzilla %] -installed via the Debian packaging system. If you obtained [% terms.Bugzilla %] from Debian, +<p><b>We WILL NOT accept [% terms.bug %] reports for Bugzilla +installed via the Debian packaging system. If you obtained Bugzilla from Debian, please visit the <a href="http://www.debian.org/support">Debian Support page</a>, -or file a [% terms.bug %] on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian -[% terms.Bug %] Tracker</a>.</b> 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.</p> +or file a bug on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian +Bug Tracker</a>.</b> 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.</p> <p> -[% 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 <a href="enter_bug.cgi?product=mozilla.org">mozilla.org product</a>. </p> <p> Please do not file test [% terms.bugs %] or support requests here! You -can test [% terms.Bugzilla %] at +can test Bugzilla at <a href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a> and ask for support in the <a href="news://news.mozilla.org/mozilla.support.bugzilla"> @@ -106,7 +106,7 @@ support-bugzilla@lists.mozilla.org mailing list</a>, or [% UNLESS cloned_bug_id %] Consider using the <a href="enter_bug.cgi?product=[% product.name FILTER html %]&format=guided"> -[% terms.Bugzilla %] Helper</a> instead of this form. +Bugzilla Helper</a> instead of this form. [% END +%] Before reporting a [% terms.bug %], make sure you've read our <a href="http://www.mozilla.org/quality/bug-writing-guidelines.html"> |