--- loncom/interface/loncommon.pm 2004/01/29 19:29:53 1.177
+++ loncom/interface/loncommon.pm 2004/02/04 15:29:06 1.179
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.177 2004/01/29 19:29:53 www Exp $
+# $Id: loncommon.pm,v 1.179 2004/02/04 15:29:06 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -592,8 +592,9 @@ sub help_open_topic {
}
# Add the graphic
+ my $title = &mt('Online Help');
$template .= <<"ENDTEMPLATE";
-
+
ENDTEMPLATE
if ($text ne '') { $template.='' };
return $template;
@@ -655,8 +656,9 @@ sub help_open_bug {
}
# Add the graphic
+ my $title = &mt('Report a Bug');
$template .= <<"ENDTEMPLATE";
-
+
ENDTEMPLATE
if ($text ne '') { $template.='' };
return $template;
@@ -698,8 +700,9 @@ sub help_open_faq {
}
# Add the graphic
+ my $title = &mt('View the FAQ');
$template .= <<"ENDTEMPLATE";
-
+
ENDTEMPLATE
if ($text ne '') { $template.='' };
return $template;
@@ -2992,6 +2995,8 @@ If $Max is < any data point, the graph w
=item $colors: array ref holding the colors to be used for the data sets when
they are plotted. If undefined, default values will be used.
+=item $labels: array ref holding the labels to use on the x-axis for the bars.
+
=item @Values: An array of array references. Each array reference holds data
to be plotted in a stacked bar chart.
@@ -3007,7 +3012,7 @@ information for the plot.
############################################################
############################################################
sub DrawBarGraph {
- my ($Title,$xlabel,$ylabel,$Max,$colors,@Values)=@_;
+ my ($Title,$xlabel,$ylabel,$Max,$colors,$labels,@Values)=@_;
#
if (! defined($colors)) {
$colors = ['#33ff00',
@@ -3050,8 +3055,12 @@ sub DrawBarGraph {
}
#
my @Labels;
- for (my $i=0;$i<@{$Values[0]};$i++) {
- push (@Labels,$i+1);
+ if (defined($labels)) {
+ @Labels = @$labels;
+ } else {
+ for (my $i=0;$i<@{$Values[0]};$i++) {
+ push (@Labels,$i+1);
+ }
}
#
$Max = 1 if ($Max < 1);