--- loncom/interface/loncommon.pm 2009/11/06 16:36:27 1.911
+++ loncom/interface/loncommon.pm 2009/11/18 20:47:59 1.916
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.911 2009/11/06 16:36:27 bisitz Exp $
+# $Id: loncommon.pm,v 1.916 2009/11/18 20:47:59 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4513,7 +4513,9 @@ sub bodytag {
if ($env{'environment.remote'} eq 'off') {
# No Remote
- if ($no_nav_bar) { return $bodytag; }
+ if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
+ return $bodytag;
+ }
if ($env{'request.state'} eq 'construct') { $forcereg=1; }
@@ -4521,21 +4523,23 @@ sub bodytag {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }
- $bodytag .= qq|
$name $role
- $realm $dc_info
| unless $env{'form.inhibitmenu'};
- if ( $env{'form.inhibitmenu'} eq 'yes'
- || $ENV{'REQUEST_URI'} eq '/adm/logout'
- || $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
+ if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
+ $bodytag .= qq|$name $role
+ $realm $dc_info
|;
return $bodytag;
}
+ $bodytag .= qq|$name $role
|;
+
$bodytag .= Apache::lonhtmlcommon::scripttag(
Apache::lonmenu::utilityfunctions(), 'start');
$bodytag .= Apache::lonmenu::primary_menu();
+ $bodytag .= qq|$realm
$dc_info
|;
+
#don't show menus for public users
if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
$bodytag .= Apache::lonmenu::secondary_menu();
@@ -4567,11 +4571,10 @@ sub bodytag {
# Explicit link to get inline menu
my $menu= ($no_inline_link?''
:''.&mt('Switch to Inline Menu Mode').'');
- $bodytag .= qq|$name $role
- $realm $dc_info
+ $bodytag .= qq|$name $role
| unless $env{'form.inhibitmenu'};
+ $realm
$dc_info
| unless $env{'form.inhibitmenu'};
#
return(< td
text-align: left;
}
-table.LC_data_table tr.LC_odd_row > td,
+table.LC_data_table tr.LC_odd_row > td {
+ background-color: $data_table_light;
+ padding: 2px;
+ vertical-align: top;
+}
+
table.LC_pick_box tr > td.LC_odd_row {
background-color: $data_table_light;
+ vertical-align: top;
+}
+
+table.LC_data_table tr.LC_even_row > td {
+ background-color: $data_table_dark;
padding: 2px;
vertical-align: top;
}
-table.LC_data_table tr.LC_even_row > td,
table.LC_pick_box tr > td.LC_even_row {
background-color: $data_table_dark;
- padding: 2px;
vertical-align: top;
}
@@ -5955,6 +6006,13 @@ fieldset > legend {
margin: 0.2em 0 0 0;
}
+#LC_realm {
+ margin: 0.2em 0 0 0;
+ padding: 0;
+ font-weight: bold;
+ text-align: center;
+}
+
#LC_nav_bar em {
font-weight: bold;
font-style: normal;
@@ -6119,7 +6177,7 @@ ol#LC_PathBreadcrumbs {
padding-left: 10px;
margin: 0;
list-style-position: inside;
- /* SD working here
+ /* SD working here
white-space: nowrap; */
}
@@ -6128,8 +6186,8 @@ ol#LC_PathBreadcrumbs li,
ul.LC_CourseBreadcrumbs li {
display: inline;
white-space: nowrap;
- /* SD working here
- white-space: normal; */
+ /* SD working here
+ white-space: normal; */
}
ol#LC_MenuBreadcrumbs li a,
@@ -6383,11 +6441,29 @@ a.LC_toolbarItem {
background-color:transparent;
}
+ul.LC_funclist {
+ margin: 0;
+ padding: 0.5em 1em 0.5em 0;
+}
+
+ul.LC_funclist + ul.LC_funclist {
+ /*
+ left border as a seperator if we have more than
+ one list
+ */
+ border-left: 1px solid $sidebg;
+ /*
+ this hides the left border behind the border of the
+ outer box if element is wrapped to the next 'line'
+ */
+ margin-left: -1px;
+}
+
ul.LC_funclist li {
- float: left;
+ display: inline;
white-space: nowrap;
- height: 35px; /* at least as high as heighest list item */
- margin: 0 15px 15px 10px;
+ margin: 0 0 0 25px;
+ line-height: 150%;
}