--- loncom/interface/loncommon.pm 2009/07/08 18:36:26 1.852
+++ loncom/interface/loncommon.pm 2009/07/14 17:33:43 1.861
@@ -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.861 2009/07/14 17:33:43 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|
$name $role
$realm $dc_info
| unless $env{'form.inhibitmenu'};
@@ -4439,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
+ | unless $env{'form.inhibitmenu'};
#
return(< td.LC_docs_entry_commands,
+table.LC_data_table tr > td.LC_docs_entry_parameter {
background: #DDDDDD;
font-size: x-small;
}
+.LC_docs_entry_parameter {
+ white-space: nowrap;
+}
+
.LC_docs_copy {
color: #000099;
}
@@ -5568,17 +5601,6 @@ table.LC_docs_documents td.LC_docs_docum
font-size: x-small;
}
-.LC_docs_editor td.LC_docs_entry_title,
-.LC_docs_editor td.LC_docs_entry_icon {
- background: #FFFFBB;
-}
-
-.LC_docs_editor td.LC_docs_entry_parameter {
- background: #BBBBFF;
- font-size: x-small;
- white-space: nowrap;
-}
-
table.LC_docs_adddocs td,
table.LC_docs_adddocs th {
border: 1px solid #BBBBBB;
@@ -5900,7 +5922,7 @@ ul#LC_TabMainMenuContent li {
ul.LC_TabContent {
display:block;
background: $sidebg;
- border-bottom: solid 1px $lg_border_color
+ border-bottom: solid 1px $lg_border_color;
list-style:none;
margin: -10px -10px 0 -10px;
padding: 0;
@@ -5972,12 +5994,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,
@@ -6098,11 +6122,6 @@ div.LC_columnSection>* {
overflow:hidden;
}
-.clear {
- clear: both;
- margin: 0;
-}
-
.LC_loginpage_container {
text-align:left;
margin : 0 auto;
@@ -6157,7 +6176,7 @@ table em {
table.LC_tableBrowseRes,
table.LC_tableOfContent {
border:none;
- border-spacing: 1;
+ border-spacing: 1px;
padding: 3px;
background-color: #FFFFFF;
font-size: 90%;