Diff for /loncom/interface/lonmenu.pm between versions 1.58 and 1.62

version 1.58, 2003/04/05 22:14:40 version 1.62, 2003/04/18 00:02:34
Line 57  sub menubuttons { Line 57  sub menubuttons {
     my $target  =shift;      my $target  =shift;
     my $registration=shift;      my $registration=shift;
     my $navmaps='';      my $navmaps='';
       my $reloadlink='';
     my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});      my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});
     my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});      my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {      if ($ENV{'browser.interface'} eq 'textual') {
Line 65  sub menubuttons { Line 66  sub menubuttons {
     $navmaps=(<<ENDNAV);      $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>  <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
 ENDNAV  ENDNAV
               if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
            ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
            ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                   my $escreload=&Apache::lonnet::escape('return:');
                   $reloadlink=(<<ENDRELOAD);
   <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a>
   ENDRELOAD
               }
         }          }
  my $output=(<<ENDMAINMENU);   my $output=(<<ENDMAINMENU);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
 </script>  </script>
 <a href="/adm/menu" target="_top">Main Menu</a>  <a href="/adm/menu" target="_top">Main Menu</a>
 $navmaps<br />  $reloadlink $navmaps<br />
 <script>  <script>
 // END LON-CAPA Internal  // END LON-CAPA Internal
 </script>  </script>
Line 106  ENDMAINMENU Line 115  ENDMAINMENU
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">Navigate Contents</font></a></td>  <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">Navigate Contents</font></a></td>
 ENDNAVREM  ENDNAVREM
               if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
                   ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
            ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                   my $escreload=&Apache::lonnet::escape('return:');
                   $reloadlink=(<<ENDRELOAD);
   <td bgcolor="$tabbg">
   <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a></td>
   ENDRELOAD
               }
         }          }
         my $reg='';          my $reg='';
         if ($registration) {          if ($registration) {
Line 120  ENDNAVREM Line 138  ENDNAVREM
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/menu" target="_top"><font color="$font">Main Menu</font></a>  <a href="/adm/menu" target="_top"><font color="$font">Main Menu</font></a>
 </td>  </td>
   $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" target="_top">
Line 184  sub innerregister { Line 203  sub innerregister {
     my $reopen=&Apache::lonmenu::reopenmenu();      my $reopen=&Apache::lonmenu::reopenmenu();
   
     my $newmail='';      my $newmail='';
       if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
    my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});
           $newmail=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
           my $maptitle=&Apache::lonnet::gettitle($mapurl);
    my $restitle=&Apache::lonnet::gettitle($resurl);
           if ($maptitle) {
       $newmail.=', '.$maptitle;
           }
           if ($restitle) {
       $newmail.=': '.$restitle;
           }
           $newmail.='&nbsp;&nbsp;&nbsp;';
       }
     if (&Apache::lonmsg::newmail()) {       if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?         $newmail=($textual?
  '<b><a href="/adm/communicate">You have new messages</a></b><br />':   '<b><a href="/adm/communicate">You have new messages</a></b><br />':
Line 758  function gocmd(url,cmd) { Line 790  function gocmd(url,cmd) {
 }  }
   
 function catalog_info() {  function catalog_info() {
    loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');     loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }  }
   
 function chat_win() {  function chat_win() {
Line 770  ENDUTILITY Line 802  ENDUTILITY
 sub serverform {  sub serverform {
     return(<<ENDSERVERFORM);      return(<<ENDSERVERFORM);
   
 <form name="server" action="/adm/logout" method="post">  <form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />  <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />  <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />  <input type="hidden" name="url" value="none" />

Removed from v.1.58  
changed lines
  Added in v.1.62


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