Bug 1361408 - Remove Firefox OS specific forms

11 files changed, 0 insertions, 1181 deletions

diff --git a/.htaccess b/.htaccess
index 3cc7c69ea..48c07b892 100644
--- a/.htaccess
+++ b/.htaccess
@@ -83,7 +83,6 @@ RewriteRule ^form[\.:]docs?$ enter_bug.cgi?product=Developer+Documentation&forma
 RewriteRule ^form[\.:]mdn?$ enter_bug.cgi?product=Mozilla+Developer+Network&format=mdn [QSA]
 RewriteRule ^form[\.:](swag|gear)$ enter_bug.cgi?product=Marketing&format=swag [QSA]
 RewriteRule ^form[\.:]costume$ enter_bug.cgi?product=Marketing&format=costume [QSA]
-RewriteRule ^form[\.:](b2g|fxos)[\.\-:](partner|betaprogram|feature) enter_bug.cgi?product=Firefox+OS&format=fxos-$2 [QSA]
 RewriteRule ^form[\.:]ipp$ enter_bug.cgi?product=Internet+Public+Policy&format=ipp [QSA]
 RewriteRule ^form[\.:]creative$ enter_bug.cgi?product=Marketing&format=creative [QSA]
 RewriteRule ^form[\.:]user[\.\-:]engagement$ enter_bug.cgi?product=Marketing&format=user-engagement [QSA]
@@ -92,7 +91,6 @@ RewriteRule ^form[\.:]mobile[\.\-:]compat$ enter_bug.cgi?product=Tech+Evangelism
 RewriteRule ^form[\.:]web[\.:]bounty$ enter_bug.cgi?product=mozilla.org&format=web-bounty  [QSA]
 RewriteRule ^form[\.:]automative$ enter_bug.cgi?product=Testing&format=automative [QSA]
 RewriteRule ^form[\.:]fxos[\.\-:]preload[\.\-:]app$ enter_bug.cgi?product=Marketplace&format=fxos-preload-app [QSA]
-RewriteRule ^form[\.:]fxos[\.\-:]mcts[\.\-:]waiver$ enter_bug.cgi?product=Firefox+OS&format=fxos-mcts-waiver [QSA]
 RewriteRule ^form[\.:]comm[\.:]newsletter$ enter_bug.cgi?product=Marketing&format=comm-newsletter [QSA]
 RewriteRule ^form[\.:]screen[\.:]share[\.:]whitelist$ enter_bug.cgi?product=Firefox&format=screen-share-whitelist [QSA]
 RewriteRule ^form[\.:]data[\.\-:]compliance$ enter_bug.cgi?product=Data+Compliance&format=data-compliance [QSA]
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
deleted file mode 100644
index 9370ff03c..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-fxos-betaprogram.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/comment-fxos-feature.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-feature.txt.tmpl
deleted file mode 100644
index 7664ff502..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-fxos-feature.txt.tmpl
+++ /dev/null
@@ -1,20 +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 %]
-
->> Feature Request Summary:
-[%+ cgi.param('short_desc') %]
-
->> Description of feature, or problem to be solved
-[%+ cgi.param("description") || "-" %]
-
-[% RETURN IF cgi.param("discussion") != "yes" %]
->> Mailing list thread
-[%+ cgi.param("bug_file_loc") %]
diff --git a/extensions/BMO/template/en/default/bug/create/comment-fxos-mcts-waiver.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-mcts-waiver.txt.tmpl
deleted file mode 100644
index abad3f3c4..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-fxos-mcts-waiver.txt.tmpl
+++ /dev/null
@@ -1,36 +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 %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi +%]
-> Company Name
-[%+ cgi.param('company_name') %]
-
-> Device Description
-[%+ cgi.param('device_desc') %]
-
-> Firefox OS Release
-[%+ cgi.param('ffos_release') %]
-
-> Branding Tier
-[%+ cgi.param('branding_tier') %]
-
-> Distribution Countries
-[%+ cgi.param('dist_countries') %]
-
-> Distribution Channel
-[%+ cgi.param('dist_channel') %]
-
-> Reason for Waiver Request
-[%+ cgi.param('reason') %]
-
-> Rationale for Granting Waiver Request
-[%+ cgi.param('rationale') %]
-
-> Impact Analysis
-[%+ cgi.param('impact') %]
diff --git a/extensions/BMO/template/en/default/bug/create/comment-fxos-partner.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-partner.txt.tmpl
deleted file mode 100644
index aa26d778f..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-fxos-partner.txt.tmpl
+++ /dev/null
@@ -1,23 +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 %]
-
-What are the steps to reproduce?:
-[%+ cgi.param('steps_to_reproduce') %]
-
-What was the actual behavior?:
-[%+ cgi.param('actual_behavior') %]
-
-What was the expected behavior?:
-[%+ cgi.param('expected_behavior') %]
-
-What build were you using?: [% cgi.param('build') %]
-
-What are the requirements?: [% cgi.param('requirements') %]
diff --git a/extensions/BMO/template/en/default/bug/create/comment-fxos-preload-app.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-fxos-preload-app.txt.tmpl
deleted file mode 100644
index a4e489724..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-fxos-preload-app.txt.tmpl
+++ /dev/null
@@ -1,28 +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 %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi +%]
-
->>Company Name
-[%+ cgi.param('company_name') %]
-
->>Apps Business Development Contact
-[%+ cgi.param('apps_business_dev_contact') %]
-
->>Name of Firefox Marketplace apps of interest to you:
-[%+ cgi.param('preload_apps') %]
-
->>Countries where your device will be distributed
-[%+ cgi.param('countries') %]
-
->>Release Information
-[%+ cgi.param('release_info') %]
-
->>Device Information
-[%+ cgi.param('device_info') %]
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
deleted file mode 100644
index 3b8a3fe67..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl
+++ /dev/null
@@ -1,181 +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 Beta Program $terms.Bug Submission"
-   generate_api_token = 1
-   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 Beta Program [% 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-betaprogram">
-<input type="hidden" name="created-format" value="fxos-betaprogram">
-<input type="hidden" name="product" value="Firefox OS">
-<input type="hidden" name="component" value="BetaTriage">
-<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 &gt; device information &gt; 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/create-fxos-feature.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-feature.html.tmpl
deleted file mode 100644
index ae6a8873f..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-fxos-feature.html.tmpl
+++ /dev/null
@@ -1,232 +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_style = BLOCK %]
-#feature_form {
-  padding: 10px;
-}
-#feature_form .required:after {
-  content: " *";
-  color: red;
-}
-#feature_form .field_label {
-  font-weight: bold;
-}
-#feature_form .field_desc {
-  padding-bottom: 3px;
-}
-#feature_form .field_desc,
-#feature_form .head_desc {
-  width: 600px;
-  word-wrap: normal;
-}
-#feature_form .head_desc {
-  padding-top: 5px;
-  padding-bottom: 12px;
-}
-#feature_form .form_section {
-  margin-bottom: 10px;
-}
-#feature_form textarea {
-  font-family: inherit;
-  font-size: inherit;
-}
-#feature_form #comp_description {
-  test-align: left;
-  color: green;
-  padding-left: 1em;
-}
-#feature_form .hidden {
-  display: none;
-}
-[% END %]
-
-[% inline_javascript = BLOCK %]
-var compdesc = [];
-compdesc[""] = 'Please select a component from the list above.';
-[% FOREACH comp = product.components %]
-  compdesc['[% comp.name FILTER js %]'] = '[% comp.description FILTER js %]';
-[% END %]
-function showCompDesc() {
-  var comp_select = document.getElementById('component');
-  document.getElementById('comp_description').innerHTML = compdesc[comp_select.value];
-}
-
-function validateAndSubmit() {
-  var alert_text = '';
-  if (!isFilledOut('component')) alert_text += 'Please select a component.\n';
-  if (!isFilledOut('short_desc')) alert_text += 'Please provide a summary of the feature request.\n';
-  if ($('#discussion').val() === 'yes') {
-    if (!isFilledOut('bug_file_loc')) alert_text += 'Please provide the "Mailing list thread" URL.\n';
-  }
-  if (alert_text != '') {
-    alert(alert_text);
-    return false;
-  }
-  return true;
-}
-
-$(function() {
-  $('#discussion')
-    .change(function() {
-      if ($(this).val() === 'yes') {
-        $('.thread').removeClass('hidden');
-        $('.thread input').prop('disabled', false);
-      }
-      else {
-        $('.thread').addClass('hidden');
-        $('.thread input').prop('disabled', true);
-      }
-    })
-    .change();
-  showCompDesc();
-});
-[% END %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Firefox OS Feature Request Form"
-   generate_api_token = 1
-   style = inline_style
-   javascript = inline_javascript
-   javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', 'js/field.js' ]
-%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-<form id="feature_form" method="post" action="post_bug.cgi" enctype="multipart/form-data"
-      onSubmit="return validateAndSubmit();">
-  <input type="hidden" name="format" value="fxos-feature">
-  <input type="hidden" name="product" value="Firefox OS">
-  <input type="hidden" name="keywords" id="keywords" value="foxfood">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_status" value="UNCONFIRMED">
-  <input type="hidden" name="bug_severity" value="normal">
-  <input type="hidden" name="token" value="[% token FILTER html %]">
-
-<img title="Firefox OS Feature Form" src="extensions/BMO/web/producticons/firefox_os.png" width="64" height="64">
-
-<div class="form_section">
-  <label for="component" class="field_label required">Product Component</label>
-  <div class="field_desc">
-    Which product component is your feature request applicable to?
-    If you are not sure, choose "Gaia::Feedback".
-  </div>
-  <select name="component" id="component" onchange="showCompDesc(this);">
-    <option value="">Select One</option>
-    [% FOREACH c IN product.components %]
-      [% NEXT UNLESS c.is_active %]
-      [% NEXT UNLESS c.name == "Gaia::Feedback" %]
-      <option value="[% c.name FILTER html %]" id="v[% c.id FILTER html %]_component"
-              [% " selected" IF c.name == default.component_ %]>
-        [% c.name FILTER html %]
-      </option>
-    [% END %]
-    [% FOREACH c IN product.components %]
-      [% NEXT UNLESS c.is_active %]
-      [% NEXT IF c.name == "Gaia::Feedback" %]
-      <option value="[% c.name FILTER html %]" id="v[% c.id FILTER html %]_component"
-              [% " selected" IF c.name == default.component_ %]>
-        [% c.name FILTER html %]
-      </option>
-    [% END %]
-  </select>
-  <div id="comp_description"></div>
-</div>
-
-<div class="form_section">
-  <label for="feature_type" class="field_label required">This is a feature request</label>
-  <div class="field_desc">
-    Is this a defect with existing functionality or a new feature request?
-  </div>
-  <select id="feature_type" name="feature_type">
-    <option value="new" [%= "selected" IF feature_type == 'new' %]>
-      New Feature Request</option>
-    <option value="existing" [%= "selected" IF feature_type == 'existing' %]>
-      Existing Feature Defect</option>
-  </select>
-</div>
-
-<div class="form_section">
-  <label for="short_desc" class="field_label required">Feature Request Summary</label>
-  <div class="field_desc">
-    Please enter a title for your feature request that is brief and self explanatory.
-    (Example: "Memory dialing using keypad numbers")
-  </div>
-  <input type="text" name="short_desc" id="short_desc"
-         size="80" value="[% short_desc FILTER html %]">
-</div>
-
-<div class="form_section">
-  <label for="description" class="field_label">Description of feature or problem to be solved</label>
-  <div class="field_desc">
-    Please describe the feature that you are requesting or the problem that you would like solved in detail
-    (Example, "Today, there is no way for the user to quickly dial user-defined numbers from the dial pad.
-    Instead the user must search for an find the contact in their contact list.").
-    If the described feature only applies to certain device types (eg. tablet vs. smartphone), please make note of it.
-  </div>
-  <textarea id="description" name="description" cols="80" rows="5">
-    [% description FILTER html %]</textarea>
-</div>
-
-<div class="form_section">
-  <label for="discussion" class="field_label">Was this discussed in a mailing list?</label>
-  <div class="field_desc">
-  </div>
-  <select id="discussion" name="discussion">
-    <option value="no" [%= "selected" IF discussion == 'no' %]>No</option>
-    <option value="yes" [%= "selected" IF discussion == 'yes' %]>Yes</option>
-  </select>
-</div>
-
-<div class="form_section thread hidden">
-  <label for="bug_file_loc" class="field_label required">Mailing list thread</label>
-  <div class="field_desc">
-    The mailing list post where this was discussed.<br>
-    e.g. https://groups.google.com/a/mozilla.com/forum/#!topic/foxfood-feedback/eCg6KaVD4FE
-  </div>
-  <input type="text" name="bug_file_loc" id="bug_file_loc" size="80"
-         value="[% bug_file_loc FILTER html %]" disabled>
-</div>
-
-<div class="form_section thread hidden">
-  <label for="cc" class="field_label">Stakeholder email addresses</label>
-  <div class="field_desc">
-    Anyone you think would like to follow this request. You may include people
-    who discussed this in the mailing list thread, if there was one.
-  </div>
-  [% INCLUDE global/userselect.html.tmpl
-     id       => "cc"
-     name     => "cc"
-     value    => cc
-     size     => 80
-     classes  => ["bz_userfield"]
-     multiple => 5
-  %]
-</div>
-
-<div class="head_desc">
-  Once your form has been submitted, a tracking [% terms.bug %] will be
-  created. We will then reach out for additional info and next steps.  If you
-  discussed this on a mailing list, please link the people there to this
-  tracking [% terms.bug %].  Thanks!
-</div>
-
-<input type="submit" id="commit" value="Submit">
-
-<p>
-  [ <span class="required_star">*</span> <span class="required_explanation">Required Field</span> ]
-</p>
-
-</form>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl
deleted file mode 100644
index da75f7eb2..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl
+++ /dev/null
@@ -1,209 +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_style = BLOCK %]
-#fxos_mcts_waiver_form {
-  padding: 10px;
-}
-#fxos_mcts_waiver_form .required:after {
-  content: " *";
-  color: red;
-}
-#fxos_mcts_waiver_form .field_label {
-  font-weight: bold;
-}
-#fxos_mcts_waiver_form .field_desc {
-  padding-bottom: 3px;
-}
-#fxos_mcts_waiver_form .field_desc,
-#fxos_mcts_waiver_form .head_desc {
-  width: 600px;
-  word-wrap: normal;
-}
-#fxos_mcts_waiver_form .head_desc {
-  padding-top: 5px;
-  padding-bottom: 12px;
-}
-#fxos_mcts_waiver_form .form_section {
-  margin-bottom: 10px;
-}
-#fxos_mcts_waiver_form textarea {
-  font-family: inherit;
-  font-size: inherit;
-}
-#fxos_mcts_waiver_form em {
-  font-size: 1em;
-}
-[% END %]
-
-[% inline_javascript = BLOCK %]
-function validateAndSubmit() {
-  'use strict';
-  var alert_text = '';
-  var requiredLabels = YAHOO.util.Selector.query('label.required');
-  if (requiredLabels) {
-    requiredLabels.forEach(function (label) {
-      var name = label.getAttribute('for');
-      var ids = YAHOO.util.Selector.query(
-        '#fxos_mcts_waiver_form *[name="' + name + '"]'
-      ).map(function (e) {
-        return e.id
-      });
-
-      if (ids && ids[0]) {
-        if (!isFilledOut(ids[0])) {
-          var desc = label.textContent || name;
-          alert_text +=
-            "Please enter a value for " +
-            desc.replace(/[\r\n]+/, "").replace(/\s+/g, " ") +
-            "\n";
-        }
-      }
-    });
-  }
-
-  if (alert_text != '') {
-    alert(alert_text);
-    return false;
-  }
-
-  var short_desc = document.getElementById('short_desc');
-  var company_name = document.getElementById('company_name').value;
-  short_desc.value = "MCTS Waiver for " + company_name;
-
-  return true;
-}
-[% END %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Firefox OS MCTS Waiver Form"
-   generate_api_token = 1
-   style = inline_style
-   javascript = inline_javascript
-   javascript_urls = [ 'extensions/BMO/web/js/form_validate.js',
-                       'js/field.js', 'js/util.js' ]
-   yui = [ 'selector' ]
-%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-<form id="fxos_mcts_waiver_form" method="post" action="post_bug.cgi"
-  enctype="multipart/form-data" onSubmit="return validateAndSubmit();">
-  <input type="hidden" name="format" value="fxos-mcts-waiver">
-  <input type="hidden" name="product" value="Firefox OS">
-  <input type="hidden" name="component" value="MCTS Waiver Request">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="token" value="[% token FILTER html %]">
-  <input type="hidden" name="groups" value="mozilla-employee-confidential">
-  <input type="hidden" id="short_desc" name="short_desc" value="">
-  <input type="hidden" name="cf_user_story" value="Engineering Analysis:
-
-
-Technical Account Manager Recommendation:
-
-
-">
-
-  <div class="head_desc">
-    Welcome to the [% title FILTER html %]!
-  </div>
-
-  <div class="form_section">
-    <label for="company_name" class="field_label required">Company Name</label>
-    <div class="field_desc">
-      Please enter the legal name of the company requesting the Waiver
-    </div>
-    <input type="text" name="company_name" id="company_name" size="80">
-  </div>
-
-  <div class="form_section">
-    <label for="device_desc" class="field_label required">Device Description</label>
-    <div class="field_desc">
-      Please enter the Make, Model, Chipset, screensize and type the device associated with the waiver request. For
-      example type may be mobile phone, tablet, dongle, tv, etc.
-    </div>
-    <textarea id="device_desc" name="device_desc" cols="80" rows="5"></textarea>
-  </div>
-
-  <div class="form_section">
-    <label for="ffos_release" class="field_label required">FFOS Release</label>
-    <div class="field_desc">
-      Please Enter the Release this Waiver applies to for this partner.
-    </div>
-    <input type="text" name="ffos_release" id="ffos_release" size="80">
-  </div>
-
-  <div class="form_section">
-    <label for="branding_tier" class="field_label required">Branding Tier</label>
-    <div class="field_desc">
-      Please Enter the Branding Tier associated with the Waiver Request (Powered by Firefox OS or Co-Branded).
-    </div>
-    <select name="branding_tier" id="branding_tier">
-        <option value="Firefox OS Inside">Firefox OS Inside</option>
-        <option value="Powered by Firefox OS">Powered by Firefox OS</option>
-        <option value="Firefox OS Co-branded">Firefox OS Co-branded</option>
-    </select>
-  </div>
-
-  <div class="form_section">
-    <label for="dist_countries" class="field_label required">Distribution Countries</label>
-    <div class="field_desc">
-      Please include list of countries where the device is planned to be distributed.
-    </div>
-    <textarea id="dist_countries" name="dist_countries" cols="80" rows="5"></textarea>
-  </div>
-
-  <div class="form_section">
-    <label for="dist_channel" class="field_label required">Distribution Channel</label>
-    <div class="field_desc">
-      Please identify how this device will be sold.  For example, Operator, Retail.
-    </div>
-    <input type="text" name="dist_channel" id="dist_channel" size="80">
-  </div>
-
-  <div class="form_section">
-    <label for="reason" class="field_label required">Reason for Waiver Request</label>
-    <div class="field_desc">
-      Please describe which test cases, Branding Guidelines and/or Requirements the Partner is request waived.
-    </div>
-    <textarea id="reason" name="reason" cols="80" rows="5"></textarea>
-  </div>
-
-  <div class="form_section">
-    <label for="rationale" class="field_label required">Rationale for Granting Waiver Request</label>
-    <div class="field_desc">
-      Please document why the Partner thinks a waiver should be granted.
-    </div>
-    <textarea id="rationale" name="rationale" cols="80" rows="5"></textarea>
-  </div>
-
-  <div class="form_section">
-    <label for="impact" class="field_label required">Impact Analysis</label>
-    <div class="field_desc">
-      Please provide an assessment of the impact of granting this waiver in general business terms (this should include
-      broad perspective of potential issues such as brand consistency, impacts on reporting &amp; tracking capabilities,
-      help desk/support issues, etc.)
-    </div>
-    <textarea id="impact" name="impact" cols="80" rows="5"></textarea>
-  </div>
-
-  <input type="submit" id="commit" value="Submit">
-
-  <p>
-    [ <span class="required_star">*</span> <span class="required_explanation">
-      Required Field</span> ]
-  </p>
-</form>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl
deleted file mode 100644
index 69030bd3f..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl
+++ /dev/null
@@ -1,240 +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_js = BLOCK %]
-  var compdesc = new Array();
-  compdesc[""] = 'Please select a component from the list above.';
-  [% FOREACH comp = product.components %]
-    compdesc['[% comp.name FILTER js %]'] = '[% comp.description FILTER js %]';
-  [% END %]
-  function showCompDesc(component) {
-    var value = component.value;
-    document.getElementById('comp_description').innerHTML = compdesc[value];
-  }
-  function onSubmit() {
-    var alert_text = '';
-    var status_whiteboard = '';
-
-    if (!isFilledOut('component'))
-      alert_text += "Please select a value for component.\n";
-    if (!isFilledOut('short_desc'))
-      alert_text += "Please enter a value for the summary.\n";
-    if (!isFilledOut('steps_to_reproduce'))
-      alert_text += "Please enter the steps to reproduce.\n";
-    if (!isFilledOut('actual_behavior'))
-      alert_text += "Please enter the actual behavior.\n";
-    if (!isFilledOut('expected_behavior'))
-      alert_text += "Please enter the expected behavior.\n";
-    if (!isFilledOut('build'))
-      alert_text += "Please enter a value for the build.\n";
-    if (!isFilledOut('requirements'))
-      alert_text += "Please enter a value for the requirements.\n";
-
-    var device_values = new Array();
-    var device_select = document.getElementById("b2g_device");
-    for (var i = 0, l = device_select.options.length; i < l; i++) {
-      if (device_select.options[i].selected)
-        device_values.push(device_select.options[i].value);
-    }
-
-    if (device_values.length == 0)
-      alert_text += "Please select one or more devices.\n";
-
-    if (alert_text != '') {
-      alert(alert_text);
-      return false;
-    }
-
-    for (var i = 0, l = device_values.length; i < l; i++)
-      status_whiteboard += '[device:' + device_values[i] + '] ';
-
-    if (document.getElementById('third_party_app').checked)
-      status_whiteboard += '[apps watch list]';
-
-    document.getElementById('status_whiteboard').value = status_whiteboard;
-
-    return true;
-  }
-[% END %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Firefox OS Partner $terms.Bug Submission"
-   generate_api_token = 1
-   style_urls = [ 'skins/standard/enter_bug.css' ]
-   javascript = inline_js
-   javascript_urls = [ 'extensions/BMO/web/js/form_validate.js',
-                       'js/attachment.js', 'js/field.js', 'js/util.js' ]
-   onload = "showCompDesc(document.getElementById('component'));"
-%]
-
-<h2>Firefox OS Partner [% terms.Bug %] Submission</h2>
-
-<p>All fields are mandatory</p>
-
-<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-partner">
-<input type="hidden" name="product" value="Firefox OS">
-<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="keywords" id="keywords" value="unagi">
-<input type="hidden" name="status_whiteboard" id="status_whiteboard" value="">
-<input type="hidden" name="token" value="[% token FILTER html %]">
-
-<table>
-
-<tr>
-  <th>
-    <label for="short_desc">Summary:</label>
-  </th>
-  <td>
-    <input name="short_desc" id="short_desc" size="60"
-           value="[% short_desc FILTER html %]">
-  </td>
-</tr>
-
-<tr>
-  <th>
-    <label for="component">Component:</label>
-  </th>
-  <td>
-    <select name="component" id="component" onchange="showCompDesc(this);">
-      <option value="">Select One</option>
-      [%- FOREACH c = product.components %]
-        [% NEXT IF NOT c.is_active %]
-        <option value="[% c.name FILTER html %]"
-                id="v[% c.id FILTER html %]_component"
-          [% IF c.name == default.component_ %]
-                selected="selected"
-          [% END %]>
-          [% c.name FILTER html -%]
-        </option>
-      [%- END %]
-    </select
-  </td>
-</tr>
-
-<tr>
-  <td></td>
-  <td id="comp_description" align="left" style="color: green; padding-left: 1em"></td>
-</tr>
-
-<tr>
-  <th>
-    <label for="b2g_device">B2G Device:</label>
-  </th>
-  <td>
-    <select name="b2g_device" id="b2g_device"
-            size="5" multiple="multiple">
-      <option name="Otoro">Otoro</option>
-      <option name="Unagi">Unagi</option>
-      <option name="Inari">Inari</option>
-      <option name="Ikura">Ikura</option>
-      <option name="Hamachi">Hamachi</option>
-      <option name="Buri">Buri</option>
-      <option name="Toro">Toro</option>
-      <option name="Leo">Leo</option>
-      <option name="Twist">Twist</option>
-      <option name="Zero">Zero</option>
-      <option name="Tara">Tara</option>
-    </select>
-  </td>
-</tr>
-
-<tr>
-  <th>
-    <label for="other_party">What are the steps to reproduce?:</label>
-  </th>
-  <td>
-    <textarea id="steps_to_reproduce" name="steps_to_reproduce" rows="5" cols="60">1.
-2.
-3.</textarea>
-  </td>
-<tr>
-
-<tr>
-  <th>
-    <label for="actual_behavior">What was the actual behavior?:</label>
-  </th>
-  <td>
-    <textarea id="actual_behavior" name="actual_behavior" rows="5" cols="60"></textarea>
-  </td>
-<tr>
-
-<tr>
-  <th>
-    <label for="expected_behavior">What was the expected behavior?:</label>
-  </th>
-  <td>
-    <textarea name="expected_behavior" id="expected_behavior" rows="5" cols="60"></textarea>
-  </td>
-</tr>
-
-<tr>
-  <th>
-    <label for="build">What build were you using?:</label>
-  </th>
-  <td>
-    <input type="text" name="build" id="build" value="" size="60">
-  </td>
-</tr>
-
-<tr>
-  <th>
-    <label for="requirements">What are the requirements?:</label>
-  </th>
-  <td>
-    <input type="text" name="requirements" id="requirements" value="" size="60">
-  </td>
-</tr>
-
-<tr>
-  <th>
-    <label for="requirements">Third party app content?:</label>
-  </th>
-  <td>
-    <input type="checkbox" name="third_party_app" id="third_party_app">
-  </td>
-</tr>
-
-<tr>
-  <th>Security:</th>
-  <td>
-    <input type="checkbox" name="groups" id="default_security_group"
-           value="[% product.default_security_group FILTER html %]"
-      [% FOREACH g = group %]
-        [% IF g.name == name %]
-          [% ' checked="checked"' IF g.checked %]
-          [% LAST %]
-        [% END %]
-      [% END %]
-    >
-    <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>&nbsp;</td>
-  <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/create-fxos-preload-app.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-preload-app.html.tmpl
deleted file mode 100644
index c51c5c91d..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-fxos-preload-app.html.tmpl
+++ /dev/null
@@ -1,186 +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_style = BLOCK %]
-#fxos_preload_app_form {
-  padding: 10px;
-}
-#fxos_preload_app_form .required:after {
-  content: " *";
-  color: red;
-}
-#fxos_preload_app_form .field_label {
-  font-weight: bold;
-}
-#fxos_preload_app_form .field_desc {
-  padding-bottom: 3px;
-}
-#fxos_preload_app_form .field_desc,
-#fxos_preload_app_form .head_desc {
-  width: 600px;
-  word-wrap: normal;
-}
-#fxos_preload_app_form .head_desc {
-  padding-top: 5px;
-  padding-bottom: 12px;
-}
-#fxos_preload_app_form .form_section {
-  margin-bottom: 10px;
-}
-#fxos_preload_app_form textarea {
-  font-family: inherit;
-  font-size: inherit;
-}
-#fxos_preload_app_form em {
-  font-size: 1em;
-}
-.yui-calcontainer {
-  z-index: 2;
-}
-[% END %]
-
-[% inline_javascript = BLOCK %]
-function validateAndSubmit() {
-  'use strict';
-  var alert_text = '';
-  var requiredLabels = YAHOO.util.Selector.query('label.required');
-  if (requiredLabels) {
-    requiredLabels.forEach(function (label) {
-      var name = label.getAttribute('for');
-      var ids = YAHOO.util.Selector.query(
-        '#fxos_preload_app_form *[name="' + name + '"]'
-      ).map(function (e) {
-        return e.id
-      });
-
-      if (ids && ids[0]) {
-        if (!isFilledOut(ids[0])) {
-          var desc = label.textContent || name;
-          alert_text +=
-            "Please 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 = "Firefox OS Pre-load App"
-   generate_api_token = 1
-   style = inline_style
-   javascript = inline_javascript
-   javascript_urls = [ 'extensions/BMO/web/js/form_validate.js',
-                       'js/field.js', 'js/util.js' ]
-   yui = [ "calendar", "selector" ]
-%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-<form id="fxos_preload_app_form" method="post" action="post_bug.cgi"
-  enctype="multipart/form-data" onSubmit="return validateAndSubmit();">
-  <input type="hidden" name="format" value="fxos-preload-app">
-  <input type="hidden" name="product" value="Marketplace">
-  <input type="hidden" name="component" value="Request to Pre-Install Apps">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="version" value="1.0">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="token" value="[% token FILTER html %]">
-  <input type="hidden" name="short_desc" value="Information Request: Pre-Installed Apps">
-  <input type="hidden" name="groups" value="mozilla-employee-confidential">
-
-  <div class="head_desc">
-    Welcome to the Firefox OS Pre-load App Info Request Form!
-  </div>
-
-  <div class="form_section">
-    <label for="company_name" class="field_label required">Company Name</label>
-    <div class="field_desc">
-      Please enter the legal name of your company
-    </div>
-    <input type="text" name="company_name" id="company_name" size="80">
-  </div>
-
-
-  <div class="form_section">
-    <label for="apps_business_dev_contact_name" class="field_label required">Apps Business Development Contact Name</label>
-    <div class="field_desc">Please enter your Name</div>
-    <input type="text" name="apps_business_dev_contact_name" id="apps_business_dev_contact_name" size="80">
-  </div>
-
-  <div class="form_section">
-    <label for="apps_business_dev_contact_email" class="field_label required">Apps Business Development Contact Email</label>
-    <div class="field_desc">Please enter your Email address.</div>
-    <input type="text" name="apps_business_dev_contact_email" id="apps_business_dev_contact_email"
-    value="[% user.email FILTER html %]" size="80">
-  </div>
-
-  <div class="form_section">
-    <label for="preload_apps" class="field_label required">Name of Firefox Marketplace apps of interest to you:</label>
-    <div class="field_desc">
-      Please provide the App Name and Marketplace URL for each app you wish to pre-load on your certified, branded
-      Firefox OS device.  The Marketplace URL is an important identifier because there are many apps in Marketplace with
-      the same name.
-    </div>
-    <textarea id="preload_apps" name="preload_apps"
-      cols="80" rows="5"></textarea>
-  </div>
-
-  <div class="form_section">
-    <label for="countries" class="field_label required">Countries where your device will be distributed</label>
-    <div class="field_desc">
-      Please list the countries where your device will be distributed.  This information is required because it
-      corresponds to the countries that the developers will evaluate for distribution rights.
-    </div>
-    <textarea id="countries" name="countries"
-      cols="80" rows="5"></textarea>
-  </div>
-
-  <div class="form_section">
-    <label for="release_info" class="field_label required">Release Information</label>
-    <div class="field_desc">
-      Please provide the Version of Firefox OS for your Branded, Certified device on which you plan to pre-load the
-      requested apps.
-    </div>
-    <input type="text" name="release_info" id="release_info" size="80">
-  </div>
-
-  <div class="form_section">
-    <label for="device_info" class="field_label required">Device Information</label>
-    <div class="field_desc">
-      Please include the device make and model, screen size, Chipset and RAM configuration for the Branded, Certified
-      device on which you plan to pre-load the requested apps.
-    </div>
-    <textarea id="device_info" name="device_info"
-      cols="80" rows="5"></textarea>
-  </div>
-
-  <p>When you press submit the information you've provided will be routed to Mozilla team members for follow up.  The
-  system will also respond with a [% terms.Bugzilla %] tracking number that you may use for follow up.</p>
-
-  <input type="submit" id="commit" value="Submit">
-
-  <p>
-    [ <span class="required_star">*</span> <span class="required_explanation">
-      Required Field</span> ]
-  </p>
-</form>
-
-[% PROCESS global/footer.html.tmpl %]