Bug 950486: Move the webdotbase and font_file parameters from data/params into localconfig (and kill the Graphs panel). r=gerv, a=glob.

6 files changed, 58 insertions, 23 deletions

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 516a24ed8..e27f47263 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -595,7 +595,8 @@
       <td colspan="2" id="show_dependency_tree_or_graph">
         Show dependency <a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">tree</a>
 
-        [% IF Param('webdotbase') %]
+        [% USE Bugzilla %]
+        [% IF Bugzilla.localconfig.webdotbase %]
           /&nbsp;<a href="showdependencygraph.cgi?id=[% bug.bug_id %]">graph</a>
         [% END %]
       </td>
@@ -968,7 +969,6 @@
 
 [% BLOCK section_customfields %]
 [%# *** Custom Fields *** %]
-  [% USE Bugzilla %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
       [% PROCESS bug/field.html.tmpl value = bug.${field.name}
diff --git a/template/en/default/reports/chart.png.tmpl b/template/en/default/reports/chart.png.tmpl
index 91944fee5..336efda2a 100644
--- a/template/en/default/reports/chart.png.tmpl
+++ b/template/en/default/reports/chart.png.tmpl
@@ -34,12 +34,13 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_x_axis_font(Param("font_file"), 9);
-     graph.set_x_label_font(Param("font_file"), 10);
-     graph.set_y_axis_font(Param("font_file"), 9);
-     graph.set_y_label_font(Param("font_file"), 10);
-     graph.set_legend_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_x_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_x_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_y_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_y_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_legend_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl
index d879f6dd1..3f0faa5d9 100644
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
@@ -36,12 +36,13 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_x_axis_font(Param("font_file"), 9);
-     graph.set_x_label_font(Param("font_file"), 10);
-     graph.set_y_axis_font(Param("font_file"), 9);
-     graph.set_y_label_font(Param("font_file"), 10);
-     graph.set_legend_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_x_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_x_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_y_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_y_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_legend_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl
index 585133afd..a4baff641 100644
--- a/template/en/default/reports/report-line.png.tmpl
+++ b/template/en/default/reports/report-line.png.tmpl
@@ -38,12 +38,13 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_x_axis_font(Param("font_file"), 9);
-     graph.set_x_label_font(Param("font_file"), 10);
-     graph.set_y_axis_font(Param("font_file"), 9);
-     graph.set_y_label_font(Param("font_file"), 10);
-     graph.set_legend_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_x_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_x_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_y_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_y_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_legend_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl
index cc2a1325a..6808cfb77 100644
--- a/template/en/default/reports/report-pie.png.tmpl
+++ b/template/en/default/reports/report-pie.png.tmpl
@@ -20,9 +20,10 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_title_font(Param("font_file"), 10);
-     graph.set_value_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_title_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_value_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index c63d65ce1..b6cd693d7 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -23,6 +23,13 @@ happens when you are not running checksetup.pl as ##root##. To see the
 problem we ran into, run: ##command##
 END
     bad_executable => 'not a valid executable: ##bin##',
+    bad_font_file => <<'END',
+The file ##file## cannot be found. Make sure you typed the full path to the file
+END
+    bad_font_file_name => <<'END',
+The file ##file## must point to a TrueType font file (its extension must be
+.ttf)
+END
     blacklisted => '(blacklisted)',
     bz_schema_exists_before_220 => <<'END',
 You are upgrading from a version before 2.20, but the bz_schema table
@@ -215,6 +222,15 @@ For the "Difference Between Two Patches" feature to work, we need to know
 what directory the "diff" bin is in. (You only need to set this if you
 are using that feature of the Patch Viewer.)
 END
+    localconfig_font_file => <<'END',
+You can specify the full path to a TrueType font file, which will be used to
+display text (labels, legends, ...) in charts and graphical reports. To support
+as many languages as possible, we recommend to specify a TrueType font such as
+Unifont (http://unifoundry.com/unifont.html), which supports all printable
+characters in the Basic Multilingual Plane. If you leave this parameter empty,
+a default font will be used, but its support is limited to English characters
+only and so other characters will be displayed incorrectly.
+END
     localconfig_index_html => <<'END',
 Most web servers will allow you to use index.cgi as a directory
 index, and many come preconfigured that way, but if yours doesn't
@@ -252,6 +268,21 @@ a normal webserver environment.
 If set to 1, checksetup.pl will set file permissions so that Bugzilla
 works in a SuexecUserGroup environment. 
 END
+    localconfig_webdotbase => <<'END',
+It is possible to show graphs of dependent bugs. You may set this parameter to
+any of the following:
+
+- A complete file path to 'dot' (part of GraphViz (http://www.graphviz.org/))
+  will generate the graphs locally.
+- A URL prefix pointing to an installation of the webdot package will generate
+  the graphs remotely. (append "/%urlbase%" to the URL prefix)
+- A blank value will disable dependency graphing.
+
+If you use a webdot URL prefix, make certain that the webdot server can read
+files from your webdot directory. On Apache you do this by editing the
+.htaccess file, for other systems the needed measures may vary. You can run
+checksetup.pl to recreate the .htaccess file if it has been lost.
+END
     localconfig_webservergroup => <<'END',
 The name of the group that your web server runs as. On Red Hat
 distributions, this is usually "apache". On Debian/Ubuntu, it is