summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/global/messages.html.tmpl11
-rw-r--r--template/en/default/global/user-error.html.tmpl7
-rw-r--r--template/en/default/list/list.html.tmpl7
-rw-r--r--template/en/default/reports/create-chart.html.tmpl2
-rw-r--r--template/en/default/reports/edit-series.html.tmpl21
-rw-r--r--template/en/default/reports/series.html.tmpl9
-rw-r--r--template/en/default/search/search-create-series.html.tmpl14
7 files changed, 43 insertions, 28 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 1e544cb22..7fc93f013 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -135,17 +135,6 @@
<a href="editflagtypes.cgi">Back to flag types.</a>
</p>
- [% ELSIF message_tag == "series_already_exists" %]
- [% title = "Series Already Exists" %]
- A series <em>[% series.category FILTER html %] /
- [%+ series.subcategory FILTER html %] /
- [%+ series.name FILTER html %]</em>
- already exists. If you want to create this series, you will need to give
- it a different name.
- <br><br>
- Go back or
- <a href="query.cgi?format=create-series">create another series</a>.
-
[% ELSIF message_tag == "series_created" %]
[% title = "Series Created" %]
The series <em>[% series.category FILTER html %] /
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 06ce6e441..3fa735cc3 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -657,6 +657,13 @@
[% title = "Access Denied" %]
You do not have the permissions necessary to run a sanity check.
+ [% ELSIF error == "series_already_exists" %]
+ [% title = "Series Already Exists" %]
+ A series named <em>[% series.category FILTER html %] /
+ [%+ series.subcategory FILTER html %] /
+ [%+ series.name FILTER html %]</em>
+ already exists.
+
[% ELSIF error == "sidebar_supports_mozilla_only" %]
Sorry - sidebar.cgi currently only supports Mozilla based web browsers.
<a href="http://www.mozilla.org">Upgrade today</a>. :-)
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 5eb7b7c45..f0e03cd42 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -19,6 +19,11 @@
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
+[%# INTERFACE:
+ # searchtype: string. Type of search - either "series", "saved" or undef.
+ # ...
+ #%]
+
[%############################################################################%]
[%# Template Initialization #%]
[%############################################################################%]
@@ -155,7 +160,7 @@
<a href="query.cgi?[% urlquerypart FILTER html %]">Edit&nbsp;Search</a>
</td>
- [% IF searchname %]
+ [% IF searchtype == "saved" %]
<td valign="middle" nowrap="nowrap">
|
<a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index c91fea132..28776662a 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -190,7 +190,7 @@ function subcatSelected() {
</td>
<td align="center">
- [% IF series.creator != 0 %]
+ [% IF NOT series.public %]
[% IF series.isSubscribed(user.id) %]
<input type="submit" value="Unsubscribe" style="width: 12ex;"
name="action-unsubscribe[% series.series_id %]">
diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl
index 011ae1aa4..4d3526e3c 100644
--- a/template/en/default/reports/edit-series.html.tmpl
+++ b/template/en/default/reports/edit-series.html.tmpl
@@ -28,12 +28,19 @@
[% PROCESS global/header.html.tmpl %]
+[% IF changes_saved %]
+ <p>
+ <font color="red">
+ Series updated.
+ </font>
+ </p>
+[% END %]
+
<form method="get" action="chart.cgi" name="chartform">
- [% button_name = "Change" %]
-
- [% PROCESS reports/series.html.tmpl %]
- <input type="hidden" name="action-alter" value="1">
+ [% PROCESS reports/series.html.tmpl
+ button_name = "Change Data Set" %]
+ <input type="hidden" name="action" value="alter">
[% IF default.series_id %]
<input type="hidden" name="series_id" value="[% default.series_id %]">
@@ -50,8 +57,12 @@
[% END %]
</p>
+<p>Note: it is not yet possible to edit the search associated with this data
+set.
+</p>
+
<p>
- <a href="query.cgi?[% default.query FILTER html%]">View
+ <a href="query.cgi?[% default.query FILTER html %]">View
series search parameters</a> |
<a href="buglist.cgi?cmdtype=dorem&amp;namedcmd=
[% default.category FILTER url_quote %]-
diff --git a/template/en/default/reports/series.html.tmpl b/template/en/default/reports/series.html.tmpl
index d66ff5a15..94eb02e9f 100644
--- a/template/en/default/reports/series.html.tmpl
+++ b/template/en/default/reports/series.html.tmpl
@@ -86,14 +86,9 @@
</td>
<td></td>
<td>
- <input type="submit" name="action-create" value="Create Data Set">
+ <input type="submit" name="submit-button"
+ value="[% button_name FILTER html %]">
</td>
</tr>
</tbody>
</table>
-
-<script language="JavaScript" type="text/javascript">
- document.chartform.category[0].selected = true;
- catSelected();
- checkNewState();
-</script>
diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl
index f529ae3d3..b0a5b4315 100644
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
@@ -34,7 +34,7 @@
<p style="color: red">
Note: there is currently a restriction that data sets will only count public
- [% terms.bugs %] (those not in any group).
+ [%+ terms.bugs %] (those not in any group).
</p>
<form method="get" action="chart.cgi" name="chartform">
@@ -43,12 +43,20 @@
<p>
<input type="submit" name="action-search" value="Run Search">
- to see which [% terms.bugs %] would be included in this series.
+ to see which [% terms.bugs %] would be included in this data set.
</p>
<h3>Data Set Parameters</h3>
-[% INCLUDE reports/series.html.tmpl %]
+[% PROCESS reports/series.html.tmpl
+ button_name = "Create Data Set" %]
+ <input type="hidden" name="action" value="create">
+
+<script language="JavaScript" type="text/javascript">
+ document.chartform.category[0].selected = true;
+ catSelected();
+ checkNewState();
+</script>
<hr>