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

Diff for /loncom/interface/lonmenu.pm between versions 1.74 and 1.79

version 1.74, 2003/06/04 22:05:22 version 1.79, 2003/06/23 19:08:03
Line 158  ENDINLINEMENU Line 158  ENDINLINEMENU
     }      }
 }  }
   
 # ===== Early call to LONCAPAreg for long-running pages, preferably used right   
 # ===== before $r->rflush()  
   
 sub regflush {  
     return '<script type="text/javascript">'.&loadevents.'</script>';  
 }  
   
 # ====================================== This gets called in the header section  # ====================================== This gets called in the header section
   
 sub registerurl {  sub registerurl {
Line 187  sub registerurl { Line 180  sub registerurl {
         ((($ENV{'request.publicaccess'}) ||           ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&           (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {          (!$forcereg))) {
         my $loadfunction='';    return $result.
         my $inlineloadfunction='';            '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
         my $unloadfunction='';  
         unless (($ENV{'browser.interface'} eq 'textual') ||  
                 ($ENV{'environment.remote'} eq 'off') ||  
                 ($ENV{'request.publicaccess'})) {  
     my $reopen=&Apache::lonmenu::reopenmenu();  
      $loadfunction='swmenu='.$reopen.'swmenu.windowloaded(self.name);window.focus();';  
             $inlineloadfunction=&regflush();  
      $unloadfunction='swmenu='.$reopen.'swmenu.windowunloaded(self.name);';  
         }   
  return $result.(<<ENDFUNCTIONS);  
 <script type="text/javascript">  
 function LONCAPAreg() {  
    $loadfunction  
 }   
   
 function LONCAPAstale() {  
    $unloadfunction  
 }  
 </script>  
 $inlineloadfunction  
 $force_title  
 ENDFUNCTIONS  
     }      }
 # Graphical display after login only  # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }      if ($Apache::lonxml::registered && !$forcereg) { return ''; }
Line 274  sub innerregister { Line 245  sub innerregister {
         my $hwkadd='';          my $hwkadd='';
         if           if 
       ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {        ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
     if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {      my $crs='/'.$ENV{'request.course.id'};
  $hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',      if ($ENV{'request.course.sec'}) {
           $crs.='_'.$ENV{'request.course.sec'};
       }
       $crs=~s/\_/\//g;
   
       if (&Apache::lonnet::allowed('vgr',$crs)) {
    $hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
                        "gocmd('/adm/grades','submission')",                         "gocmd('/adm/grades','submission')",
        'View user submissions for this assessment resource');         'View user submissions for this assessment resource');
             }              }
     if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgr',$crs)) {
  $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',   $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
                        "gocmd('/adm/grades','gradingmenu')",                         "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');                         'Modify user grades for this assessment resource');
             }              }
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {      if (&Apache::lonnet::allowed('opa',$crs)) {
  $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',   $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
                        "gocmd('/adm/parmset','set')",                         "gocmd('/adm/parmset','set')",
                        'Modify deadlines, etc, for this assessment resource');                         'Modify deadlines, etc, for this assessment resource');
Line 352  sub innerregister { Line 329  sub innerregister {
 c&3&1  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&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&3  s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
 s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information  c&6&3
 s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource  c&8&1
 s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource  c&8&2
 s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document  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&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&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  s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS  ENDMENUITEMS
           unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
       $menuitems.=(<<ENDREALRES);
   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
   ENDREALRES
    }
         my $buttons='';          my $buttons='';
         foreach (split(/\n/,$menuitems)) {          foreach (split(/\n/,$menuitems)) {
     my ($command,@rest)=split(/\&/,$_);      my ($command,@rest)=split(/\&/,$_);
Line 401  var swmenu=null; Line 385  var swmenu=null;
   
     function LONCAPAreg() {      function LONCAPAreg() {
   swmenu=$reopen;    swmenu=$reopen;
           swmenu.windowloaded(self.name);  
           swmenu.clearTimeout(swmenu.menucltim);            swmenu.clearTimeout(swmenu.menucltim);
           $timesync            $timesync
           $newmail            $newmail
Line 429  var swmenu=null; Line 412  var swmenu=null;
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+   'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',   'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
   2000);    2000);
           swmenu.windowunloaded(self.name);  
       }        }
   
 // END LON-CAPA Internal  // END LON-CAPA Internal
Line 453  var swmenu=null; Line 435  var swmenu=null;
   
     function LONCAPAreg() {      function LONCAPAreg() {
   swmenu=$reopen    swmenu=$reopen
   swmenu.windowloaded(self.name);  
           $timesync            $timesync
           swmenu.currentStale=1;            swmenu.currentStale=1;
           swmenu.clearbut(2,1);            swmenu.clearbut(2,1);
Line 470  var swmenu=null; Line 451  var swmenu=null;
     }      }
   
     function LONCAPAstale() {      function LONCAPAstale() {
    swmenu=$reopen  
   swmenu.windowunloaded(self.name);    
     }      }
   
 // END LON-CAPA Internal  // END LON-CAPA Internal
Line 638  sub switch { Line 617  sub switch {
 # Accessibility  # Accessibility
        if ($nobreak==2) { return ''; }         if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;         my $text=$top.' '.$bot;
        $text=~s/\- //;         $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').         $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
         '<a href="javascript:'.$act.';">'.$text.'</a> '.          '<a href="javascript:'.$act.';">'.$text.'</a> '.
         ($nobreak?'':$desc);          ($nobreak?'':$desc);
Line 646  sub switch { Line 625  sub switch {
 # Inline Remote  # Inline Remote
        if ($nobreak==2) { return ''; }         if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;         my $text=$top.' '.$bot;
        $text=~s/\- //;         $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".         $inlineremote[10*$row+$col]="\n".
          ($nobreak==3?'<td width="50%" colspan="2" align="right"':'<tr><td').           ($nobreak==3?'<td width="50%" colspan="2" align="right"':'<tr><td').
          ' bgcolor="'.$tabbg.'"'.($nobreak==1?' width="50%" colspan="2"':'').           ' bgcolor="'.$tabbg.'"'.($nobreak==1?' width="50%" colspan="2"':'').
Removed from v.1.74  
changed lines
  Added in v.1.79

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