--- loncom/interface/loncommon.pm 2009/06/17 15:27:14 1.845
+++ loncom/interface/loncommon.pm 2009/07/13 17:34:29 1.859
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.845 2009/06/17 15:27:14 bisitz Exp $
+# $Id: loncommon.pm,v 1.859 2009/07/13 17:34:29 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.="\n
Blocking 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
+ | unless $env{'form.inhibitmenu'};
#
return(< td.LC_docs_entry_commands {
background: #DDDDDD;
font-size: x-small;
}
@@ -5557,12 +5603,7 @@ 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 {
+table.LC_data_table tr > td.LC_docs_entry_parameter {
background: #BBBBFF;
font-size: x-small;
white-space: nowrap;
@@ -5728,14 +5769,6 @@ div.LC_edit_problem_saves {
padding-bottom: 5px;
}
-hr.LC_edit_problem_divide {
- clear: both;
- color: $tabbg;
- background-color: $tabbg;
- height: 3px;
- border: none;
-}
-
img.stift{
border-width: 0;
vertical-align: middle;
@@ -5800,7 +5833,7 @@ h2,h3,h4,h5,h6 {
}
.LC_Box > .LC_hcell {
- margin: 0 -10px;
+ margin: 0 -10px 10px -10px;
}
.LC_noBorder {
@@ -5842,7 +5875,7 @@ fieldset > legend {
#LC_nav_bar {
float: left;
- margin: 0;
+ margin: 0.2em 0 0 0;
}
#LC_nav_bar em{
@@ -5852,9 +5885,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 +5915,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;
@@ -5895,14 +5927,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;
@@ -5918,7 +5958,7 @@ ul#LC_TabMainMenuContent li a {
}
ul.LC_TabContent {
- min-height:1.6em;
+ min-height:1.5em;
}
ul.LC_TabContent li {
@@ -5928,6 +5968,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;
@@ -5957,13 +6001,15 @@ ul.LC_TabContentBigger li {
ul.LC_TabContentBigger li:hover,
ul.LC_TabContentBigger li.active {
- background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+ background: #ffffff;
+ color:$font;
}
ul.LC_TabContentBigger li,
ul.LC_TabContentBigger li a {
font-size:110%;
font-weight:bold;
+ color: #737373;
}
ol#LC_MenuBreadcrumbs,
@@ -6084,13 +6130,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;
@@ -6145,7 +6184,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%;
@@ -6374,7 +6413,8 @@ sub xml_begin {
.'';
} else {
- $output='';
+ $output=''
+ .'';
}
return $output;
}