--- loncom/interface/loncommon.pm 2009/11/18 11:18:23 1.915 +++ loncom/interface/loncommon.pm 2009/11/18 20:47:59 1.916 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.915 2009/11/18 11:18:23 droeschl Exp $ +# $Id: loncommon.pm,v 1.916 2009/11/18 20:47:59 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4513,7 +4513,9 @@ sub bodytag { if ($env{'environment.remote'} eq 'off') { # No Remote - if ($no_nav_bar) { return $bodytag; } + if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { + return $bodytag; + } if ($env{'request.state'} eq 'construct') { $forcereg=1; } @@ -4521,21 +4523,23 @@ sub bodytag { # $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls # } - $bodytag .= qq|
$name $role
- $realm $dc_info
| unless $env{'form.inhibitmenu'}; - if ( $env{'form.inhibitmenu'} eq 'yes' - || $ENV{'REQUEST_URI'} eq '/adm/logout' - || $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { + $bodytag .= qq|
$name $role
+ $realm $dc_info
|; return $bodytag; } + $bodytag .= qq|
$name $role
|; + $bodytag .= Apache::lonhtmlcommon::scripttag( Apache::lonmenu::utilityfunctions(), 'start'); $bodytag .= Apache::lonmenu::primary_menu(); + $bodytag .= qq|
$realm
$dc_info
|; + #don't show menus for public users if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){ $bodytag .= Apache::lonmenu::secondary_menu(); @@ -4567,11 +4571,10 @@ sub bodytag { # Explicit link to get inline menu my $menu= ($no_inline_link?'' :''.&mt('Switch to Inline Menu Mode').''); - $bodytag .= qq|
$name $role - $realm $dc_info
+ $bodytag .= qq|
$name $role
  1. $menu
  2. -
| unless $env{'form.inhibitmenu'}; +
$realm
$dc_info
| unless $env{'form.inhibitmenu'}; # return(< legend { margin: 0.2em 0 0 0; } +#LC_realm { + margin: 0.2em 0 0 0; + padding: 0; + font-weight: bold; + text-align: center; +} + #LC_nav_bar em { font-weight: bold; font-style: normal;