summaryrefslogtreecommitdiffstats
path: root/extensions/BMO/template
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/BMO/template')
-rw-r--r--extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl16
-rw-r--r--extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl5
-rw-r--r--extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl98
3 files changed, 10 insertions, 109 deletions
diff --git a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
index eff0e35cc..85881aca7 100644
--- a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -22,15 +22,19 @@
[% title = "Missing Username" %]
You must provide at least one email address to report on.
-[% ELSIF error == "report_invalid_date" %]
+[% ELSIF error == "user_activity_missing_from_date" %]
+ [% title = "Missing Date" %]
+ You must provided the period start date.
+
+[% ELSIF error == "user_activity_missing_to_date" %]
+ [% title = "Missing Date" %]
+ You must provided the period end date.
+
+[% ELSIF error == "user_activity_invalid_date" %]
[% title = "Invalid Date" %]
The date '[% date FILTER html %]' is invalid.
-[% ELSIF error == "report_invalid_parameter" %]
- [% title = "Invalid Parameter" %]
- The value for parameter [% name FILTER html %] is invalid.
-
[% ELSIF error == "invalid_object" %]
- Invalid [% object FILTER html %]: "[% value FILTER html %]"
+ Invalid [% object FILTER html %]: "[% value FILTER html %]"
[% END %]
diff --git a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
index 7c2b2d753..846f12767 100644
--- a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
@@ -31,11 +31,6 @@
%]page.cgi?id=triage_reports.html">Triage Report</a></strong> - Report
on UNCONFIRMED [% terms.bugs %] to assist triage.
</li>
- <li>
- <strong><a href="[% urlbase FILTER none
- %]page.cgi?id=release_tracking_report.html">Release Tracking Report</a></strong> -
- For triaging release-train flag information.
- </li>
[% IF user.in_group('editusers') %]
<li>
<strong><a href="[% urlbase FILTER none
diff --git a/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl b/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl
deleted file mode 100644
index 5e64c6b5e..000000000
--- a/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl
+++ /dev/null
@@ -1,98 +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.
- #%]
-
-[% INCLUDE global/header.html.tmpl
- title = "Release Tracking Report"
- style_urls = [ "extensions/BMO/web/styles/reports.css" ]
- javascript_urls = [ "extensions/BMO/web/js/release_tracking_report.js" ]
-%]
-
-<noscript>
-<h1>JavaScript is required to use this report.</h1>
-</noscript>
-
-<script>
-var flags_data = [% flags_json FILTER none %];
-var products_data = [% products_json FILTER none %];
-var fields_data = [% fields_json FILTER none %];
-var default_query = '[% default_query FILTER js %]';
-</script>
-
-<form action="page.cgi" method="get" onSubmit="return onFormSubmit()">
-<input type="hidden" name="id" value="release_tracking_report.html">
-<input type="hidden" name="q" id="q" value="">
-<table>
-
-<tr>
- <th>Approval:</th>
- <td>
- Show bugs where
- <select id="flag" onChange="onFlagChange()">
- [% FOREACH flag_name = flag_names %]
- <option value="[% flag_name FILTER html %]">[% flag_name FILTER html %]</option>
- [% END %]
- </select>
-
- was changed to (and is currently)
- <select id="flag_value">
- <option value="?">?</option>
- <option value="-">-</option>
- <option value="+">+</option>
- </select>
-
- between
- <select id="range" onChange="serialiseForm()">
- [% FOREACH range = ranges %]
- <option value="[% range.value FILTER html %]">
- [% range.label FILTER html %]
- </option>
- [% END %]
- </select>
- </td>
-</tr>
-
-<tr>
- <th>Status:</th>
- <td>
- for the product
- <select id="product" onChange="onProductChange()">
- </select>
- </td>
-</tr>
-
-<tr>
- <td>&nbsp;</td>
- <td>
- <select id="op" onChange="serialiseForm()">
- <option value="and">All selected tracking fields (AND)</option>
- <option value="or">Any selected tracking fields (OR)</option>
- </select>
- [
- <a href="javascript:void(0)" onClick="selectAllFields()">All</a> |
- <a href="javascript:void(0)" onClick="selectNoFields()">None</a>
- ]
- [
- <a href="javascript:void(0)" onClick="invertFields()">Invert</a>
- ]
- <br>
- <span id="tracking_span">
- </span>
- </td>
-</tr>
-
-<tr>
- <td>&nbsp;</td>
- <td colspan="2">
- <input type="submit" value="Search">
- <input type="submit" value="Reset" onClick="onFormReset(); return false">
- </td>
-</tr>
-</table>
-</form>
-
-[% INCLUDE global/footer.html.tmpl %]