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

Diff for /loncom/interface/lonmenu.pm between versions 1.274 and 1.276

version 1.274, 2009/07/11 19:58:29 version 1.276, 2009/07/21 14:36:08
Line 165  sub initlittle { Line 165  sub initlittle {
   
 sub menubuttons {  sub menubuttons {
     my $forcereg=shift;      my $forcereg=shift;
     my $registration=shift;  
     my $titletable=shift;      my $titletable=shift;
 #  #
 # Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes"  # Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes"
Line 288  ENDRELOAD Line 287  ENDRELOAD
 <li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>  <li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
 ENDCRELOAD  ENDCRELOAD
         }          }
         my $reg='';      my $reg     = $forcereg ? &innerregister($forcereg,$titletable) : '';
         if ($registration) {      my $form    = &serverform();
            $reg=&innerregister($forcereg,$titletable);      my $utility = &utilityfunctions();
         }  
         my $form=&serverform();      #Prepare the message link that indicates the arrival of new mail
  my $utility=&utilityfunctions();      my $messagelink = Apache::lonmsg::mynewmail() ? "Message (new)" : "Message";
          $messagelink = '<a href="javascript:go(\'/adm/communicate\');">'
  my $messagelink = "";                        . mt($messagelink) .'</a>';
  if(&Apache::lonmsg::mynewmail()){  
  $messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>'      my $helplink = &Apache::loncommon::top_nav_help('Help');
  }else{  
  $messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>'  
  }  
         my $helplink=&Apache::loncommon::top_nav_help('Help');  
  return (<<ENDINLINEMENU);   return (<<ENDINLINEMENU);
 <script type="text/javascript">  <script type="text/javascript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
Line 389  sub innerregister { Line 384  sub innerregister {
     my $reopen=&Apache::lonmenu::reopenmenu();      my $reopen=&Apache::lonmenu::reopenmenu();
   
     my $newmail='';      my $newmail='';
     my $breadcrumb;  
   
     if (&Apache::lonmsg::newmail() && !$noremote) {       if (&Apache::lonmsg::newmail() && !$noremote) { 
         # We have new mail and remote is up          # We have new mail and remote is up
         $newmail= 'swmenu.setstatus("you have","messages");';          $newmail= 'swmenu.setstatus("you have","messages");';
     }       } 
   
       my $breadcrumb;
     if ($noremote      if ($noremote
      && ($env{'request.symb'})        && ($env{'request.symb'}) 
      && ($env{'request.course.id'})) {       && ($env{'request.course.id'})) {
Line 997  ENDOPEN Line 993  ENDOPEN
 sub clear {  sub clear {
     my ($row,$col)=@_;      my ($row,$col)=@_;
     unless ($env{'environment.remote'} eq 'off') {      unless ($env{'environment.remote'} eq 'off') {
          if (($row<1) || ($row>13)) { return ''; }
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););         return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
    } else {      } else { 
        $inlineremote[10*$row+$col]='';         $inlineremote[10*$row+$col]='';
Line 1022  sub switch { Line 1019  sub switch {
     $category_members{$cat}.=':'.$idx;      $category_members{$cat}.=':'.$idx;
   
     unless ($env{'environment.remote'} eq 'off') {      unless ($env{'environment.remote'} eq 'off') {
          if (($row<1) || ($row>13)) { return ''; }
 # Remote  # Remote
        return "\n".         return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););   qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
Line 1095  sub openmenu { Line 1093  sub openmenu {
 sub inlinemenu {  sub inlinemenu {
     undef(@inlineremote);      undef(@inlineremote);
     undef(%category_members);      undef(%category_members);
   # calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control
     &rawconfig(1);      &rawconfig(1);
     my $output='<table id="LC_mainmenu"><tr>';      my $output='<table id="LC_mainmenu"><tr>';
     for (my $col=1; $col<=2; $col++) {      for (my $col=1; $col<=2; $col++) {
Removed from v.1.274  
changed lines
  Added in v.1.276

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