From adf8fc7a582e3217ca81e53175fa4e11c76140fa Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Mon, 19 Aug 2013 11:46:17 +0800 Subject: Bug 900698: Change wording of Dogfooding form --- .htaccess | 2 +- .../bug/create/comment-fxos-betaprogram.txt.tmpl | 24 +++ .../bug/create/comment-fxos-dogfood.txt.tmpl | 24 --- .../bug/create/create-fxos-betaprogram.html.tmpl | 180 +++++++++++++++++++++ .../bug/create/create-fxos-dogfood.html.tmpl | 180 --------------------- 5 files changed, 205 insertions(+), 205 deletions(-) create mode 100644 extensions/BMO/template/en/default/bug/create/comment-fxos-betaprogram.txt.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/comment-fxos-dogfood.txt.tmpl create mode 100644 extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl delete mode 100644 extensions/BMO/template/en/default/bug/create/create-fxos-dogfood.html.tmpl diff --git a/.htaccess b/.htaccess index b4c6a0226..fda56750a 100644 --- a/.htaccess +++ b/.htaccess @@ -59,7 +59,7 @@ RewriteRule ^form[\.:]moz[\.\-:]project[\.\-:]review$ enter_bug.cgi?product=mozi RewriteRule ^form[\.:]docs?$ enter_bug.cgi?product=Developer+Documentation&format=doc [QSA] RewriteRule ^form[\.:]mdn?$ enter_bug.cgi?product=Mozilla+Developer+Network&format=mdn RewriteRule ^form[\.:](swag|gear)$ enter_bug.cgi?product=mozilla.org&format=swag -RewriteRule ^form[\.:](b2g|fxos)[\.:](partner|dogfood) enter_bug.cgi?product=Boot2Gecko&format=fxos-$2 [QSA] +RewriteRule ^form[\.:](b2g|fxos)[\.:](partner|betaprogram) enter_bug.cgi?product=Boot2Gecko&format=fxos-$2 [QSA] RewriteRule ^form[\.:]ipp$ enter_bug.cgi?product=Internet+Public+Policy&format=ipp RewriteRule ^form[\.:]creative$ enter_bug.cgi?product=Marketing&format=creative RewriteRule ^form[\.:]mobile[\.:]compat$ enter_bug.cgi?product=Tech+Evangelism&format=mobile-compat diff --git a/extensions/BMO/template/en/default/bug/create/comment-fxos-betaprogram.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-betaprogram.txt.tmpl new file mode 100644 index 000000000..9370ff03c --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/comment-fxos-betaprogram.txt.tmpl @@ -0,0 +1,24 @@ +[%# 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 %] + +Phone: +[%+ cgi.param('phone') == 'Other' ? cgi.param('phone_other') : cgi.param('phone') %] + +Firefox OS Version: +[%+ cgi.param('fxos_version') %] + +Issue Details: +[%+ cgi.param('details') %] + +[% IF cgi.param('app') %] +Associated App: +[%+ cgi.param('app') %] +[% END %] diff --git a/extensions/BMO/template/en/default/bug/create/comment-fxos-dogfood.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-dogfood.txt.tmpl deleted file mode 100644 index 9370ff03c..000000000 --- a/extensions/BMO/template/en/default/bug/create/comment-fxos-dogfood.txt.tmpl +++ /dev/null @@ -1,24 +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 %] - -Phone: -[%+ cgi.param('phone') == 'Other' ? cgi.param('phone_other') : cgi.param('phone') %] - -Firefox OS Version: -[%+ cgi.param('fxos_version') %] - -Issue Details: -[%+ cgi.param('details') %] - -[% IF cgi.param('app') %] -Associated App: -[%+ cgi.param('app') %] -[% END %] diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl new file mode 100644 index 000000000..14c40c24e --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl @@ -0,0 +1,180 @@ +[%# 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 %] + +[% phones = [ + 'ZTE Open', + 'Alcatel One Touch', + 'LG', +] %] + +[% inline_css = BLOCK %] + #dogfood { + margin: 0 5em 0 2em; + } + #dogfood th { + text-align: left; + padding-top: 1em; + } +[% END %] + +[% inline_js = BLOCK %] + function onSubmit() { + var alert_text = ''; + + var phone = false; + [% FOREACH phone = phones %] + if (document.getElementById('phone-cb-[% phone FILTER js %]').checked) + phone = true; + [% END %] + if (document.getElementById('phone-cb-other').checked && isFilledOut('phone-other')) + phone = true; + if (!phone) + alert_text += "Please select the type of phone you have.\n"; + + if (!isFilledOut('fxos-version')) + alert_text += "Please provide the version of Firefox OS you are running.\n"; + + if (!isFilledOut('short_desc')) + alert_text += "Please enter a value for the summary.\n"; + + if (!isFilledOut('details')) + alert_text += "Please describe your issue in more detail.\n"; + + if (alert_text != '') { + alert(alert_text); + return false; + } + return true; + } +[% END %] + +[% PROCESS global/header.html.tmpl + title = "Firefox OS Beta Program $terms.Bug Submission" + style = inline_css + style_urls = [ 'skins/standard/enter_bug.css' ] + javascript = inline_js + javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', 'js/field.js', 'js/util.js' ] +%] + +

Firefox OS Beta Program [% terms.Bug %] Submission

+ +
+ As [% terms.Bugzilla %] is a public place, don't include any private or + personally identifying content. +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ What phone do you have? +
+ [% FOREACH phone = phones %] + +
+ [% END %] + + +
+ What version of Firefox OS are you running? +
+ + Please check settings > device information > more information > OS version
+ + +
+ Please summarize your issue in one sentence: +
+ +
+ Please describe your issue in more detail. If you have steps to + reproduce the problem, please include them here: +
+ +
+ If your issue is associated with a specific app, which one +
+ +
Security:
+ + +
+ +
+ +
+ +[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-dogfood.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-dogfood.html.tmpl deleted file mode 100644 index ef84bc872..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-fxos-dogfood.html.tmpl +++ /dev/null @@ -1,180 +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 %] - -[% phones = [ - 'ZTE Open', - 'Alcatel One Touch', - 'LG', -] %] - -[% inline_css = BLOCK %] - #dogfood { - margin: 0 5em 0 2em; - } - #dogfood th { - text-align: left; - padding-top: 1em; - } -[% END %] - -[% inline_js = BLOCK %] - function onSubmit() { - var alert_text = ''; - - var phone = false; - [% FOREACH phone = phones %] - if (document.getElementById('phone-cb-[% phone FILTER js %]').checked) - phone = true; - [% END %] - if (document.getElementById('phone-cb-other').checked && isFilledOut('phone-other')) - phone = true; - if (!phone) - alert_text += "Please select the type of phone you have.\n"; - - if (!isFilledOut('fxos-version')) - alert_text += "Please provide the version of Firefox OS you are running.\n"; - - if (!isFilledOut('short_desc')) - alert_text += "Please enter a value for the summary.\n"; - - if (!isFilledOut('details')) - alert_text += "Please describe your issue in more detail.\n"; - - if (alert_text != '') { - alert(alert_text); - return false; - } - return true; - } -[% END %] - -[% PROCESS global/header.html.tmpl - title = "Firefox OS Dogfooding $terms.Bug Submission" - style = inline_css - style_urls = [ 'skins/standard/enter_bug.css' ] - javascript = inline_js - javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', 'js/field.js', 'js/util.js' ] -%] - -

Firefox OS Dogfooding [% terms.Bug %] Submission

- -
- As [% terms.Bugzilla %] is a public place, don't include any private or - personally identifying content. -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- What phone do you have? -
- [% FOREACH phone = phones %] - -
- [% END %] - - -
- What version of Firefox OS are you running? -
- - Please check settings > device information > more information > OS version
- - -
- Please summarize your issue in one sentence: -
- -
- Please describe your issue in more detail. If you have steps to - reproduce the problem, please include them here: -
- -
- If your issue is associated with a specific app, which one -
- -
Security:
- - -
- -
- -
- -[% PROCESS global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b