--- loncom/interface/loncommon.pm 2009/06/08 18:04:45 1.840
+++ loncom/interface/loncommon.pm 2009/07/09 12:53:28 1.854
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.840 2009/06/08 18:04:45 bisitz Exp $
+# $Id: loncommon.pm,v 1.854 2009/07/09 12:53:28 kalberla 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);
@@ -4223,7 +4256,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 +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
+ | unless $env{'form.inhibitmenu'};
#
return(<
legend {
#LC_nav_bar {
float: left;
- margin: 0;
+ margin: 0.2em 0 0 0;
}
#LC_nav_bar em{
@@ -5875,9 +5894,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;
}
@@ -5904,12 +5924,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;
@@ -5918,14 +5936,22 @@ ul#LC_TabMainMenuContent li {
vertical-align: middle;
}
-ul.LC_TabContent ,
-ul.LC_TabContentBigger {
+ul.LC_TabContent {
display:block;
+ background: $sidebg;
+ border-bottom: solid 1px $lg_border_color
list-style:none;
- margin: 0;
+ margin: -10px -10px 0 -10px;
padding: 0;
}
+ul.LC_TabContentBigger {
+ display:block;
+ list-style:none;
+ padding: 0;
+}
+
+
ul.LC_TabContent li,
ul.LC_TabContentBigger li {
display: inline;
@@ -5941,7 +5967,7 @@ ul#LC_TabMainMenuContent li a {
}
ul.LC_TabContent {
- min-height:1.6em;
+ min-height:1.5em;
}
ul.LC_TabContent li {
@@ -5951,6 +5977,10 @@ ul.LC_TabContent li {
border-bottom:solid 1px $lg_border_color;
}
+ul.LC_TabContent .right {
+ float:right;
+}
+
ul.LC_TabContent li a, ul.LC_TabContent li {
color:rgb(47,47,47);
text-decoration:none;
@@ -5961,7 +5991,7 @@ ul.LC_TabContent li a, ul.LC_TabContent
ul.LC_TabContent li:hover, ul.LC_TabContent li.active {
background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
- border-bottom:solid 1px #FFFFFF;
+ border-bottom:solid 2px #FFFFFF;
padding-right: 16px;
}
@@ -5971,12 +6001,16 @@ ul.LC_TabContentBigger li {
border-left:solid 1px $lg_border_color;
padding:5px 10px 5px 10px;
margin-left:2px;
- background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+ background: #d9d9d9;
+}
+
+#maincoursedoc {
+ clear:both;
}
ul.LC_TabContentBigger li:hover,
ul.LC_TabContentBigger li.active {
- background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+ background: #ffffff;
}
ul.LC_TabContentBigger li,
@@ -5996,9 +6030,8 @@ ul#LC_CourseBreadcrumbs {
ol#LC_MenuBreadcrumbs li,
ol#LC_PathBreadcrumbs li,
ul#LC_CourseBreadcrumbs li {
- display: inline;
- padding: 0 0 0 10px;
- overflow:hidden;
+ display: inline;
+ white-space: nowrap;
}
ol#LC_MenuBreadcrumbs li a,
@@ -6106,9 +6139,7 @@ div.LC_columnSection>* {
.clear {
clear: both;
- line-height: 0;
- font-size: 0;
- height: 0;
+ margin: 0;
}
.LC_loginpage_container {
@@ -6259,7 +6290,7 @@ a.LC_toolbarItem {
background-color:transparent;
}
-ul.LC_functionslist li {
+ul.LC_funclist li {
float: left;
white-space: nowrap;
height: 35px; /* at least as high as heighest list item */
@@ -6394,7 +6425,8 @@ sub xml_begin {
.'';
} else {
- $output='';
+ $output=''
+ .'';
}
return $output;
}
@@ -8543,7 +8575,7 @@ sub csv_print_samples {
$r->print(&mt('Samples').'
'.&start_data_table().
&start_data_table_header_row());
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- $r->print(''.&mt('Column [_1]',($sample+1)).' | '); }
+ $r->print(''.&mt('Column [_1]',($sample+1)).' | '); }
$r->print(&end_data_table_header_row());
foreach my $hash (@$samples) {
$r->print(&start_data_table_row());