diff options
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/comment-fxos-dogfood.txt.tmpl | 24 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/comment-fxos-partner.txt.tmpl (renamed from extensions/BMO/template/en/default/bug/create/comment-bootgecko-partner.txt.tmpl) | 2 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl | 2 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-fxos-dogfood.html.tmpl | 180 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/created-fxos-dogfood.html.tmpl | 30 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/created-mozreps.html.tmpl | 38 |
7 files changed, 237 insertions, 41 deletions
@@ -58,7 +58,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[\.:]partner enter_bug.cgi?product=Boot2Gecko&format=bootgecko-partner [QSA] +RewriteRule ^form[\.:](b2g|fxos)[\.:](partner|dogfood) 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 ^rest/(.*)$ rest.cgi/$1 [NE] 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 new file mode 100644 index 000000000..9370ff03c --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/comment-fxos-dogfood.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-bootgecko-partner.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-partner.txt.tmpl index a718bdef6..aa26d778f 100644 --- a/extensions/BMO/template/en/default/bug/create/comment-bootgecko-partner.txt.tmpl +++ b/extensions/BMO/template/en/default/bug/create/comment-fxos-partner.txt.tmpl @@ -12,7 +12,7 @@ What are the steps to reproduce?: [%+ cgi.param('steps_to_reproduce') %] -What was the actual behavior?: +What was the actual behavior?: [%+ cgi.param('actual_behavior') %] What was the expected behavior?: diff --git a/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl index 6e2778de0..46ed25ef8 100644 --- a/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl @@ -79,7 +79,7 @@ <form method="post" action="post_bug.cgi" id="bug_form" class="enter_bug_form" enctype="multipart/form-data" onsubmit="return onSubmit();"> -<input type="hidden" name="format" value="bootgecko-partner"> +<input type="hidden" name="format" value="fxos-partner"> <input type="hidden" name="product" value="Boot2Gecko"> <input type="hidden" name="rep_platform" value="ARM"> <input type="hidden" name="op_sys" value="Gonk (Firefox OS)"> 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 new file mode 100644 index 000000000..ef84bc872 --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-dogfood.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 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' ] +%] + +<h2>Firefox OS Dogfooding [% terms.Bug %] Submission</h2> + +<div id="public_place"> + As [% terms.Bugzilla %] is a public place, don't include any private or + personally identifying content. +</div> + +<form method="post" action="post_bug.cgi" id="bug_form" class="enter_bug_form" + enctype="multipart/form-data" onsubmit="return onSubmit();"> +<input type="hidden" name="format" value="fxos-dogfood"> +<input type="hidden" name="created-format" value="fxos-dogfood"> +<input type="hidden" name="product" value="Boot2Gecko"> +<input type="hidden" name="component" value="DogfoodTriage"> +<input type="hidden" name="rep_platform" value="ARM"> +<input type="hidden" name="op_sys" value="Gonk (Firefox OS)"> +<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="comment" id="comment" value=""> +<input type="hidden" name="status_whiteboard" id="status_whiteboard" value="[dogfood]"> +<input type="hidden" name="token" value="[% token FILTER html %]"> + +<table id="dogfood"> + +<tr> + <th> + What phone do you have? + </th> +</tr> +<tr> + <td> + [% FOREACH phone = phones %] + <input type="radio" name="phone" id="phone-cb-[% phone FILTER html %]" + value="[% phone FILTER html %]"> + <label for="phone-cb-[% phone FILTER html %]">[% phone FILTER html %]</label><br> + [% END %] + <input type="radio" name="phone" id="phone-cb-other" value="Other"> + <input type="text" name="phone_other" id="phone-other" placeholder="Other" size="20" + onfocus="document.getElementById('phone-cb-other').checked = true"> + </td> +</tr> + +<tr> + <th> + What version of Firefox OS are you running? + </th> +</tr> +<tr> + <td> + <i> + Please check settings > device information > more information > OS version<br> + </i> + <input type="text" name="fxos_version" id="fxos-version" size="20"> + </td> +</tr> + +<tr> + <th> + Please summarize your issue in one sentence: + </th> +</tr> +<tr> + <td> + <input type="text" name="short_desc" id="short_desc" size="60"> + </td> +</tr> + +<tr> + <th> + Please describe your issue in more detail. If you have steps to + reproduce the problem, please include them here: + </th> +</tr> +<tr> + <td> + <textarea id="details" name="details" rows="5" cols="60"></textarea> + </td> +</tr> + +<tr> + <th> + If your issue is associated with a specific app, which one + </th> +</tr> +<tr> + <td> + <input type="text" name="app" id="app" size="60"> + </td> +</tr> + +<tr> + <th>Security:</th> +</tr> +<tr> + <td> + <input type="checkbox" name="groups" id="default_security_group" + value="[% product.default_security_group FILTER html %]"> + <label for="default_security_group"> + Many users could be harmed by this security problem: + it should be kept hidden from the public until it is resolved. + </label> + </td> +</tr> + +<tr> + <td> + <input type="submit" id="commit" value="Submit Request"> + </td> +</tr> + +</table> + +</form> + +[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/created-fxos-dogfood.html.tmpl b/extensions/BMO/template/en/default/bug/create/created-fxos-dogfood.html.tmpl new file mode 100644 index 000000000..58eca38aa --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/created-fxos-dogfood.html.tmpl @@ -0,0 +1,30 @@ +[%# 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 Dogfooding 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/created-mozreps.html.tmpl b/extensions/BMO/template/en/default/bug/create/created-mozreps.html.tmpl deleted file mode 100644 index e9a480090..000000000 --- a/extensions/BMO/template/en/default/bug/create/created-mozreps.html.tmpl +++ /dev/null @@ -1,38 +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" - -%] - -<h1>Thank you!</h1> - -<p> -Thank you for submitting your Mozilla Reps Application Form. A Mozilla Rep -mentor will contact you shortly at your bugzilla email address. -</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 %] |