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

Diff for /loncom/interface/lonmenu.pm between versions 1.40 and 1.41

version 1.40, 2003/02/17 17:34:16 version 1.41, 2003/02/17 19:28:54
Line 48  sub menubuttons { Line 48  sub menubuttons {
     my $target  =shift;      my $target  =shift;
     my $registration=shift;      my $registration=shift;
     unless ($ENV{'browser.interface'} eq 'textual') { return ''; }      unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
   # Textual display only
     my $output='<a href="/adm/menu">Main Menu</a><br />';      my $output='<a href="/adm/menu">Main Menu</a><br />';
     if ($registration) { $output.=&innerregister($forcereg,$target); }      if ($registration) { $output.=&innerregister($forcereg,$target); }
     return $output."<hr />";      return $output."<hr />";
Line 73  sub registerurl { Line 74  sub registerurl {
  return $result.   return $result.
          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';           '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
     }      }
   # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }      if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $result.=&innerregister($forcereg,$target);      $result.=&innerregister($forcereg,$target);
     return $result;      return $result;
Line 93  sub innerregister { Line 95  sub innerregister {
   
     my $newmail='';      my $newmail='';
     if (&Apache::lonmsg::newmail()) {       if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?'<b>You have messages</b><br />':         $newmail=($textual?
    '<b><a href="/adm/communicate">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');                            'swmenu.setstatus("you have","messages");');
     }      }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');      my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
 # -- This is for URLs that actually can be registered  # =============================================================================
   # ============================ This is for URLs that actually can be registered
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {      if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges  # -- This applies to homework problems for users with grading privileges
         my $hwkadd='';          my $hwkadd='';
Line 176  sub innerregister { Line 180  sub innerregister {
         }          }
         ###          ###
         ###          ###
  $result = (<<ENDREGTHIS);  # Prepare the rest of the buttons
    my $menuitems=(<<ENDMENUITEMS);
   c&3&1
   s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
   s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&1
   s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
   s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
   s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
   s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
   s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
   s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2
   s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
   ENDMENUITEMS
           my $buttons='';
           foreach (split(/\n/,$menuitems)) {
       my ($command,@rest)=split(/\&/,$_);
               if ($command eq 's') {
    $buttons.=&switch('','',@rest);
               } else {
                   $buttons.=&clear(@rest);
               }
           }
           if ($textual) {
   # Registered, textual output
       $result =(<<ENDREGTEXT);
   $timesync
   $newmail
   $buttons
   $hwkadd
   $editbutton
   ENDREGTEXT
   # Registered, graphical output
           } else {
       $result = (<<ENDREGTHIS);
             
 <script language="JavaScript">  <script language="JavaScript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
Line 186  sub innerregister { Line 223  sub innerregister {
           swmenu.clearTimeout(swmenu.menucltim);            swmenu.clearTimeout(swmenu.menucltim);
           $timesync            $timesync
           $newmail            $newmail
             $buttons
   swmenu.currentURL=window.location.pathname;    swmenu.currentURL=window.location.pathname;
           swmenu.reloadURL=window.location.pathname;            swmenu.reloadURL=window.location.pathname;
           swmenu.currentSymb="$ENV{'request.symb'}";            swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";            swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;            swmenu.currentStale=0;
           swmenu.clearbut(3,1);  
           swmenu.switchbutton  
        (6,3,'catalog.gif','catalog','info','catalog_info()','Show catalog information');  
           swmenu.switchbutton  
        (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');  
           swmenu.switchbutton  
     (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)','Provide feedback messages or contribute to the course discussion about this resource');  
           swmenu.switchbutton  
      (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)','Prepare a printable document');  
           swmenu.switchbutton  
        (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)','Go to the previous resource in the course sequence');  
           swmenu.switchbutton  
      (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)','Go to the next resource in the course sequence');  
           swmenu.switchbutton  
                             (9,1,'sbkm.gif','set','bookmark','set_bookmark()','Set a bookmark for this resource');  
           swmenu.switchbutton  
                          (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()','Use or edit my bookmark collection');  
           swmenu.switchbutton  
                                (9,3,'anot.gif','anno-','tations','annotate()','Make notes and annotations about this resource');  
           $hwkadd            $hwkadd
           $editbutton            $editbutton
     }      }
Line 234  sub innerregister { Line 253  sub innerregister {
 // END LON-CAPA Internal  // END LON-CAPA Internal
 </script>  </script>
 ENDREGTHIS  ENDREGTHIS
           }
   # =============================================================================
     } else {      } else {
         $result = (<<ENDDONOTREGTHIS);  # ========================================== This can or will not be registered
           if ($textual) {
   # Not registered, textual
       $result= (<<ENDDONOTREGTEXT);
   ENDDONOTREGTEXT
           } else {
   # Not registered, graphical
              $result = (<<ENDDONOTREGTHIS);
   
 <script language="JavaScript">  <script language="JavaScript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
Line 264  ENDREGTHIS Line 291  ENDREGTHIS
 // END LON-CAPA Internal  // END LON-CAPA Internal
 </script>  </script>
 ENDDONOTREGTHIS  ENDDONOTREGTHIS
          }
   # =============================================================================
     }      }
     return $result;      return $result;
 }  }
Line 403  sub switch { Line 432  sub switch {
        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"););
    } else {     } else {
          if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;         my $text=$top.' '.$bot;
        $text=~s/\- //;         $text=~s/\- //;
        return ($nobreak?'':'<br />').         return ($nobreak?'':'<br />').
         '<a href="javascript:'.$act.';">'.$text.'</a> '.$desc;          '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);
    }     }
 }  }
   
Removed from v.1.40  
changed lines
  Added in v.1.41

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