--- loncom/interface/loncommon.pm 2004/10/23 00:38:01 1.223
+++ loncom/interface/loncommon.pm 2004/11/02 19:01:12 1.225
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.223 2004/10/23 00:38:01 albertel Exp $
+# $Id: loncommon.pm,v 1.225 2004/11/02 19:01:12 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2518,7 +2518,7 @@ other decorations will be returned.
=cut
sub bodytag {
- my ($title,$function,$addentries,$bodyonly,$domain,$forcereg)=@_;
+ my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle)=@_;
$title=&mt($title);
$function = &get_users_function() if (!$function);
my $img=&designparm($function.'.img',$domain);
@@ -2564,6 +2564,7 @@ END
return $bodytag;
} elsif ($ENV{'browser.interface'} eq 'textual') {
# Accessibility
+
return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
$forcereg).
'
LON-CAPA: '.$title.'
';
@@ -2585,15 +2586,23 @@ END
ENDROLE
+ my $titleinfo = ''.$title.'';
+ if ($customtitle) {
+ $titleinfo = $customtitle;
+ }
return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
$forcereg).
- ''.$title.
-' | '.$roleinfo.'
';
+ ''.$titleinfo.' | '.$roleinfo.'
';
}
#
# Top frame rendering, Remote is up
#
+ my $titleinfo = ' '.$title.'';
+ if ($customtitle) {
+ $titleinfo = $customtitle;
+ }
return(<
@@ -2603,7 +2612,7 @@ $upperleft
- $title
+$titleinfo
|
$ENV{'environment.firstname'}
@@ -3283,7 +3292,18 @@ sub DrawBarGraph {
if (! @Values || ref($Values[0]) ne 'ARRAY') {
return '';
}
+ #
+ my @Labels;
+ if (defined($labels)) {
+ @Labels = @$labels;
+ } else {
+ for (my $i=0;$i<@{$Values[0]};$i++) {
+ push (@Labels,$i+1);
+ }
+ }
+ #
my $NumBars = scalar(@{$Values[0]});
+ if ($NumBars < scalar(@Labels)) { $NumBars = scalar(@Labels); }
my %ValuesHash;
my $NumSets=1;
foreach my $array (@Values) {
@@ -3293,10 +3313,14 @@ sub DrawBarGraph {
}
#
my ($height,$width,$xskip,$bar_width) = (200,120,1,15);
- if ($NumBars < 5) {
- $width = 120+$NumBars*25;
+ if ($NumBars < 3) {
+ $width = 120+$NumBars*32;
$xskip = 1;
- $bar_width = 25;
+ $bar_width = 30;
+ } elsif ($NumBars < 5) {
+ $width = 120+$NumBars*20;
+ $xskip = 1;
+ $bar_width = 20;
} elsif ($NumBars < 10) {
$width = 120+$NumBars*15;
$xskip = 1;
@@ -3315,15 +3339,6 @@ sub DrawBarGraph {
$bar_width = 4;
}
#
- my @Labels;
- if (defined($labels)) {
- @Labels = @$labels;
- } else {
- for (my $i=0;$i<@{$Values[0]};$i++) {
- push (@Labels,$i+1);
- }
- }
- #
$Max = 1 if ($Max < 1);
if ( int($Max) < $Max ) {
$Max++;
|