--- loncom/interface/loncommon.pm 2009/07/08 18:36:26 1.852
+++ loncom/interface/loncommon.pm 2009/07/13 14:38:31 1.858
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.852 2009/07/08 18:36:26 droeschl Exp $
+# $Id: loncommon.pm,v 1.858 2009/07/13 14:38:31 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3871,8 +3871,41 @@ sub build_block_table {
}
$output .= &end_data_table();
}
-
sub blocking_status {
+ my $blocked = blocking_status_print(@_);
+ my ($activity,$uname,$udom) = @_;
+ if(!wantarray) {
+ return $blocked;
+ }
+ my $output;
+ my $querystring;
+ $querystring = "?activity=$activity";
+ if(defined($uname)) {
+ $querystring .= "&uname=$uname";
+ }if(defined($udom)) {
+ $querystring .= "&udom=$udom";
+ }
+
+ $output .= <<"END_MYBLOCK";
+
+END_MYBLOCK
+ my $popupUrl = "/adm/blockingstatus/$querystring";
+ $output.="\nBlocking Table";
+
+ return ($blocked, $output);
+}
+sub blocking_status_print {
my ($activity,$uname,$udom) = @_;
my %setters;
my ($blocked,$output,$ownitem,$is_course);
@@ -4394,6 +4427,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,8 +4447,6 @@ sub bodytag {
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
- $role = "($role)" if $role;
- &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
$bodytag .= qq|