Diff for /loncom/interface/lonmenu.pm between versions 1.115 and 1.121

version 1.115, 2004/08/27 17:03:45 version 1.121, 2004/11/01 04:31:03
Line 69  sub menubuttons { Line 69  sub menubuttons {
     my $forcereg=shift;      my $forcereg=shift;
     my $target  =shift;      my $target  =shift;
     my $registration=shift;      my $registration=shift;
       
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['inhibitmenu']);      ['inhibitmenu']);
     if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }      if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
Line 97  ENDNAV Line 96  ENDNAV
 ENDRELOAD  ENDRELOAD
             }              }
         }          }
           my $utility=&utilityfunctions();
  my $output=(<<ENDMAINMENU);   my $output=(<<ENDMAINMENU);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
   $utility
 </script>  </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>  <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />  $reloadlink $navmaps<br />
Line 134  ENDMAINMENU Line 135  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'}) {
     my $navcontrol=&Apache::lonnavmaps::nav_control_js();             $navmaps=(<<ENDNAV);
     $navmaps=(<<ENDNAV);  
 <td bgcolor="$tabbg">  <td bgcolor="$tabbg">
 <script type="text/javascript">  
 $navcontrol  
 </script>  
 <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>  <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV  ENDNAV
     if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&      if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
Line 156  ENDRELOAD Line 153  ENDRELOAD
         if ($registration) {          if ($registration) {
            $reg=&innerregister($forcereg,$target);             $reg=&innerregister($forcereg,$target);
         }          }
    my $utility=&utilityfunctions();
  return (<<ENDINLINEMENU);   return (<<ENDINLINEMENU);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
   $utility
 </script>  </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">  <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>  <tr>
Line 227  sub innerregister { Line 226  sub innerregister {
     my $forcereg=shift;      my $forcereg=shift;
     my $target = shift;      my $target = shift;
     my $result = '';      my $result = '';
       my ($uname,$thisdisfn);
       my $const_space = 0;
       if ($ENV{'request.filename'} =~ /^\/home\/([^\/]+)\/public_html\/(.*)/) {
           $const_space = 1;
           $uname = $1;
           $thisdisfn = $2;
       }
   
     if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }      if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
   
     $Apache::lonxml::registered=1;      $Apache::lonxml::registered=1;
Line 245  sub innerregister { Line 252  sub innerregister {
     if ($noremote) {      if ($noremote) {
  $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';   $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }      }
       if ($textual && $const_space) {
           my $formaction='/priv/'.$uname.'/'.$thisdisfn;
           $formaction=~s/\/+/\//g;
           my $titleinfo = '<form name="dirs" method="post" action="'.$formaction
                 .'" target="_top">'.
           &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','','-1').
           &Apache::lonhtmlcommon::select_recent('construct','recent',
                    'this.form.action=this.form.recent.value;this.form.submit()').
                 '</form>';
           &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
           $newmail .= &constspaceform();
   # role and realm
           my ($role,$realm) = &Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
           unless ($realm) { $realm='&nbsp;'; }
           $newmail .= <<END;
   <table width="100%" cellspacing="0" border="0" cellpadding="0">
   <tr>
   <td>
   $titleinfo
   </td>
   <td align="right">
   <font size="2" face="Arial, Helvetica, sans-serif">
       $ENV{'environment.firstname'}
       $ENV{'environment.middlename'}
       $ENV{'environment.lastname'}
       $ENV{'environment.generation'}
       </font>&nbsp;<br />
       <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
   </td></tr>
   </table>
   END
       }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {      if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
  my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($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'};
Line 349  sub innerregister { Line 388  sub innerregister {
                 }                  }
             }                      }        
             # Finally, turn the button on or off              # Finally, turn the button on or off
             if ($cfile) {              if ($cfile && !$const_space) {
                 $editbutton=&switch                  $editbutton=&switch
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',                      ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");                       "go('".$cfile."');","Edit this resource");
Line 360  sub innerregister { Line 399  sub innerregister {
         ###          ###
         ###          ###
 # Prepare the rest of the buttons  # Prepare the rest of the buttons
  my $menuitems=(<<ENDMENUITEMS);          my $menuitems;
           if ($const_space) {
               my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
               $currdir =~ s#[^/]+$##;
               $menuitems=(<<ENDMENUITEMS);
   s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory
   s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive old version
   s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource
   s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource
   s&7&2&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
   ENDMENUITEMS
           } else {
       $menuitems=(<<ENDMENUITEMS);
 c&3&1  c&3&1
 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1  s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
 s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3  s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
Line 371  s&8&3&prt.gif&prepare[_1]&printout[_1]&g Line 422  s&8&3&prt.gif&prepare[_1]&printout[_1]&g
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2  s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2  s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS  ENDMENUITEMS
         unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {              unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
     $menuitems.=(<<ENDREALRES);          $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information  s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource  s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource  s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES  ENDREALRES
  }      }
           }
         my $buttons='';          my $buttons='';
         foreach (split(/\n/,$menuitems)) {          foreach (split(/\n/,$menuitems)) {
     my ($command,@rest)=split(/\&/,$_);      my ($command,@rest)=split(/\&/,$_);
Line 389  ENDREALRES Line 441  ENDREALRES
         }          }
         if ($textual) {          if ($textual) {
 # Registered, textual output  # Registered, textual output
             my $utility=&utilityfunctions();  
             my $form=&serverform();              my $form=&serverform();
     my $inlinebuttons='';      my $inlinebuttons='';
   
Line 408  ENDINLINE Line 459  ENDINLINE
     $result =(<<ENDREGTEXT);      $result =(<<ENDREGTEXT);
 <script>  <script>
 // BEGIN LON-CAPA Internal  // BEGIN LON-CAPA Internal
 $utility  
 </script>  </script>
 $timesync  $timesync
 $newmail  $newmail
Line 535  sub startupremote { Line 585  sub startupremote {
 #  #
     my $configmenu=&rawconfig();      my $configmenu=&rawconfig();
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);      my $esclowerurl=&Apache::lonnet::escape($lowerurl);
       my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);      return(<<ENDREMOTESTARTUP);
 <script>  <script>
   var timestart;
 function wheelswitch() {  function wheelswitch() {
       if (typeof(document.wheel) != 'undefined') {
    if (typeof(document.wheel.spin) != 'undefined') {
       var date=new Date();
       var waited=Math.round(30-((date.getTime()-timestart)/1000));
       document.wheel.spin.value=$message;
    }
       }
    if (window.status=='|') {      if (window.status=='|') { 
       window.status='/';         window.status='/'; 
    } else {     } else {
Line 576  function wait() { Line 633  function wait() {
 function main() {  function main() {
    canceltim=setTimeout('tim=1;',30000);     canceltim=setTimeout('tim=1;',30000);
    window.status='-';     window.status='-';
      var date=new Date();
      timestart=date.getTime();
    wait();     wait();
 }  }
   
Line 601  sub maincall() { Line 660  sub maincall() {
 </script>  </script>
 ENDMAINCALL  ENDMAINCALL
 }  }
   
   sub load_remote_msg {
       my ($lowerurl)=@_;
   
       if (($ENV{'browser.interface'} eq 'textual') ||
           ($ENV{'environment.remote'} eq 'off')) { return ''; }
   
       my $esclowerurl=&Apache::lonnet::escape($lowerurl);
       my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
       "/adm/remote?action=collapse?url=$esclowerurl");
       return(<<ENDREMOTEFORM);
   <p>
   <form name="wheel">
   <input name="spin" type="text" size="60" />
   </form>
   </p>
   <p>$link</p>
   ENDREMOTEFORM
   }
 # ================================================================= Reopen menu  # ================================================================= Reopen menu
   
 sub reopenmenu {  sub reopenmenu {
Line 918  function gocmd(url,cmd) { Line 996  function gocmd(url,cmd) {
    }     }
 }  }
   
   function gocstr(url,filename) {
       if (url == '/adm/cfile?action=delete') {
           this.document.cstrdelete.filename.value = filename
           this.document.cstrdelete.submit();
           return;
       }
       if (url !='') {
           this.document.constspace.filename.value = filename;
           this.document.constspace.action = url;
           this.document.constspace.submit();
       }
   }
   
   
 function catalog_info() {  function catalog_info() {
    loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');     loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }  }
Line 940  sub serverform { Line 1032  sub serverform {
 ENDSERVERFORM  ENDSERVERFORM
 }  }
   
   sub constspaceform {
       return(<<ENDCONSTSPACEFORM);
   <form name="constspace" action="/adm/logout" method="post" target="_top">
   <input type="hidden" name="filename" value="" />
   </form>
   <form name="cstrdelete" action="/adm/cfile" method="post" target="_top">
   <input type="hidden" name="action" value="delete" /> 
   <input type="hidden" name="filename" value="" />
   </form>
   ENDCONSTSPACEFORM
   }
   
   
 sub get_nav_status {  sub get_nav_status {
     my $navstatus="swmenu.w_loncapanav_flag=";      my $navstatus="swmenu.w_loncapanav_flag=";
     if ($ENV{'environment.remotenavmap'} eq 'on') {      if ($ENV{'environment.remotenavmap'} eq 'on') {
Line 981  sub handler { Line 1086  sub handler {
  $ENV{'browser.interface'}='faketextual';   $ENV{'browser.interface'}='faketextual';
  $ENV{'environment.remote'}='off';   $ENV{'environment.remote'}='off';
     }      }
     my $utility=&utilityfunctions();  
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
 <html><head>  <html><head>
 <title>LON-CAPA Main Menu</title>  <title>LON-CAPA Main Menu</title>
 <script>  
 $utility  
 </script>  
 </head>  </head>
 $bodytag  $bodytag
 ENDHEADER  ENDHEADER

Removed from v.1.115  
changed lines
  Added in v.1.121


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