--- loncom/interface/loncommon.pm 2009/05/11 17:12:25 1.811
+++ 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.811 2009/05/11 17:12:25 bisitz Exp $
+# $Id: loncommon.pm,v 1.816 2009/05/15 14:48:42 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4215,13 +4215,11 @@ 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
-=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,
- $notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4360,18 +4358,15 @@ ENDROLE
.&Apache::lonmenu::constspaceform();
}
- my $titletable;
- if (!$notitle) {
- $titletable =
- ''.
- "| $titleinfo $dc_info | ".$roleinfo.
- '
';
- }
- if ($notopbar) {
+ my $titletable = ''
+ ."| $titleinfo $dc_info | ".$roleinfo
+ .'
';
+
+ 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);
@@ -4397,9 +4392,6 @@ ENDROLE
my $menu= ($no_inline_link?''
:'
'.&mt('Switch to Inline Menu Mode').'');
#
- if ($notitle) {
- return $bodytag;
- }
return(<
@@ -4639,11 +4631,6 @@ div.LC_confirm_box .LC_success img {
vertical-align: middle;
}
-.LC_indexer_icon {
- border: none;
- height: 22px;
-}
-
.LC_docs_spacer {
width: 25px;
height: 1px;
@@ -4872,11 +4859,6 @@ td.LC_menubuttons_text {
font-weight: bold;
}
-.LC_dropadd_labeltext {
- font-family: $sans;
- text-align: right;
-}
-
.LC_preferences_labeltext {
font-family: $sans;
text-align: right;
@@ -5801,7 +5783,7 @@ ul.LC_TabContent li:hover a {
}
h1 {
- padding:5px 10px 5px 20px;
+ padding: 0;
line-height:130%;
}
@@ -5854,12 +5836,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;
}
@@ -6477,7 +6459,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
@@ -6496,7 +6478,6 @@ $args - additional optional args support
is not auto translated like the $title is
frameset -> if true will start with a