--- loncom/interface/loncommon.pm 2009/05/15 09:33:22 1.815
+++ loncom/interface/loncommon.pm 2009/05/15 18:06:13 1.817
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.815 2009/05/15 09:33:22 tempelho Exp $
+# $Id: loncommon.pm,v 1.817 2009/05/15 18:06:13 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4144,35 +4144,24 @@ Returns: value of designparamter $which
##############################################
sub designparm {
my ($which,$domain)=@_;
- if ($env{'browser.blackwhite'} eq 'on') {
- if ($which=~/\.(font|alink|vlink|link|textcol)$/) {
- return '#000000';
- }
- if ($which=~/\.(pgbg|sidebg|bgcol)$/) {
- return '#FFFFFF';
- }
- if ($which=~/\.tabbg$/) {
- return '#CCCCCC';
- }
- }
if (exists($env{'environment.color.'.$which})) {
- return $env{'environment.color.'.$which};
+ return $env{'environment.color.'.$which};
}
$domain=&determinedomain($domain);
my %domdesign = &get_domainconf($domain);
my $output;
if ($domdesign{$domain.'.'.$which} ne '') {
- $output = $domdesign{$domain.'.'.$which};
+ $output = $domdesign{$domain.'.'.$which};
} else {
$output = $defaultdesign{$which};
}
if (($which =~ /^(student|coordinator|author|admin)\.img$/) ||
($which =~ /login\.(img|logo|domlogo|login)/)) {
if ($output =~ m{^/(adm|res)/}) {
- if ($output =~ m{^/res/}) {
- my $local_name = &Apache::lonnet::filelocation('',$output);
- &Apache::lonnet::repcopy($local_name);
- }
+ if ($output =~ m{^/res/}) {
+ my $local_name = &Apache::lonnet::filelocation('',$output);
+ &Apache::lonnet::repcopy($local_name);
+ }
$output = &lonhttpdurl($output);
}
}
@@ -4220,8 +4209,6 @@ Inputs:
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
-=item * $notitle, if true keep the nav controls, but remove the title bar
-
=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link
@@ -4242,7 +4229,7 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4360,13 +4347,10 @@ ENDROLE
.&Apache::lonmenu::constspaceform();
}
- my $titletable;
- if (!$notitle) {
- $titletable =
- ''.
- "| $titleinfo $dc_info | ".$roleinfo.
- '
';
- }
+ my $titletable = ''
+ ."| $titleinfo $dc_info | ".$roleinfo
+ .'
';
+
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
@@ -4397,9 +4381,6 @@ ENDROLE
my $menu= ($no_inline_link?''
:'
'.&mt('Switch to Inline Menu Mode').'');
#
- if ($notitle) {
- return $bodytag;
- }
return(<
@@ -4452,15 +4433,6 @@ sub make_attr_string {
$attr_ref->{'style'}=$style.'; font-size: x-large;';
}
- if ($env{'browser.blackwhite'} eq 'on') {
- delete($attr_ref->{'font'});
- delete($attr_ref->{'link'});
- delete($attr_ref->{'alink'});
- delete($attr_ref->{'vlink'});
- delete($attr_ref->{'bgcolor'});
- delete($attr_ref->{'background'});
- }
-
my $attr_string;
foreach my $attr (keys(%$attr_ref)) {
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
@@ -6486,7 +6458,6 @@ $args - additional optional args support
is not auto translated like the $title is
frameset -> if true will start with a