--- loncom/interface/loncommon.pm 2009/05/14 17:28:23 1.814 +++ loncom/interface/loncommon.pm 2009/05/15 14:48:42 1.816 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.814 2009/05/14 17:28:23 bisitz Exp $ +# $Id: loncommon.pm,v 1.816 2009/05/15 14:48:42 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4220,8 +4220,6 @@ Inputs: =item * $bgcolor, used to override the bgcolor on a webpage to a specific value -=item * $notitle, if true keep the nav controls, but remove the title bar - =item * $no_inline_link, if true and in remote mode, don't show the 'Switch To Inline Menu' link @@ -4242,7 +4240,7 @@ other decorations will be returned. sub bodytag { my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle, - $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_; + $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_; if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); } @@ -4360,13 +4358,10 @@ ENDROLE .&Apache::lonmenu::constspaceform(); } - my $titletable; - if (!$notitle) { - $titletable = - ''. - "".$roleinfo. - '
$titleinfo $dc_info
'; - } + my $titletable = '' + ."".$roleinfo + .'
$titleinfo $dc_info
'; + if ($no_nav_bar) { $bodytag .= $titletable; } else { @@ -4397,9 +4392,6 @@ ENDROLE my $menu= ($no_inline_link?'' :'
'.&mt('Switch to Inline Menu Mode').''); # - if ($notitle) { - return $bodytag; - } return(< @@ -6486,7 +6478,6 @@ $args - additional optional args support is not auto translated like the $title is frameset -> if true will start with a rather than - no_title -> if true the title bar won't be shown skip_phases -> hash ref of head -> skip the generation body -> skip all generation @@ -6535,7 +6526,7 @@ sub start_page { $args->{'only_body'}, $args->{'domain'}, $args->{'force_register'}, $args->{'body_title'}, $args->{'no_nav_bar'}, $args->{'bgcolor'}, - $args->{'no_title'}, $args->{'no_inline_link'}, + $args->{'no_inline_link'}, $args); } } @@ -6799,7 +6790,7 @@ Returns either 'student','coordinator',' ############################################### sub get_users_function { - my $function = 'student'; + my $function = 'norole'; if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; }