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

Diff for /loncom/interface/lonmenu.pm between versions 1.51 and 1.53

version 1.51, 2003/04/03 14:44:01 version 1.53, 2003/04/03 20:25:08
Line 73  ENDMAINMENU Line 73  ENDMAINMENU
 </script>  </script>
 <a href="/adm/menu" target="_top">Main Menu</a>  <a href="/adm/menu" target="_top">Main Menu</a>
 <a href="/adm/remote?action=launch" target="_top">Launch Remote Control</a>  <a href="/adm/remote?action=launch" target="_top">Launch Remote Control</a>
   <br />
 <script>  <script>
 // END LON-CAPA Internal  // END LON-CAPA Internal
 </script>  </script>
Line 98  sub registerurl { Line 99  sub registerurl {
                 "\n</script>\n";                  "\n</script>\n";
     }      }
     if (($ENV{'browser.interface'} eq 'textual') ||      if (($ENV{'browser.interface'} eq 'textual') ||
           ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) ||           ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&           (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {          (!$forcereg))) {
Line 364  sub startupremote { Line 366  sub startupremote {
 # The Remote actually gets launched!  # The Remote actually gets launched!
 #  #
     my $configmenu=&rawconfig();      my $configmenu=&rawconfig();
       my $esclowerurl=&Apache::lonnet::escape($lowerurl);
   
     return(<<ENDREMOTESTARTUP);      return(<<ENDREMOTESTARTUP);
 <script>  <script>
   
Line 393  function wait() { Line 397  function wait() {
          $configmenu           $configmenu
          window.location='$lowerurl';             window.location='$lowerurl';  
       } else {        } else {
          alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters.");    window.location='/adm/remote?action=collapse&url=$esclowerurl';
       }        }
    } else {     } else {
       wheelswitch();        wheelswitch();
Line 402  function wait() { Line 406  function wait() {
 }  }
   
 function main() {  function main() {
    canceltim=setTimeout('tim=1;',60000);     canceltim=setTimeout('tim=1;',30000);
    window.status='-';     window.status='-';
    wait();     wait();
 }  }
Line 702  sub handler { Line 706  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
     my $utility=&utilityfunctions();  
     my $form=&serverform();      my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');      my $bodytag=&Apache::loncommon::bodytag('Main Menu');
 # ------------------------------------------------------------ Print the screen  # ---- Print the screen, pretent to be in text mode to generate text-based menu
       unless ($ENV{'brower.interface'} eq 'textual') {
    $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>
Removed from v.1.51  
changed lines
  Added in v.1.53

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