--- loncom/interface/loncommon.pm 2006/04/22 20:58:32 1.351 +++ loncom/interface/loncommon.pm 2006/04/25 20:48:38 1.354 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.351 2006/04/22 20:58:32 www Exp $ +# $Id: loncommon.pm,v 1.354 2006/04/25 20:48:38 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1948,7 +1948,7 @@ sub plainname { $name=~s/^\s+//; $name=~s/\s+$//; $name=~s/\s+/ /g; - if ($name !~ /\S/) { $name=$uname.'@'.$udom; } + if ($name !~ /\S/) { $name=$uname.':'.$udom; } return $name; } @@ -2616,7 +2616,7 @@ sub findallcourses { if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) { my ($role,$domain,$id) = ($1,$2,$3); next if ($role eq 'ca' || $role eq 'aa'); - my ($starttime,$endtime)=$env{$key}; + my ($starttime,$endtime)=split(/\./,$env{$key}); my $active=1; if ($starttime) { if ($now<$starttime) { $active=0; } @@ -3048,31 +3048,50 @@ sub endbodytag { return $endbodytag; } +=pod + +=over 4 + +=item * &standard_css() + +Returns a style sheet + +Inputs: (all optional) + domain -> force to color decorate a page for a specific + domain + function -> force usage of a specific rolish color scheme + bgcolor -> override the default page bgcolor + +=back + +=cut + sub standard_css { my ($function,$domain,$bgcolor) = @_; - my $function = &get_users_function() if (!$function); - my $img = &designparm($function.'.img',$domain); - my $tabbg = &designparm($function.'.tabbg',$domain); - my $font = &designparm($function.'.font',$domain); + $function = &get_users_function() if (!$function); + my $img = &designparm($function.'.img', $domain); + my $tabbg = &designparm($function.'.tabbg', $domain); + my $font = &designparm($function.'.font', $domain); my $sidebg = &designparm($function.'.sidebg',$domain); - my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain); - - my $alink = &designparm($function.'.alink',$domain); - my $vlink = &designparm($function.'.vlink',$domain); - my $link = &designparm($function.'.link',$domain); - my $sans = 'Arial,Helvetica,sans-serif'; - my $data_table_head = $tabbg; - my $data_table_light = '#EEEEEE'; - my $data_table_dark = '#DDD'; + my $pgbg = $bgcolor || + &designparm($function.'.pgbg', $domain); + my $alink = &designparm($function.'.alink', $domain); + my $vlink = &designparm($function.'.vlink', $domain); + my $link = &designparm($function.'.link', $domain); + + my $sans = 'Arial,Helvetica,sans-serif'; + my $data_table_head = $tabbg; + my $data_table_light = '#EEEEEE'; + my $data_table_dark = '#DDD'; my $data_table_highlight = '#FFFF00'; - my $mail_new = '#FFBB77'; - my $mail_new_hover = '#DD9955'; - my $mail_read = '#BBBB77'; - my $mail_read_hover = '#999944'; - my $mail_replied = '#AAAA88'; - my $mail_replied_hover = '#888855'; - my $mail_other = '#99BBBB'; - my $mail_other_hover = '#669999'; + my $mail_new = '#FFBB77'; + my $mail_new_hover = '#DD9955'; + my $mail_read = '#BBBB77'; + my $mail_read_hover = '#999944'; + my $mail_replied = '#AAAA88'; + my $mail_replied_hover = '#888855'; + my $mail_other = '#99BBBB'; + my $mail_other_hover = '#669999'; return < @@ -3217,11 +3236,16 @@ Inputs: $title - optional title for the $args - optional arguments force_register - if is true call registerurl so the remote is informed - redirect - array ref of seconds before redirect occurs + redirect -> array ref of seconds before redirect occurs url to redirect to (side effect of setting $env{'internal.head.redirect'} to the url redirected too) + domain -> force to color decorate a page for a specific + domain + function -> force usage of a specific rolish color scheme + bgcolor -> override the default page bgcolor + =back =cut @@ -3231,7 +3255,8 @@ sub headtag { my $result = ''. - &standard_css(). + &standard_css($args->{'function'},$args->{'domain'}, + $args->{'bgcolor'}). &font_settings(). &Apache::lonhtmlcommon::htmlareaheaders(); @@ -3398,7 +3423,8 @@ sub start_page { my ($title,$head_extra,$args) = @_; #&Apache::lonnet::logthis("start_page ".join(':',caller(0))); my %head_args; - foreach my $arg ('redirect','force_register') { + foreach my $arg ('redirect','force_register','domain','function', + 'bgcolor') { if (defined($args->{$arg})) { $head_args{$arg} = $args->{$arg}; }