From 4f6b75a65628b0d86c760309dd81dd03f5c6d308 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Thu, 26 Jun 2003 06:22:50 +0000
Subject: Bug 16009 - generic charting. Patch by gerv; r,a=justdave.

---
 template/en/default/global/code-error.html.tmpl | 11 +++++++
 template/en/default/global/messages.html.tmpl   | 23 ++++++++++++++
 template/en/default/global/user-error.html.tmpl | 42 +++++++++++++++++++++++--
 3 files changed, 74 insertions(+), 2 deletions(-)

(limited to 'template/en/default/global')

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 68f046091..84a5e3259 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -132,6 +132,11 @@
     [% title = "Invalid Dimensions" %]
     The width or height specified is not a positive integer.
     
+  [% ELSIF error == "invalid_series_id" %]
+    [% title = "Invalid Series" %]
+    The series_id [% series_id FILTER html %] is not valid. It may be that
+    this series has been deleted.
+    
   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
     Attachment [% attach_id FILTER html %] ([% description FILTER html %]) 
     is attached to bug [% attach_bug_id FILTER html %], but you tried to 
@@ -178,6 +183,12 @@
   [% ELSIF error == "missing_bug_id" %]
     No bug ID was given.
     
+  [% ELSIF error == "missing_series_id" %]
+    Having inserted a series into the database, no series_id was returned for
+    it. Series: [% series.category FILTER html %] / 
+    [%+ series.subcategory FILTER html %] / 
+    [%+ series.name FILTER html %].
+    
   [% ELSIF error == "no_y_axis_defined" %]
     No Y axis was defined when creating report. The X axis is optional,
     but the Y axis is compulsory.
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 13136d6cf..6b9612f54 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -131,6 +131,29 @@
       <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. @@@ subscribe?
+      <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 %] /
+      [%+ series.subcategory FILTER html %] / 
+      [%+ series.name FILTER html %]</em>
+      has been created. Note that you may need to wait up to 
+      [% series.frequency * 2 %] days before there will be enough data for a
+      chart of this series to be produced.
+      <br><br>
+      Go back or 
+      <a href="query.cgi?format=create-series">create another series</a>.
+    
   [% ELSIF message_tag == "shutdown" %]
     [% title = "Bugzilla is Down" %]
     [% Param("shutdownhtml") %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index f626c640b..a057ef96b 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -255,7 +255,7 @@
     You entered <tt>[% value FILTER html %]</tt>, which isn't.
     
   [% ELSIF error == "illegal_date" %]
-    [% title = "Your Query Makes No Sense" %]
+    [% title = "Illegal Date" %]
     '<tt>[% date FILTER html %]</tt>' is not a legal date.
     
   [% ELSIF error == "illegal_email_address" %]
@@ -266,6 +266,11 @@
     It must also not contain any of these special characters:
     <tt>\ ( ) &amp; &lt; &gt; , ; : &quot; [ ]</tt>, or any whitespace.
     
+  [% ELSIF error == "illegal_frequency" %]
+    [% title = "Too Frequent" %]
+    Unless you are an administrator, you may not create series which are 
+    run more often than once every [% minimum FILTER html %] days.
+    
   [% ELSIF error == "illegal_group_control_combination" %]
     [% title = "Your Group Control Combination Is Illegal" %]
     Your group control combination for group &quot;
@@ -282,6 +287,18 @@
     The name of your query cannot contain any of the following characters: 
     &lt;, &gt;, &amp;.
 
+  [% ELSIF error == "illegal_series_creation" %]
+    You are not authorised to create series.
+        
+  [% ELSIF error == "illegal_series_edit" %]
+    You are not authorised to edit this series. To do this, you must either
+    be its creator, or an administrator.
+        
+  [% ELSIF error == "insufficient_data" %]
+    [% title = "Insufficient Data" %]
+    None of the series you selected have any data associated with them, so a
+    chart cannot be plotted.
+        
   [% ELSIF error == "insufficient_data_points" %]
     We don't have enough data points to make a graph (yet).
         
@@ -352,10 +369,19 @@
     if you are going to accept it.  Part of accepting 
     a bug is giving an estimate of when it will be fixed.
 
+  [% ELSIF error == "misarranged_dates" %]
+    [% title = "Misarranged Dates" %]
+    Your start date ([% datefrom FILTER html %]) is after 
+    your end date ([% dateto FILTER html %]).
+    
   [% ELSIF error == "missing_attachment_description" %]
     [% title = "Missing Attachment Description" %]
     You must enter a description for the attachment.
     
+  [% ELSIF error == "missing_category" %]
+    [% title = "Missing Category" %]
+    You did not specify a category for this series.
+                
   [% ELSIF error == "missing_content_type" %]
     [% title = "Missing Content-Type" %]
      You asked Bugzilla to auto-detect the content type, but
@@ -383,14 +409,26 @@
     You must specify one or more fields in which to search for
     <tt>[% email FILTER html %]</tt>.
     
+  [% ELSIF error == "missing_frequency" %]
+    [% title = "Missing Frequency" %]
+    You did not specify a valid frequency for this series.
+                
+  [% ELSIF error == "missing_name" %]
+    [% title = "Missing Name" %]
+    You did not specify a name for this series.
+                
   [% ELSIF error == "missing_query" %]
     [% title = "Missing Query" %]
     The query named <em>[% queryname FILTER html %]</em> does not
     exist.
         
+  [% ELSIF error == "missing_subcategory" %]
+    [% title = "Missing Subcategory" %]
+    You did not specify a subcategory for this series.
+                
   [% ELSIF error == "need_component" %]
     [% title = "Component Required" %]
-    You must specify a component to help determine the new owner of these bugs.                            
+    You must specify a component to help determine the new owner of these bugs.
 
   [% ELSIF error == "need_numeric_value" %]
     [% title = "Numeric Value Required" %]
-- 
cgit v1.2.3-24-g4f1b