--- loncom/interface/loncommon.pm 2009/07/02 15:55:08 1.849 +++ loncom/interface/loncommon.pm 2009/07/10 19:48:51 1.857 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.849 2009/07/02 15:55:08 bisitz Exp $ +# $Id: loncommon.pm,v 1.857 2009/07/10 19:48:51 tempelho 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,9 @@ 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); @@ -4436,7 +4473,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|
$name $role + $realm $dc_info
+
    +
  1. $menu
  2. +
| unless $env{'form.inhibitmenu'}; # return(< legend { #LC_nav_bar { float: left; - margin: 0; + margin: 0.2em 0 0 0; } #LC_nav_bar em{ @@ -5852,9 +5893,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 +5923,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; @@ -5970,12 +6010,14 @@ ul.LC_TabContentBigger li { ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active { background: #ffffff; + color:$font; } ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a { font-size:110%; font-weight:bold; + color: #737373; } ol#LC_MenuBreadcrumbs, @@ -6096,13 +6138,6 @@ div.LC_columnSection>* { overflow:hidden; } -.clear { - clear: both; - line-height: 0; - font-size: 0; - height: 0; -} - .LC_loginpage_container { text-align:left; margin : 0 auto;