--- loncom/interface/loncommon.pm 2006/07/03 00:11:53 1.413 +++ loncom/interface/loncommon.pm 2006/07/03 13:39:16 1.418 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.413 2006/07/03 00:11:53 albertel Exp $ +# $Id: loncommon.pm,v 1.418 2006/07/03 13:39:16 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3179,7 +3179,7 @@ table#LC_title_bar td.LC_title_bar_who { text-align: right; } span.LC_title_bar_title { - font: bold xx-large $sans; + font: bold x-large $sans; } table#LC_title_bar td.LC_title_bar_domain_logo { background: $sidebg; @@ -3461,6 +3461,19 @@ table#LC_helpmenu_links a:hover { color: $vlink; } +.LC_chrt_popup_exists { + border: 1px solid #339933; + margin: -1px; +} +.LC_chrt_popup_up { + border: 1px solid yellow; + margin: -1px; +} +.LC_chrt_popup { + border: 1px solid #8888FF; + background: #CCCCFF; +} + END } @@ -3477,8 +3490,10 @@ 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 - url to redirect to + redirect -> array ref of + 1- seconds before redirect occurs + 2- url to redirect to + 3- whether the side effect should occur (side effect of setting $env{'internal.head.redirect'} to the url redirected too) @@ -3497,8 +3512,9 @@ sub headtag { my $function = $args->{'function'} || &get_users_function(); my $domain = $args->{'domain'} || &determinedomain(); my $bgcolor = $args->{'bgcolor'} || &designparm($function.'.pgbg',$domain); - my $url = join(':',$env{'user.name'},$env{'user.domain'},time(), - #$env{'environment.color.timestamp'}, + my $url = join(':',$env{'user.name'},$env{'user.domain'}, + #time(), + $env{'environment.color.timestamp'}, $function,$domain,$bgcolor); $url = '/adm/css/'.&escape($url).'.css'; @@ -3513,9 +3529,11 @@ sub headtag { } if (ref($args->{'redirect'})) { - my ($time,$url) = @{$args->{'redirect'}}; + my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}}; $url = &Apache::lonenc::check_encrypt($url); - $env{'internal.head.redirect'} = $url; + if (!$inhibit_continue) { + $env{'internal.head.redirect'} = $url; + } $result.=< @@ -3525,8 +3543,9 @@ ADDMETA $title = 'The LearningOnline Network with CAPA'; } - $result .= ' LON-CAPA '.&mt($title).''.$head_extra - .''; + $result .= ' LON-CAPA '.&mt($title).'' + .'' + .$head_extra; return $result; }