--- loncom/interface/loncommon.pm 2009/07/08 18:36:26 1.852 +++ 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.852 2009/07/08 18:36:26 droeschl 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"; +<script type="text/javascript"> +// <![CDATA[ + function openWindow(url, wdwName, w, h, toolbar,scrollbar) { + var options = "width=" + w + ",height=" + h + ","; + options += "resizable=yes,scrollbars="+scrollbar+",status=no,"; + options += "menubar=no,toolbar="+toolbar+",location=no,directories=no"; + var newWin = window.open(url, wdwName, options); + newWin.focus(); + } + +// ]]> +</script> +END_MYBLOCK + my $popupUrl = "/adm/blockingstatus/$querystring"; + $output.="\n<img src='/res/adm/pages/emblem-readonly.png' /><a onclick='openWindow(\"$popupUrl\",\"Blocking Table\",600,300,\"no\",\"no\");return false;' href='/adm/blockingstatus/$querystring'>Blocking Table</a>"; + + 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|<div id="LC_nav_bar">$name $role<br /> <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; @@ -4439,7 +4473,12 @@ sub bodytag { # Explicit link to get inline menu my $menu= ($no_inline_link?'' - :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>'); + :'<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>'); + $bodytag .= qq|<div id="LC_nav_bar">$name $role + <em>$realm</em> $dc_info </div> + <ol class="LC_smallMenu LC_right"> + <li>$menu</li> + </ol>| unless $env{'form.inhibitmenu'}; # return(<<ENDBODY); $bodytag @@ -5418,12 +5457,12 @@ div.LC_feedback_link a{ } span.LC_feedback_link { - //background: $feedback_link_bg; + /* background: $feedback_link_bg; */ font-size: larger; } span.LC_message_link { - //background: $feedback_link_bg; + /* background: $feedback_link_bg; */ font-size: larger; position: absolute; right: 1em; @@ -5507,8 +5546,7 @@ table.LC_prior_match tr td { border: 1px solid #000000; } -td.LC_nobreak, -span.LC_nobreak { +.LC_nobreak { white-space: nowrap; } @@ -5533,16 +5571,13 @@ table.LC_docs_documents td.LC_docs_docum } .LC_docs_entry_move { - border: none; - border-collapse: collapse; -} - -.LC_docs_entry_move td { - border: 2px solid #BBBBBB; + border: 1px solid #BBBBBB; background: #DDDDDD; + padding: 1px; + margin: 0; } -.LC_docs_editor td.LC_docs_entry_commands { +table.LC_data_table tr > td.LC_docs_entry_commands { background: #DDDDDD; font-size: x-small; } @@ -5568,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; @@ -5900,7 +5930,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 +6002,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 +6130,6 @@ div.LC_columnSection>* { overflow:hidden; } -.clear { - clear: both; - margin: 0; -} - .LC_loginpage_container { text-align:left; margin : 0 auto; @@ -6157,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%;