[BACK]Return to loncommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.852 and 1.855

version 1.852, 2009/07/08 18:36:26 version 1.855, 2009/07/09 17:17:49
Line 3871  sub build_block_table { Line 3871  sub build_block_table {
     }      }
     $output .= &end_data_table();      $output .= &end_data_table();
 }  }
   
 sub blocking_status {  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 ($activity,$uname,$udom) = @_;
     my %setters;      my %setters;
     my ($blocked,$output,$ownitem,$is_course);      my ($blocked,$output,$ownitem,$is_course);
Line 4394  sub bodytag { Line 4427  sub bodytag {
         $dc_info = '('.$dc_info.')';          $dc_info = '('.$dc_info.')';
     }      }
   
       $role = "($role)" if $role;
       &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
   
     if ($env{'environment.remote'} eq 'off') {      if ($env{'environment.remote'} eq 'off') {
         # No Remote          # No Remote
  if ($env{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
Line 4411  sub bodytag { Line 4447  sub bodytag {
  if ($no_nav_bar) {   if ($no_nav_bar) {
     $bodytag .= $titletable;      $bodytag .= $titletable;
  } else {   } else {
         $role = "($role)" if $role;  
         &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);  
         $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />          $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
             <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};              <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};
   
Line 4439  sub bodytag { Line 4473  sub bodytag {
   
     # Explicit link to get inline menu      # Explicit link to get inline menu
     my $menu= ($no_inline_link?''      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);      return(<<ENDBODY);
 $bodytag  $bodytag
Line 5507  table.LC_prior_match tr td { Line 5546  table.LC_prior_match tr td {
   border: 1px solid #000000;    border: 1px solid #000000;
 }  }
   
 td.LC_nobreak,  .LC_nobreak {
 span.LC_nobreak {  
   white-space: nowrap;    white-space: nowrap;
 }  }
   
Removed from v.1.852  
changed lines
  Added in v.1.855

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>