--- loncom/interface/loncommon.pm 2009/05/11 17:40:34 1.812
+++ loncom/interface/loncommon.pm 2009/05/15 09:33:22 1.815
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.812 2009/05/11 17:40:34 bisitz Exp $
+# $Id: loncommon.pm,v 1.815 2009/05/15 09:33:22 tempelho Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4215,8 +4215,8 @@ Inputs:
in the title box that appears, this text
is not auto translated like the $title is
-=item * $notopbar, if true, keep the 'what is this' info but remove the
- navigational links
+=item * $no_nav_bar, if true, keep the 'what is this' info but remove the
+ navigational links
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
@@ -4242,7 +4242,7 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- $notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4367,11 +4367,11 @@ ENDROLE
"| $titleinfo $dc_info | ".$roleinfo.
'
';
}
- if ($notopbar) {
+ if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
- $bodytag .= qq|$name ($role)
- $realm$dc_info
|;
+ $bodytag .= qq|$name ($role)
+ $realm $dc_info
|;
if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
$titletable);
@@ -5791,7 +5791,7 @@ ul.LC_TabContent li:hover a {
}
h1 {
- padding:5px 10px 5px 20px;
+ padding: 0;
line-height:130%;
}
@@ -5844,12 +5844,12 @@ dl,ul,div,fieldset {
/* overflow: hidden; */
}
-#head_userinfo {
+#LC_nav_bar {
float: left;
margin: 0;
}
-#head_userinfo em{
+#LC_nav_bar em{
font-weight: bold;
font-style: normal;
}
@@ -6467,7 +6467,7 @@ $args - additional optional args support
only_body -> is true will set &bodytag() onlybodytag
arg on
- no_nav_bar -> is true will set &bodytag() notopbar arg on
+ no_nav_bar -> is true will set &bodytag() no_nav_bar arg on
add_entries -> additional attributes to add to the
domain -> force to color decorate a page for a
specific domain
@@ -6547,7 +6547,15 @@ sub start_page {
$result = &html_encode($result);
}
- #Breadcrumbs
+ # Preparation for new and consistent functionlist at top of screen
+ # if ($args->{'functionlist'}) {
+ # $result .= &build_functionlist();
+ #}
+
+ # Don't add anything more if only_body wanted
+ return $result if $args->{'only_body'};
+
+ #Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();
#if any br links exists, add them to the breadcrumbs
@@ -6791,7 +6799,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';
}