Diff for /loncom/interface/lonmenu.pm between versions 1.83 and 1.91

version 1.83, 2003/08/15 13:25:28 version 1.91, 2003/09/17 23:40:25
Line 44  use Apache::Constants qw(:common); Line 44  use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::File;  use Apache::File;
   use Apache::lonlocal;
   
 use vars qw(@desklines $readdesk);  use vars qw(@desklines $readdesk);
   
   
 my @inlineremote;  my @inlineremote;
 my $font;  my $font;
 my $tabbg;  my $tabbg;
 my $pgbg;  my $pgbg;
   
   # ================================================================ Little texts
   
   sub initlittle {
       return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
          'nav' => 'Navigate Contents',
          'main' => 'Main Menu',
          'launch' => 'Launch Remote Control');
   }
   
 # ============================= This gets called at the top of the body section  # ============================= This gets called at the top of the body section
   
 sub menubuttons {  sub menubuttons {
       &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;      my $forcereg=shift;
     my $target  =shift;      my $target  =shift;
     my $registration=shift;      my $registration=shift;
Line 62  sub menubuttons { Line 76  sub menubuttons {
     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') {
 # Textual display only  # Textual display only
    my %lt=&initlittle();
         if ($ENV{'request.course.id'}) {          if ($ENV{'request.course.id'}) {
     $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">$lt{'nav'}</a>
 ENDNAV  ENDNAV
             if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&              if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&           ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {           ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');                  my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);                  $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a>  <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
 ENDRELOAD  ENDRELOAD
             }              }
         }          }
Line 79  ENDRELOAD Line 94  ENDRELOAD
 <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">$lt{'main'}</a>
 $reloadlink $navmaps<br />  $reloadlink $navmaps<br />
 <script>  <script>
 // END LON-CAPA Internal  // END LON-CAPA Internal
Line 90  ENDMAINMENU Line 105  ENDMAINMENU
     } elsif ($ENV{'environment.remote'} eq 'off') {      } elsif ($ENV{'environment.remote'} eq 'off') {
 # Remote Control is switched off  # Remote Control is switched off
 # figure out colors  # figure out colors
    my %lt=&initlittle();
  my $function='student';   my $function='student';
         if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {          if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
     $function='coordinator';      $function='coordinator';
Line 113  ENDMAINMENU Line 129  ENDMAINMENU
         if ($ENV{'request.course.id'}) {          if ($ENV{'request.course.id'}) {
     $navmaps=(<<ENDNAVREM);      $navmaps=(<<ENDNAVREM);
 <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">$lt{'nav'}</font></a></td>
 ENDNAVREM  ENDNAVREM
             if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&              if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
                 ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&                  ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
Line 121  ENDNAVREM Line 137  ENDNAVREM
                 my $escreload=&Apache::lonnet::escape('return:');                  my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);                  $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a></td>  <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td>
 ENDRELOAD  ENDRELOAD
             }              }
         }          }
Line 136  ENDRELOAD Line 152  ENDRELOAD
 <table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">  <table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
 <tr>  <tr>
 <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">$lt{'main'}</font></a>
 </td>  </td>
 $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" target="_top">
 <font color="$font">Launch Remote Control</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" />
 <b>LON-CAPA</b></td>  <b>LON-CAPA</b></td>
Line 161  ENDINLINEMENU Line 177  ENDINLINEMENU
 # ====================================== This gets called in the header section  # ====================================== This gets called in the header section
   
 sub registerurl {  sub registerurl {
       &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;      my $forcereg=shift;
     my $target = shift;      my $target = shift;
     my $result = '';      my $result = '';
Line 194  sub registerurl { Line 211  sub registerurl {
 # =========== and in the body of the document  # =========== and in the body of the document
   
 sub innerregister {  sub innerregister {
       &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;      my $forcereg=shift;
     my $target = shift;      my $target = shift;
     my $result = '';      my $result = '';
Line 216  sub innerregister { Line 234  sub innerregister {
  $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';   $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }      }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {      if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
  my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});   my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
         $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};          $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
         my $maptitle=&Apache::lonnet::gettitle($mapurl);          my $maptitle=&Apache::lonnet::gettitle($mapurl);
  my $restitle=&Apache::lonnet::gettitle($resurl);   my $restitle=&Apache::lonnet::gettitle($resurl);
Line 377  $form Line 395  $form
 ENDREGTEXT  ENDREGTEXT
 # Registered, graphical output  # Registered, graphical output
         } else {          } else {
       my $requri=(split(/\?/,$ENV{'REQUEST_URI'}))[0];
       $requri=&Apache::lonnet::unescape($requri);
     $result = (<<ENDREGTHIS);      $result = (<<ENDREGTHIS);
             
 <script language="JavaScript">  <script language="JavaScript">
Line 389  var swmenu=null; Line 409  var swmenu=null;
           $timesync            $timesync
           $newmail            $newmail
           $buttons            $buttons
   swmenu.currentURL=window.location.pathname;    swmenu.currentURL="$requri";
           swmenu.reloadURL=window.location.pathname+window.location.search;            swmenu.reloadURL=swmenu.currentURL+window.location.search;
           swmenu.currentSymb="$ENV{'request.symb'}";            swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";            swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;            swmenu.currentStale=0;
Line 608  sub switch { Line 628  sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;      my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;
     $act=~s/\$uname/$uname/g;      $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;      $act=~s/\$udom/$udom/g;
       $top=&mt($top);
       $bot=&mt($bot);
       $desc=&mt($desc);
     unless (($ENV{'browser.interface'} eq 'textual')  ||      unless (($ENV{'browser.interface'} eq 'textual')  ||
             ($ENV{'environment.remote'} eq 'off')) {              ($ENV{'environment.remote'} eq 'off')) {
 # Remote  # Remote
Line 856  sub handler { Line 879  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
       &Apache::lonlocal::clearreroutetrans();
   
     my $form=&serverform();      my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');      my $bodytag=&Apache::loncommon::bodytag('Main Menu');
     my $function='student';      my $function='student';
Line 888  $utility Line 913  $utility
 $bodytag  $bodytag
 ENDHEADER  ENDHEADER
     $r->print('<table>'.&inlinemenu().'</table>'.$form);      $r->print('<table>'.&inlinemenu().'</table>'.$form);
       $r->print(&Apache::lonlocal::endreroutetrans());
     $r->print('</body></html>');      $r->print('</body></html>');
     return OK;      return OK;
 }  }

Removed from v.1.83  
changed lines
  Added in v.1.91


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