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

Diff for /loncom/interface/lonmenu.pm between versions 1.112 and 1.114

version 1.112, 2004/08/10 18:05:12 version 1.114, 2004/08/23 21:05:03
Line 133  ENDMAINMENU Line 133  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=(<<ENDNAVREM);      my $navcontrol=&Apache::lonnavmaps::nav_control_js();
       $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td>  <script type="text/javascript">
 ENDNAVREM  $navcontrol
             if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&  </script>
   <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
   ENDNAV
       if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
                 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&                  ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
          ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {           ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');                  my $escreload=&Apache::lonnet::escape('return:');
Line 420  ENDREGTEXT Line 424  ENDREGTEXT
         } else {          } else {
     my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];      my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
     $requri=&Apache::lonnet::unescape($requri);      $requri=&Apache::lonnet::unescape($requri);
       my $navstatus=&get_nav_status();
     $result = (<<ENDREGTHIS);      $result = (<<ENDREGTHIS);
             
 <script language="JavaScript">  <script language="JavaScript">
Line 437  var swmenu=null; Line 442  var swmenu=null;
           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;
     $navstatus
           $hwkadd            $hwkadd
           $editbutton            $editbutton
     }      }
Line 872  sub utilityfunctions { Line 878  sub utilityfunctions {
         ($ENV{'environment.remote'} eq 'off')) { return ''; }          ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $currenturl=$ENV{'request.noversionuri'};      my $currenturl=$ENV{'request.noversionuri'};
     my $currentsymb=$ENV{'request.symb'};      my $currentsymb=$ENV{'request.symb'};
       my $nav_control=&Apache::lonnavmaps::nav_control_js();
 return (<<ENDUTILITY)  return (<<ENDUTILITY)
   
     var currentURL="$currenturl";      var currentURL="$currenturl";
     var reloadURL="$currenturl";      var reloadURL="$currenturl";
     var currentSymb="$currentsymb";      var currentSymb="$currentsymb";
   
   $nav_control
   
 function go(url) {  function go(url) {
    if (url!='' && url!= null) {     if (url!='' && url!= null) {
        currentURL = null;         currentURL = null;
Line 929  sub serverform { Line 938  sub serverform {
 </form>  </form>
 ENDSERVERFORM  ENDSERVERFORM
 }  }
   
   sub get_nav_status {
       my $navstatus="swmenu.w_loncapanav_flag=";
       if ($ENV{'environment.remotenavmap'} eq 'on') {
    $navstatus.="1";
       } else {
    $navstatus.="-1";
       }
       return $navstatus;
   }
   
 # ================================================ Handler when called directly  # ================================================ Handler when called directly
   
   
Removed from v.1.112  
changed lines
  Added in v.1.114

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