--- loncom/interface/loncommon.pm 2009/06/11 16:48:33 1.843
+++ loncom/interface/loncommon.pm 2009/08/03 16:47:53 1.875
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.843 2009/06/11 16:48:33 bisitz Exp $
+# $Id: loncommon.pm,v 1.875 2009/08/03 16:47:53 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -483,7 +483,7 @@ ENDAUTHORBRW
sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname)=@_;
- my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
+ my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role');
my $output = '
+END_MYBLOCK
+ my $popupUrl = "/adm/blockingstatus/$querystring";
+ $output .= <<"END_BLOCK";
+
+
+END_BLOCK
+
+ return ($blocked, $output);
}
###############################################
@@ -4223,7 +4176,7 @@ Returns: HTML div with $content
sub head_subbox {
my ($content)=@_;
my $output =
- '
' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox
+ '
'
.$content
.'
'
}
@@ -4394,6 +4347,9 @@ sub bodytag {
$dc_info = '('.$dc_info.')';
}
+ $role = "($role)" if $role;
+ &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+
if ($env{'environment.remote'} eq 'off') {
# No Remote
if ($env{'request.state'} eq 'construct') {
@@ -4411,14 +4367,13 @@ sub bodytag {
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
- $bodytag .= qq|
$name ($role)
- $realm $dc_info
|;
+ $bodytag .= qq|
$name $role
+ $realm $dc_info
| unless $env{'form.inhibitmenu'};
+
if ($env{'request.state'} eq 'construct') {
- $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
- $titletable);
+ $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable);
} else {
- $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
- $titletable;
+ $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable;
}
}
return $bodytag;
@@ -4436,7 +4391,12 @@ sub bodytag {
# Explicit link to get inline menu
my $menu= ($no_inline_link?''
- :' '.&mt('Switch to Inline Menu Mode').'');
+ :''.&mt('Switch to Inline Menu Mode').'');
+ $bodytag .= qq|