diff options
Diffstat (limited to 'extensions/BMO/template')
10 files changed, 23 insertions, 263 deletions
diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index 59ff822bd..fa897e0e8 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -156,10 +156,12 @@ function onSubmit() { </tr> <tr> <td colspan="2"> + <input type="checkbox" id="etiquette" value="agreed"> + <label for="etiquette"> I have read <a href="page.cgi?id=etiquette.html">[% terms.Bugzilla %] Etiquette</a> and the <a href="https://www.mozilla.org/about/governance/policies/participation/">Mozilla Community Participation Guidelines</a> and agree to abide by them. - <input type="checkbox" id="etiquette" value="agreed"> + </label> </td> </tr> <tr> diff --git a/extensions/BMO/template/en/default/bug/create/comment-third-party-apps.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-third-party-apps.txt.tmpl deleted file mode 100644 index 7a30902f2..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-third-party-apps.txt.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -> Detailed description of the issue or enhancement request -[%+ cgi.param('desc') %] - -> Is this issue reproducible? -[%+ cgi.param('reproducible') %] - -> Device Information -[%+ cgi.param('device_info') %] - -> Mozilla Reference Device -[%+ cgi.param('reference_device') %] diff --git a/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl index 1197952fe..5478de00f 100644 --- a/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl @@ -142,7 +142,7 @@ <option value="Yes">Yes</option> <option value="No">No</option> </select> - <div id="developer_event_warning" class="bz_default_hidden"> + <div id="developer_event_warning" class="warning bz_default_hidden"> The Developer Events Team only participates in developer events. Form submission has been disabled. </div> diff --git a/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl deleted file mode 100644 index b6173e6e4..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl +++ /dev/null @@ -1,191 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% inline_css = BLOCK %] -#third_party_form { - width: 60%; -} -#third_party_form .required:after { - content: " *"; - color: red; -} -#third_party_form .field_label { - text-align: left; - font-weight: bold; -} -#third_party_form .field_desc, -#third_party_form .head_desc { - word-wrap: normal; -} -#third_party_form .head_desc { - font-size: 1.25em; - padding-bottom: .5em; -} -#third_party_form .form_section { - margin-bottom: 1em; - padding-left: 2em; -} -.yui-calcontainer { - z-index: 2; -} -[% END %] - -[% inline_javascript = BLOCK %] - function validateAndSubmit() { - var alert_text = ''; - $('label.required').each(function () { - var id = $(this).attr('for'); - if (id && !isFilledOut(id)) { - var desc = $(this).text() || id; - alert_text += "Please select or enter a value for" + - desc.replace(/[\r\n]+/, "").replace(/\s+/g, " ") + "\n"; - } - }); - if (alert_text != '') { - alert(alert_text); - return false; - } - return true; - } -[% END %] - -[% PROCESS global/header.html.tmpl - title = "Third Party Applications Issue Form" - style = inline_css - style_urls = [ 'skins/standard/enter_bug.css', - 'skins/standard/attachment.css' ] - javascript = inline_javascript - javascript_urls = [ 'js/attachment.js', - 'js/field.js', - 'js/util.js', - 'extensions/BMO/web/js/form_validate.js' ] -%] - -<h2>Third Party Applications Issue Form</h2> - -<form method="post" action="post_bug.cgi" id="third_party_form" - class="enter_bug_form" enctype="multipart/form-data" - onSubmit="return validateAndSubmit();"> -<input type="hidden" name="format" value="third-party-apps"> -<input type="hidden" name="product" value="Marketplace"> -<input type="hidden" name="component" value="3rd Party Applications"> -<input type="hidden" name="rep_platform" value="All"> -<input type="hidden" name="op_sys" value="All"> -<input type="hidden" name="priority" value="--"> -<input type="hidden" name="version" value="unspecified"> -<input type="hidden" name="comment" id="comment" value=""> -<input type="hidden" name="status_whiteboard" id="status_whiteboard" value=""> -<input type="hidden" name="contenttypemethod" value="autodetect"> -<input type="hidden" name="token" value="[% token FILTER html %]"> - -<div class="form_section"> - <label for="short_desc" class="field_label required"> - Summary - </label> - <div class="field_desc"> - Please enter the name of the application in brackets and a short summary of - the issue. (ex. [App Name] Fails to launch at startup. - </div> - <input type="text" name="short_desc" id="short_desc" size="40" class="wide"> -</div> - -<div class="form_section"> - <label for="bug_file_loc" class="field_label required"> - Marketplace App URL - </label> - <div class="field_desc"> - Please copy the App listing page URL from Marketplace. - </div> - <input type="text" name="bug_file_loc" id="bug_file_loc" size="40" class="wide"> -</div> - -<div class="form_section"> - <label for="desc" class="field_label required"> - Detailed description of the issue or enhancement request - </label> - <div class="field_desc"> - Please enter a description of the issue with as much detail as possible. - </div> - <textarea name="desc" id="desc" rows="10" cols="60" class="wide"></textarea> -</div> - -<div class="form_section"> - <label for="reproducible" class="field_label required"> - Is this issue reproducible? - </label> - <div class="field_desc"> - Please let us know if this issue is reproducible, steps to reproduction, and - how often the issue presents itself. - </div> - <textarea name="reproducible" id="reproducible" rows="10" cols="60" class="wide"></textarea> -</div> - -<div class="form_section"> - <label for="device_info" class="field_label required"> - Device Information - </label> - <div class="field_desc"> - Please let us know what device you were using when you experienced this - issue. For FirefoxOS devices; please include the device make, model, and OS - version at a minimum. RAM, Chipset, Screen size, and buildID is preferred - if that information is available. (You can find BuildID by using this nav - path on your FirefoxOS device; Settings—>Device info—>More info) - </div> - <textarea name="device_info" id="device_info" rows="10" cols="60" class="wide"></textarea> -</div> - -<div class="form_section"> - <label for="reference_device" class="field_label required"> - Mozilla Reference Device - </label> - <div class="field_desc"> - Have you tried to reproduce this issue on a Mozilla reference device? If - yes, please post your results, which device you were using, and OS version. - </div> - <textarea name="reference_device" id="reference_device" rows="10" cols="60" class="wide"></textarea> -</div> - -<div class="form_section"> - <label class="field_label"> - Have additional materials? - </label> - <div class="field_desc"> - Please attach any additional information that will help us understand and - diagnose this issue. Screenshots, testing documents, etc. - </div> - <table> - <tr> - <td> - <label for="description" class="field_label"> - Description - </label> - </td> - <td> - <input type="text" name="description" id="description" size="40" class="wide"> - </td> - </tr> - <tr> - <td> - <label for="data" class="field_label"> - Filename - </label> - </th> - <td> - <input type="file" id="data" name="data" size="60"> - </td> - </tr> - </table> -</div> - -<input type="submit" id="commit" value="Submit Request"> - -</form> - -[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/created-fxos-betaprogram.html.tmpl b/extensions/BMO/template/en/default/bug/create/created-fxos-betaprogram.html.tmpl deleted file mode 100644 index 145c976cd..000000000 --- a/extensions/BMO/template/en/default/bug/create/created-fxos-betaprogram.html.tmpl +++ /dev/null @@ -1,30 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% PROCESS global/header.html.tmpl - title = "Firefox OS Beta Bug Submission" -%] - -<h1>Thank you!</h1> - -<p> - Thank you for submitting feedback about Firefox OS. -</p> - -<p> - We'll link any [% terms.bugs %] we file (or are already filed) as a result of - this feedback to this report so you can be notified about their progress. -</p> - -<p style="font-size: x-small"> - Reference: <a href="show_bug.cgi?id=[% id FILTER uri %]">#[% id FILTER html %]</a> -</p> - -[% 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 f0ddf0229..7b588f765 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 @@ -152,16 +152,6 @@ custom_forms = { title => "Internet Public Policy Issue", }, ], - "Marketplace" => [ - { - link => "form.fxos.preload.app", - title => "Firefox OS Pre-load App", - }, - { - link => "form.third.party", - title => "Third Party Applications Issue Form", - }, - ], "Data Compliance" => [ { link => "form.data.compliance", diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl index d5cb3af9a..0b08e4a86 100644 --- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl +++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl @@ -111,7 +111,10 @@ [% END %] [% END %] </ul> + Configure your email settings at + <a href="[% urlbase FILTER none %]userprefs.cgi?tab=email">[% urlbase FILTER none %]userprefs.cgi?tab=email</a>. </div> + <div itemscope itemtype="http://schema.org/EmailMessage"> <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction"> [%# Filtering of the URL param is not required & would break the URL when the comment anchor is set %] 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 4329b716a..679d812e1 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -91,10 +91,22 @@ icon="firefox_ios.png" %] [% INCLUDE easyproduct + name="DevTools" + icon="devtools.png" + %] + [% INCLUDE easyproduct + name="WebExtensions" + icon="webextensions.png" + %] + [% INCLUDE easyproduct name="Toolkit" icon="component.png" %] [% INCLUDE easyproduct + name="Mozilla Localizations" + icon="localization.png" + %] + [% INCLUDE easyproduct name="Thunderbird" icon="thunderbird.png" %] @@ -103,10 +115,6 @@ icon="seamonkey.png" %] [% INCLUDE easyproduct - name="Mozilla Localizations" - icon="localization.png" - %] - [% INCLUDE easyproduct name="Data Platform and Tools" icon="sync.png" %] @@ -173,12 +181,14 @@ </section> </div> +[% IF NOT is_describe %] <div id="guided"> <a href="enter_bug.cgi?format=guided"> <img src="extensions/BMO/web/images/guided.png" width="16" height="16"> Switch to the [% terms.Bugzilla %] Helper</a> | <a href="page.cgi?id=custom_forms.html">Custom [% terms.bug %] entry forms</a> </div> +[% END %] [% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/hook/attachment/createformcontents-mimetypes.html.tmpl b/extensions/BMO/template/en/default/hook/attachment/createformcontents-mimetypes.html.tmpl deleted file mode 100644 index 3dc727b87..000000000 --- a/extensions/BMO/template/en/default/hook/attachment/createformcontents-mimetypes.html.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -[% mimetypes.push({type => "image/svg+xml", desc => "SVG image"}) %] -[% mimetypes.push({type => "application/vnd.mozilla.xul+xml", desc => "XUL"}) %]
\ No newline at end of file diff --git a/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl b/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl index faf32aa36..0f7966097 100644 --- a/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl +++ b/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl @@ -211,12 +211,12 @@ function validateAndSubmit() { </div> <div class="form_section"> - <label for="credit_2" class="field_label">Credit</label> + <label for="credit_2" class="field_label">Credit Twitter</label> <input type="text" name="credit_2" id="credit_2" size="80" value="[% form.credit.1 FILTER html %]"> </div> <div class="form_section"> - <label for="credit_3" class="field_label">Credit</label> + <label for="credit_3" class="field_label">Credit URL</label> <input type="text" name="credit_3" id="credit_3" size="80" value="[% form.credit.2 FILTER html %]"> </div> |