--- loncom/interface/loncommon.pm 2009/07/01 13:16:41 1.847 +++ loncom/interface/loncommon.pm 2009/07/09 08:53:39 1.853 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.847 2009/07/01 13:16:41 tempelho Exp $ +# $Id: loncommon.pm,v 1.853 2009/07/09 08:53:39 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4394,6 +4394,9 @@ sub bodytag { $dc_info = '('.$dc_info.')'; } + $role = "($role)" if $role; + &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); + if ($env{'environment.remote'} eq 'off') { # No Remote if ($env{'request.state'} eq 'construct') { @@ -4411,8 +4414,9 @@ sub bodytag { if ($no_nav_bar) { $bodytag .= $titletable; } else { - $bodytag .= qq|
$name ($role)
- $realm $dc_info
|; + $bodytag .= qq|
$name $role
+ $realm $dc_info
| unless $env{'form.inhibitmenu'}; + if ($env{'request.state'} eq 'construct') { $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg, $titletable); @@ -4436,7 +4440,12 @@ sub bodytag { # Explicit link to get inline menu my $menu= ($no_inline_link?'' - :'
'.&mt('Switch to Inline Menu Mode').''); + :''.&mt('Switch to Inline Menu Mode').''); + $bodytag .= qq|
$name $role + $realm $dc_info
+
    +
  1. $menu
    2. +
| unless $env{'form.inhibitmenu'}; # return(< legend { #LC_nav_bar { float: left; - margin: 0; + margin: 0.2em 0 0 0; } #LC_nav_bar em{ @@ -5852,9 +5861,10 @@ fieldset > legend { ol.LC_smallMenu { float: right; + margin: 0.2em 0 0 0; } -ol.LC_smallMenu, ol#LC_PathBreadcrumbs { +ol#LC_PathBreadcrumbs { margin: 0; } @@ -5881,12 +5891,10 @@ ul#LC_TabMainMenuContent { list-style: none; padding: 0; margin: 0; - float:left; width: 100%; } ul#LC_TabMainMenuContent li { - float: left; font-weight: bold; line-height: 1.8em; padding: 0 0.8em; @@ -6008,8 +6016,6 @@ ol#LC_PathBreadcrumbs li a { .LC_Box { border: solid 1px $lg_border_color; padding: 0 10px 10px 10px; - margin: 0; - clear: both; } .LC_AboutMe_Image { @@ -6100,9 +6106,7 @@ div.LC_columnSection>* { .clear { clear: both; - line-height: 0; - font-size: 0; - height: 0; + margin: 0; } .LC_loginpage_container { @@ -6388,7 +6392,8 @@ sub xml_begin { .''; } else { - $output=''; + $output='' + .''; } return $output; }