--- loncom/interface/loncommon.pm 2012/05/18 16:07:54 1.1075.2.2 +++ loncom/interface/loncommon.pm 2012/05/28 20:31:17 1.1080 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1075.2.2 2012/05/18 16:07:54 raeburn Exp $ +# $Id: loncommon.pm,v 1.1080 2012/05/28 20:31:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -5060,13 +5060,11 @@ sub bodytag { if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { - unless ($env{'request.noversionuri'} =~ m{/res/adm/pages/bookmarkmenu/}) { - if ($dc_info) { - $dc_info = qq|$dc_info|; - } - $bodytag .= qq|
$name $role
- $realm $dc_info
|; - } + if ($dc_info) { + $dc_info = qq|$dc_info|; + } + $bodytag .= qq|
$name $role
+ $realm $dc_info
|; return $bodytag; } @@ -5165,7 +5163,10 @@ i.e., $env{'internal.head.redirect'} exi sub endbodytag { my ($args) = @_; - my $endbodytag=''; + my $endbodytag; + unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) { + $endbodytag=''; + } $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag; if ( exists( $env{'internal.head.redirect'} ) ) { if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) { @@ -6482,16 +6483,19 @@ ol.LC_primary_menu li:hover ul, ol.LC_pr position: absolute; margin: 0; padding: 0; + z-index: 2; } ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li { font-size: 90%; vertical-align: top; float: none; + border-left: 1px solid black; + border-right: 1px solid black; } ol.LC_primary_menu li:hover li a, ol.LC_primary_menu li.hover li a { - background-color:$data_table_light + background-color:$data_table_light; } ol.LC_primary_menu li li a:hover { @@ -6502,6 +6506,7 @@ ol.LC_primary_menu li li a:hover { ol.LC_primary_menu li img { vertical-align: bottom; height: 1.1em; + margin: 0.2em 0 0 0; } ol.LC_primary_menu a { @@ -7355,7 +7360,9 @@ sub end_page { } else { $result .= &endbodytag($args); } - $result .= "\n"; + unless ($args->{'notbody'}) { + $result .= "\n"; + } if ($args->{'js_ready'}) { $result = &js_ready($result);