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

version 1.41, 2003/02/17 19:28:54 version 1.42, 2003/02/17 22:59:37
Line 204  ENDMENUITEMS Line 204  ENDMENUITEMS
         }          }
         if ($textual) {          if ($textual) {
 # Registered, textual output  # Registered, textual output
               my $utility=&utilityfunctions();
               my $form=&serverform();
     $result =(<<ENDREGTEXT);      $result =(<<ENDREGTEXT);
   <script>
   // BEGIN LON-CAPA Internal
   $utility
   </script>
 $timesync  $timesync
 $newmail  $newmail
 $buttons  $buttons
 $hwkadd  $hwkadd
 $editbutton  $editbutton
   $form
   <script>
   //END LON-CAPA Internal
   </script>
   
 ENDREGTEXT  ENDREGTEXT
 # Registered, graphical output  # Registered, graphical output
         } else {          } else {
Line 217  ENDREGTEXT Line 228  ENDREGTEXT
             
 <script language="JavaScript">  <script language="JavaScript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
   var swmenu=null;
   
     function LONCAPAreg() {      function LONCAPAreg() {
   swmenu=$reopen;    swmenu=$reopen;
Line 267  ENDDONOTREGTEXT Line 279  ENDDONOTREGTEXT
   
 <script language="JavaScript">  <script language="JavaScript">
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
   var swmenu=null;
   
     function LONCAPAreg() {      function LONCAPAreg() {
   swmenu=$reopen    swmenu=$reopen
Line 435  sub switch { Line 448  sub switch {
        if ($nobreak==2) { return ''; }         if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;         my $text=$top.' '.$bot;
        $text=~s/\- //;         $text=~s/\- //;
        return ($nobreak?'':'<br />').         return "\n".($nobreak?' ':'<br />').
         '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);          '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);
    }     }
 }  }
Line 572  sub footer { Line 585  sub footer {
   
 }  }
   
   sub utilityfunctions {
       unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
       my $currenturl=$ENV{'REQUEST_URI'};
       my $currentsymb=$ENV{'request.symb'};
   return (<<ENDUTILITY)
   
       var currentURL="$currenturl";
       var reloadURL="$currenturl";
       var currentSymb="$currentsymb";
   
   function go(url) {
      if (url!='' && url!= null) {
          currentURL = null;
          currentSymb= null;
          window.location.href=url;
      }
   }
   
   function gopost(url,postdata) {
      if (url!='') {
         this.document.server.action=url;
         this.document.server.postdata.value=postdata;
         this.document.server.command.value='';
         this.document.server.url.value='';
         this.document.server.symb.value='';
         this.document.server.submit();
      }
   }
   
   function gocmd(url,cmd) {
      if (url!='') {
         this.document.server.action=url;
         this.document.server.postdata.value='';
         this.document.server.command.value=cmd;
         this.document.server.url.value=currentURL;
         this.document.server.symb.value=currentSymb;
         this.document.server.submit();
      }
   }
   ENDUTILITY
   }
   
   sub serverform {
       return(<<ENDSERVERFORM);
   
   <form name="server" action="/adm/logout" method="post">
   <input type="hidden" name="postdata" value="none" />
   <input type="hidden" name="command" value="none" />
   <input type="hidden" name="url" value="none" />
   <input type="hidden" name="symb" value="none" />
   </form>
   ENDSERVERFORM
   }
 # ================================================ Handler when called directly  # ================================================ Handler when called directly
   
   
Line 581  sub handler { Line 647  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 $bodytag=&Apache::loncommon::bodytag('Main Menu');      my $bodytag=&Apache::loncommon::bodytag('Main Menu');
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
 <html><head>  <html><head>
 <title>LON-CAPA Main Menu</title>  <title>LON-CAPA Main Menu</title>
 <script>  <script>
 function go(url) {  $utility
     window.location=url;  
 }  
 function gopost(url) {  
     window.location=url;  
 }  
 </script>  </script>
 </head>  </head>
 $bodytag  $bodytag
 ENDHEADER  ENDHEADER
     $r->print(&rawconfig(1));      $r->print(&rawconfig(1).$form);
     $r->print('</body></html>');      $r->print('</body></html>');
     return OK;      return OK;
 }  }

Removed from v.1.41  
changed lines
  Added in v.1.42


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