Diff for /loncom/interface/lonmenu.pm between versions 1.115 and 1.116

version 1.115, 2004/08/27 17:03:45 version 1.116, 2004/09/18 16:28:35
Line 69  sub menubuttons { Line 69  sub menubuttons {
     my $forcereg=shift;      my $forcereg=shift;
     my $target  =shift;      my $target  =shift;
     my $registration=shift;      my $registration=shift;
       
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['inhibitmenu']);      ['inhibitmenu']);
     if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }      if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
Line 97  ENDNAV Line 96  ENDNAV
 ENDRELOAD  ENDRELOAD
             }              }
         }          }
           my $utility=&utilityfunctions();
  my $output=(<<ENDMAINMENU);   my $output=(<<ENDMAINMENU);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
   $utility
 </script>  </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>  <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />  $reloadlink $navmaps<br />
Line 134  ENDMAINMENU Line 135  ENDMAINMENU
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);          my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
 # Do we have a NAV link?  # Do we have a NAV link?
         if ($ENV{'request.course.id'}) {          if ($ENV{'request.course.id'}) {
     my $navcontrol=&Apache::lonnavmaps::nav_control_js();             $navmaps=(<<ENDNAV);
     $navmaps=(<<ENDNAV);  
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <script type="text/javascript">  
 $navcontrol  
 </script>  
 <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>  <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV  ENDNAV
     if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&      if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
Line 156  ENDRELOAD Line 153  ENDRELOAD
         if ($registration) {          if ($registration) {
            $reg=&innerregister($forcereg,$target);             $reg=&innerregister($forcereg,$target);
         }          }
    my $utility=&utilityfunctions();
  return (<<ENDINLINEMENU);   return (<<ENDINLINEMENU);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
   $utility
 </script>  </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">  <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>  <tr>
Line 168  ENDRELOAD Line 167  ENDRELOAD
 $reloadlink  $reloadlink
 $navmaps  $navmaps
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&url=$escurl" target="_top">  <a href="/adm/remote?action=launch&url=$escurl">
 <font color="$font">$lt{'launch'}</font></a></td>  <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />  <img align="right" src="/adm/lonIcons/minilogo.gif" />
Line 389  ENDREALRES Line 388  ENDREALRES
         }          }
         if ($textual) {          if ($textual) {
 # Registered, textual output  # Registered, textual output
             my $utility=&utilityfunctions();  
             my $form=&serverform();              my $form=&serverform();
     my $inlinebuttons='';      my $inlinebuttons='';
   
Line 408  ENDINLINE Line 406  ENDINLINE
     $result =(<<ENDREGTEXT);      $result =(<<ENDREGTEXT);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
 $utility  
 </script>  </script>
 $timesync  $timesync
 $newmail  $newmail
Line 981  sub handler { Line 978  sub handler {
  $ENV{'browser.interface'}='faketextual';   $ENV{'browser.interface'}='faketextual';
  $ENV{'environment.remote'}='off';   $ENV{'environment.remote'}='off';
     }      }
     my $utility=&utilityfunctions();  
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
 <html><head>  <html><head>
 <title>LON-CAPA Main Menu</title>  <title>LON-CAPA Main Menu</title>
 <script>  
 $utility  
 </script>  
 </head>  </head>
 $bodytag  $bodytag
 ENDHEADER  ENDHEADER

Removed from v.1.115  
changed lines
  Added in v.1.116


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