--- loncom/interface/loncommon.pm 2009/07/01 13:16:41 1.847
+++ loncom/interface/loncommon.pm 2009/07/08 18:36:26 1.852
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.847 2009/07/01 13:16:41 tempelho Exp $
+# $Id: loncommon.pm,v 1.852 2009/07/08 18:36:26 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4411,8 +4411,11 @@ sub bodytag {
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
- $bodytag .= qq|$name ($role)
- $realm $dc_info
|;
+ $role = "($role)" if $role;
+ &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+ $bodytag .= qq|$name $role
+ $realm $dc_info
| unless $env{'form.inhibitmenu'};
+
if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
$titletable);
@@ -4566,9 +4569,9 @@ sub standard_css {
my $sans = 'Verdana,Arial,Helvetica,sans-serif';
my $mono = 'monospace';
- my $data_table_head = $tabbg;
- my $data_table_light = '#EEEEEE';
- my $data_table_dark = '#DDDDDD';
+ my $data_table_head = $sidebg;
+ my $data_table_light = '#FAFAFA';
+ my $data_table_dark = '#F0F0F0';
my $data_table_darker = '#CCCCCC';
my $data_table_highlight = '#FFFF00';
my $mail_new = '#FFBB77';
@@ -5234,7 +5237,7 @@ table.LC_pick_box {
}
table.LC_pick_box td.LC_pick_box_title {
- background: $tabbg;
+ background: $sidebg;
font-weight: bold;
text-align: right;
vertical-align: top;
@@ -5842,7 +5845,7 @@ fieldset > legend {
#LC_nav_bar {
float: left;
- margin: 0;
+ margin: 0.2em 0 0 0;
}
#LC_nav_bar em{
@@ -5852,9 +5855,10 @@ fieldset > legend {
ol.LC_smallMenu {
float: right;
+ margin: 0.2em 0 0 0;
}
-ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
+ol#LC_PathBreadcrumbs {
margin: 0;
}
@@ -5881,12 +5885,10 @@ ul#LC_TabMainMenuContent {
list-style: none;
padding: 0;
margin: 0;
- float:left;
width: 100%;
}
ul#LC_TabMainMenuContent li {
- float: left;
font-weight: bold;
line-height: 1.8em;
padding: 0 0.8em;
@@ -6008,8 +6010,6 @@ ol#LC_PathBreadcrumbs li a {
.LC_Box {
border: solid 1px $lg_border_color;
padding: 0 10px 10px 10px;
- margin: 0;
- clear: both;
}
.LC_AboutMe_Image {
@@ -6100,9 +6100,7 @@ div.LC_columnSection>* {
.clear {
clear: both;
- line-height: 0;
- font-size: 0;
- height: 0;
+ margin: 0;
}
.LC_loginpage_container {
@@ -6388,7 +6386,8 @@ sub xml_begin {
.'';
} else {
- $output='';
+ $output=''
+ .'';
}
return $output;
}