--- loncom/interface/loncommon.pm 2007/04/16 23:25:04 1.525 +++ loncom/interface/loncommon.pm 2007/05/13 06:34:42 1.534 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.525 2007/04/16 23:25:04 albertel Exp $ +# $Id: loncommon.pm,v 1.534 2007/05/13 06:34:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -240,7 +240,7 @@ Inputs: formname, elementname formname and elementname specify the name of the html form and the name of the element the selection from the search results will be placed in. - +=back =cut sub browser_and_searcher_javascript { @@ -1467,6 +1467,8 @@ sub home_server_option_list { =pod +=back + =cut ############################################################### @@ -2912,7 +2914,7 @@ sub blockcheck { } my $no_ownblock = 0; my $no_userblock = 0; - if ($otheruser) { + if ($otheruser && $activity ne 'com') { # Check if current user has 'evb' priv for this if (defined($own_courses{$course})) { foreach my $sec (keys(%{$own_courses{$course}})) { @@ -3165,7 +3167,7 @@ Returns: Determines which domain should ############################################### sub determinedomain { my $domain=shift; - if (! $domain) { + if (! $domain) { # Determine domain if we have not been given one $domain = $Apache::lonnet::perlvar{'lonDefDomain'}; if ($env{'user.domain'}) { $domain=$env{'user.domain'}; } @@ -3375,7 +3377,7 @@ sub bodytag { my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain); my %design = ( 'style' => 'margin-top: 0px', - 'bgcolor' => $pgbg, + 'bgcolor' => '#ffffff', 'text' => $font, 'alink' => &designparm($function.'.alink',$domain), 'vlink' => &designparm($function.'.vlink',$domain), @@ -3411,9 +3413,7 @@ sub bodytag { my $bodytag = "". &Apache::lontexconvert::init_math_support(); - if ($bodyonly - || ($env{'request.state'} eq 'construct' - && $env{'environment.remote'} ne 'off' )) { + if ($bodyonly) { return $bodytag; } elsif ($env{'browser.interface'} eq 'textual') { # Accessibility @@ -3717,6 +3717,8 @@ form, .inline { display: inline; } .LC_diff_removed { color: red; } + +.LC_info, .LC_success, .LC_diff_added { color: green; @@ -3725,6 +3727,10 @@ form, .inline { display: inline; } border: 0px; } +.LC_internal_info { + color: #999; +} + table.LC_pastsubmission { border: 1px solid black; margin: 2px; @@ -3786,7 +3792,7 @@ table#LC_title_bar td.LC_title_bar_role_ } table#LC_menubuttons_mainmenu { - background: $pgbg; + width: 100%; border: 0px; border-spacing: 1px; padding: 0px 1px; @@ -3851,20 +3857,27 @@ table#LC_mainmenu td.LC_mainmenu_column font-size: smaller; } +.LC_menubuttons_link { + text-decoration: none; +} + .LC_menubuttons_category { color: $font; + background: $pgbg; font-family: $sans; font-size: larger; font-weight: bold; } td.LC_menubuttons_text { + width: 90%; color: $font; font-family: $sans; } + td.LC_menubuttons_img { - background: $tabbg; } + .LC_current_location { font-family: $sans; background: $tabbg; @@ -3874,6 +3887,45 @@ td.LC_menubuttons_img { font-weight: bold; } +.LC_rolesmenu_is { + font-family: $sans; +} + +.LC_rolesmenu_selected { + font-family: $sans; +} + +.LC_rolesmenu_future { + font-family: $sans; +} + + +.LC_rolesmenu_will { + font-family: $sans; +} + +.LC_rolesmenu_will_not { + font-family: $sans; +} + +.LC_rolesmenu_expired { + font-family: $sans; +} + +.LC_rolesinfo { + font-family: $sans; +} + +.LC_dropadd_labeltext { + font-family: $sans; + text-align: right; +} + +.LC_preferences_labeltext { + font-family: $sans; + text-align: right; +} + table.LC_aboutme_port { border: 0px; border-collapse: collapse; @@ -4315,7 +4367,11 @@ table.LC_prior_tries td { } -span.LC_prior_numerical { +span.LC_prior_numerical, +span.LC_prior_string, +span.LC_prior_custom, +span.LC_prior_reaction, +span.LC_prior_math { font-family: monospace; white-space: pre; } @@ -4329,7 +4385,12 @@ table.LC_prior_option { width: 100%; border-collapse: collapse; } -table.LC_prior_option tr td { +table.LC_prior_rank, table.LC_prior_match { + border-collapse: collapse; +} +table.LC_prior_option tr td, +table.LC_prior_rank tr td, +table.LC_prior_match tr td { border: 1px solid #000000; } @@ -4379,7 +4440,7 @@ sub headtag { my $bgcolor = $args->{'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);