diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/reports/create-chart.html.tmpl | 42 | ||||
| -rw-r--r-- | template/en/default/reports/series.html.tmpl | 5 | ||||
| -rw-r--r-- | template/en/default/search/search-create-series.html.tmpl | 5 |
3 files changed, 7 insertions, 45 deletions
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl index 28776662a..7b5b4c298 100644 --- a/template/en/default/reports/create-chart.html.tmpl +++ b/template/en/default/reports/create-chart.html.tmpl @@ -60,14 +60,6 @@ function subcatSelected() { [% gttext = "Grand Total" %] <form method="get" action="chart.cgi" name="chartform"> - <p> - <span style="color: red"> - Note: this new charting system is in beta. This means that retention of - data or defined data sets is on a best-efforts basis only, and cannot be - guaranteed. Please file any [% terms.bugs %] you find or enhancement - ideas you think of. - </span> - </p> <table cellpadding="2" cellspacing="2" border="0"> [% IF NOT category OR category.size == 0 %] @@ -144,7 +136,6 @@ function subcatSelected() { <th></th> <th>Data Set</th> <th></th> - <th></th> </tr> [%# The external loop has two counters; one which keeps track of where we @@ -190,18 +181,6 @@ function subcatSelected() { </td> <td align="center"> - [% IF NOT series.public %] - [% IF series.isSubscribed(user.id) %] - <input type="submit" value="Unsubscribe" style="width: 12ex;" - name="action-unsubscribe[% series.series_id %]"> - [% ELSE %] - <input type="submit" value="Subscribe" style="width: 12ex;" - name="action-subscribe[% series.series_id %]"> - [% END %] - [% END %] - </td> - - <td align="center"> [% IF user.id == series.creator OR UserInGroup("admin") %] <a href="chart.cgi?action=edit&series_id= [% series.series_id %]">Edit</a> | @@ -233,7 +212,6 @@ function subcatSelected() { <i>[% gttext FILTER html %]</i> </td> <td></td> - <td></td> </tr> [% END %] <tr> @@ -255,7 +233,7 @@ function subcatSelected() { </td> <td></td> - <td valign="bottom" colspan="2"> + <td valign="bottom"> <b>Date Range:</b> <input type="text" size="12" name="datefrom" value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom%]"> @@ -274,23 +252,9 @@ function subcatSelected() { [% END %] </form> -<h4>How Subscriptions Work</h4> - -<p> -Administrators may mark data sets as public, which then show up in everyone's -list. All others are not public, and you must explicitly subscribe to them in -order for them to appear in your list. -</p> - -<p> -When you [% IF UserInGroup('editbugs') %] - <a href="query.cgi?format=create-series">create a new data set</a>, -[% ELSE %] - create a new data set, + <h3><a href="query.cgi?format=create-series">Create New Data Set</a></h3> [% END %] -you are automatically subscribed to it. When the last person unsubscribes -from a data set, data stops being collected. -</p> [% PROCESS global/footer.html.tmpl %] + diff --git a/template/en/default/reports/series.html.tmpl b/template/en/default/reports/series.html.tmpl index 94eb02e9f..c1ad55d1f 100644 --- a/template/en/default/reports/series.html.tmpl +++ b/template/en/default/reports/series.html.tmpl @@ -65,10 +65,13 @@ <input type="text" size="2" name="frequency" value="[% (default.frequency.0 OR 7) FILTER html %]"> <span style="font-weight: bold;"> day(s)</span><br> + [%# Change 'admin' here and in Series.pm, or remove the check + completely, if you want to change who can make series public. %] [% IF UserInGroup('admin') %] <input type="checkbox" name="public" [% "checked='checked'" IF default.public.0 %]> - <span style="font-weight: bold;">Visible to all</span> + <span style="font-weight: bold;">Visible to all<br> + (within group restrictions)</span> [% END %] </td> </tr> diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl index b0a5b4315..6caf6da09 100644 --- a/template/en/default/search/search-create-series.html.tmpl +++ b/template/en/default/search/search-create-series.html.tmpl @@ -32,11 +32,6 @@ onload = "selectProduct(document.forms['chartform']);" %] -<p style="color: red"> - Note: there is currently a restriction that data sets will only count public - [%+ terms.bugs %] (those not in any group). -</p> - <form method="get" action="chart.cgi" name="chartform"> [% PROCESS search/form.html.tmpl %] |