3 files changed, 19 insertions, 13 deletions
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>