--- loncom/interface/loncommon.pm 2013/05/21 18:54:15 1.1129
+++ loncom/interface/loncommon.pm 2013/05/25 21:56:23 1.1130
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1129 2013/05/21 18:54:15 raeburn Exp $
+# $Id: loncommon.pm,v 1.1130 2013/05/25 21:56:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5155,16 +5155,12 @@ sub bodytag {
my $bodytag = "
".
&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
- if ($bodyonly) {
+ if (($bodyonly) || ($no_nav_bar) || ($env{'form.inhibitmenu'} eq 'yes')) {
return $bodytag;
- }
+ }
- my $name = &plainname($env{'user.name'},$env{'user.domain'});
if ($public) {
undef($role);
- } else {
- $name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'},
- undef,'LC_menubuttons_link');
}
my $titleinfo = ''.$title.'
';
@@ -5182,35 +5178,31 @@ sub bodytag {
$role = '('.$role.')' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- return $bodytag;
- }
-
if ($env{'request.state'} eq 'construct') { $forcereg=1; }
# if ($env{'request.state'} eq 'construct') {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }
+ $bodytag .= Apache::lonhtmlcommon::scripttag(
+ Apache::lonmenu::utilityfunctions(), 'start');
+ my ($left,$right) = Apache::lonmenu::primary_menu();
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {
$dc_info = qq|$dc_info|;
}
- $bodytag .= qq|$name $role
+ $bodytag .= qq|
$left $role
$realm $dc_info
|;
return $bodytag;
}
unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
- $bodytag .= qq|
$name $role
|;
+ $bodytag .= qq|
$left $role
|;
}
- $bodytag .= Apache::lonhtmlcommon::scripttag(
- Apache::lonmenu::utilityfunctions(), 'start');
-
- $bodytag .= Apache::lonmenu::primary_menu();
+ $bodytag .= $right;
if ($dc_info) {
$dc_info = &dc_courseid_toggle($dc_info);
@@ -5410,6 +5402,14 @@ form, .inline {
vertical-align:middle;
}
+.LC_floatleft {
+ float: left;
+}
+
+.LC_floatright {
+ float: right;
+}
+
.LC_400Box {
width:400px;
}
@@ -6499,6 +6499,7 @@ div.LC_createcourse {
}
.LC_dccid {
+ float: right;
margin: 0.2em 0 0 0;
padding: 0;
font-size: 90%;
@@ -6596,7 +6597,6 @@ fieldset > legend {
}
ol.LC_primary_menu {
- float: right;
margin: 0;
padding: 0;
background-color: $pgbg_or_bgcolor;