Diff for /loncom/interface/lonmenu.pm between versions 1.140 and 1.144

version 1.140, 2004/12/07 23:59:52 version 1.144, 2005/02/07 23:37:45
Line 145  ENDMAINMENU Line 145  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'}) {
            $navmaps=(<<ENDNAV);      my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
    $escsymb;
       if ($ENV{'environment.remotenavmap'} eq 'on') {
    $link="javascript:gonav('".$link."')";
       }
       $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>  <a href="$link"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV  ENDNAV
     if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&      if (
                 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&   ($ENV{'request.noversionuri'}=~m[^/(res|public)/] &&
          ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {   $ENV{'request.symb'} ne '')
    ||
    (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
    ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
    ($ENV{'request.noversionuri'}!~
           m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
     )
    ) {
                 my $escreload=&Apache::lonnet::escape('return:');                  my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);                  $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
Line 974  sub utilityfunctions { Line 986  sub utilityfunctions {
     my $caller = shift;      my $caller = shift;
     unless (($ENV{'browser.interface'} eq 'textual')  ||      unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }          ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
     my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'});      my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$ENV{'request.noversionuri'}))[0]));
       $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
           
     my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});      my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
     my $nav_control=&nav_control_js();      my $nav_control=&nav_control_js();
Line 1142  sub handler { Line 1155  sub handler {
     $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);      $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $font=&Apache::loncommon::designparm($function.'.font',$domain);      $font=&Apache::loncommon::designparm($function.'.font',$domain);
     my $script_tag;      my $script_tag;
     if ($ENV{'environment.remote'} eq 'on') {      if ($ENV{'environment.remote'} ne 'off') {
         my $utility=&utilityfunctions('/adm/menu');          my $utility=&utilityfunctions('/adm/menu');
         $script_tag=(<<ENDSCRIPT);          $script_tag=(<<ENDSCRIPT);
 <script type="text/javascript">  <script type="text/javascript">

Removed from v.1.140  
changed lines
  Added in v.1.144


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