--- loncom/interface/loncommon.pm 2007/04/05 21:36:15 1.519 +++ loncom/interface/loncommon.pm 2007/04/16 23:25:04 1.525 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.519 2007/04/05 21:36:15 raeburn Exp $ +# $Id: loncommon.pm,v 1.525 2007/04/16 23:25:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3248,7 +3248,7 @@ sub domainlogo { # See if there is a logo if ($designhash{$domain.'.login.domlogo'} ne '') { my $imgsrc = $designhash{$domain.'.login.domlogo'}; - if ($imgsrc =~ /^\/adm/) { + if ($imgsrc =~ /^\/(adm|res)/) { $imgsrc = &lonhttpdurl($imgsrc); } return ''.$domain.''; @@ -3290,11 +3290,19 @@ sub designparm { } $domain=&determinedomain($domain); my %domdesign = &get_domainconf($domain); + my $output; if ($domdesign{$domain.'.'.$which} ne '') { - return $domdesign{$domain.'.'.$which}; + $output = $domdesign{$domain.'.'.$which}; } else { - return $defaultdesign{$which}; + $output = $defaultdesign{$which}; + } + if (($which =~ /^(student|coordinator|author|admin)\.img$/) || + ($which =~ /login\.(img|logo|domlogo)/)) { + if ($output =~ /^\/(adm|res)\//) { + $output = &lonhttpdurl($output); + } } + return $output; } ############################################### @@ -3682,20 +3690,18 @@ sub standard_css { my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px' : '0px 3px 0px 4px'; + return <{'bgcolor'} || &designparm($function.'.pgbg',$domain); my $url = join(':',$env{'user.name'},$env{'user.domain'}, $Apache::lonnet::perlvar{'lonVersion'}, - #time(), + time(), $env{'environment.color.timestamp'}, $function,$domain,$bgcolor);