From 3be12a6b2c8163e5a9df14db20a2594a7f53f8f3 Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Wed, 11 Apr 2018 14:20:23 -0700 Subject: Bug 1451573 - Remove Firefox Marketplace custom forms --- .../bug/create/comment-third-party-apps.txt.tmpl | 22 --- .../bug/create/create-third-party-apps.html.tmpl | 191 --------------------- .../bug/create/created-fxos-betaprogram.html.tmpl | 30 ---- .../en/default/bug/create/custom_forms.none.tmpl | 10 -- 4 files changed, 253 deletions(-) delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-third-party-apps.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/created-fxos-betaprogram.html.tmpl (limited to 'extensions/BMO/template/en/default') 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-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' ] -%] - -

Third Party Applications Issue Form

- -
- - - - - - - - - - - - -
- -
- Please enter the name of the application in brackets and a short summary of - the issue. (ex. [App Name] Fails to launch at startup. -
- -
- -
- -
- Please copy the App listing page URL from Marketplace. -
- -
- -
- -
- Please enter a description of the issue with as much detail as possible. -
- -
- -
- -
- Please let us know if this issue is reproducible, steps to reproduction, and - how often the issue presents itself. -
- -
- -
- -
- 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) -
- -
- -
- -
- 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. -
- -
- -
- -
- Please attach any additional information that will help us understand and - diagnose this issue. Screenshots, testing documents, etc. -
- - - - - - - - -
- - - -
- - - - -
-
- - - -
- -[% 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" -%] - -

Thank you!

- -

- Thank you for submitting feedback about Firefox OS. -

- -

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

- -

- Reference: #[% id FILTER html %] -

- -[% 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", -- cgit v1.2.3-24-g4f1b From 23b1be3839f09d4806bf841c4f03743eb78eb1ab Mon Sep 17 00:00:00 2001 From: Israel Madueme Date: Wed, 18 Apr 2018 16:57:27 -0400 Subject: Bug 1450325 - add unsubscribe link to html bug email template --- extensions/BMO/template/en/default/email/bugmail.html.tmpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'extensions/BMO/template/en/default') 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 %] + Configure your email settings at + [% urlbase FILTER none %]userprefs.cgi?tab=email. +
[%# Filtering of the URL param is not required & would break the URL when the comment anchor is set %] -- cgit v1.2.3-24-g4f1b From 99005e14ea722032a25fd83ba275e1c8c2e18b8e Mon Sep 17 00:00:00 2001 From: Israel Madueme Date: Fri, 20 Apr 2018 12:51:00 -0400 Subject: Bug 1451599 - Move guidelines checkbox on signup page to the left --- extensions/BMO/template/en/default/account/create.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/BMO/template/en/default') diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index 59ff822bd..64cf9bad8 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -156,10 +156,10 @@ function onSubmit() { + I have read [% terms.Bugzilla %] Etiquette and the Mozilla Community Participation Guidelines and agree to abide by them. - -- cgit v1.2.3-24-g4f1b From 50ef8fcbb13f77eeded121d32be3f1a98cd17640 Mon Sep 17 00:00:00 2001 From: Israel Madueme Date: Wed, 25 Apr 2018 08:53:08 -0400 Subject: Bug 1455772 - Label bug bounty form credit fields --- .../BMO/template/en/default/pages/attachment_bounty_form.html.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/BMO/template/en/default') 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() {
- +
- +
-- cgit v1.2.3-24-g4f1b From 7dc3c771ef4f0fc3dc7ff5671b0b433f2d71d11c Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Tue, 5 Jun 2018 11:59:55 -0400 Subject: Bug 1465889 - form.dev-engagement-event field should be red instead of black --- .../en/default/bug/create/create-dev-engagement-event.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/BMO/template/en/default') 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 @@ -
+
The Developer Events Team only participates in developer events. Form submission has been disabled.
-- cgit v1.2.3-24-g4f1b From 404dc5496967203c5f99755340f43d712420446a Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Thu, 14 Jun 2018 17:50:08 -0700 Subject: Bug 1468848 - Change presentation of show_bug.cgi urls to be /bug/ID or /bug/ALIAS. --- .../template/en/default/hook/global/header-additional_header.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/BMO/template/en/default') 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 f1896dccc..d7a4cc2a5 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 %] [%# *** Bug List Navigation *** %] -- cgit v1.2.3-24-g4f1b From 469d5c5f8705289997e50a3f94c700c0dcbfcc36 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Wed, 20 Jun 2018 13:27:54 -0400 Subject: Bug 1469689 - Remove Bugzilla Helper and custom bug entry form links from Browse page --- extensions/BMO/template/en/default/global/choose-product.html.tmpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'extensions/BMO/template/en/default') 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..11caca605 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -173,12 +173,14 @@
+[% IF NOT is_describe %] +[% END %] [% PROCESS global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b From 210068ac876bcf97966f6a593e00c8ac6bcb646c Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Wed, 20 Jun 2018 13:28:28 -0400 Subject: Bug 1419971 - Add new Developer Tools and WebExtensions products to easy product selector on Browse and Enter Bug pages --- .../template/en/default/global/choose-product.html.tmpl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'extensions/BMO/template/en/default') 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 11caca605..679d812e1 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -90,10 +90,22 @@ name="Firefox for iOS" 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" @@ -102,10 +114,6 @@ name="SeaMonkey" icon="seamonkey.png" %] - [% INCLUDE easyproduct - name="Mozilla Localizations" - icon="localization.png" - %] [% INCLUDE easyproduct name="Data Platform and Tools" icon="sync.png" -- cgit v1.2.3-24-g4f1b From 0bb8ea6781ed6262e1a254755d697ab80428754e Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Wed, 20 Jun 2018 21:54:59 +0200 Subject: Bug 1469827 - The etiquette check on "Create new a Bugzilla account" lacks a proper label --- extensions/BMO/template/en/default/account/create.html.tmpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'extensions/BMO/template/en/default') diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index 64cf9bad8..fa897e0e8 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -157,9 +157,11 @@ function onSubmit() { + -- cgit v1.2.3-24-g4f1b From de80a6c015fb0d63040a111288be26b2118684a4 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Tue, 26 Jun 2018 16:59:30 -0400 Subject: Revert "Bug 1468848 - Change presentation of show_bug.cgi urls to be /bug/ID or /bug/ALIAS." This reverts commit 404dc5496967203c5f99755340f43d712420446a. --- .../template/en/default/hook/global/header-additional_header.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/BMO/template/en/default') 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 d7a4cc2a5..f1896dccc 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 %] [%# *** Bug List Navigation *** %] -- cgit v1.2.3-24-g4f1b From c46b694c342da3c1b4e2bb4394ff2886b9bd44f1 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Tue, 26 Jun 2018 22:00:02 -0400 Subject: Bug 1471417 - Remove XUL from attachment Content Type options; add SVG to standard options; mark PDF viewable --- .../en/default/hook/attachment/createformcontents-mimetypes.html.tmpl | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 extensions/BMO/template/en/default/hook/attachment/createformcontents-mimetypes.html.tmpl (limited to 'extensions/BMO/template/en/default') 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 -- cgit v1.2.3-24-g4f1b