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

version 1.120, 2004/10/29 18:40:40 version 1.121, 2004/11/01 04:31:03
Line 255  sub innerregister { Line 255  sub innerregister {
     if ($textual && $const_space) {      if ($textual && $const_space) {
         my $formaction='/priv/'.$uname.'/'.$thisdisfn;          my $formaction='/priv/'.$uname.'/'.$thisdisfn;
         $formaction=~s/\/+/\//g;          $formaction=~s/\/+/\//g;
         $newmail .= ('<form name="dirs" method="post" action="'.$formaction          my $titleinfo = '<form name="dirs" method="post" action="'.$formaction
               .'" target="_top">'.                .'" target="_top">'.
         &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','','-1').          &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','','-1').
         &Apache::lonhtmlcommon::select_recent('construct','recent',          &Apache::lonhtmlcommon::select_recent('construct','recent',
                  'this.form.action=this.form.recent.value;this.form.submit()').                   'this.form.action=this.form.recent.value;this.form.submit()').
               '</form>');                '</form>';
         &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);          &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'});
Line 380  sub innerregister { Line 401  sub innerregister {
 # Prepare the rest of the buttons  # Prepare the rest of the buttons
         my $menuitems;          my $menuitems;
         if ($const_space) {          if ($const_space) {
             my $dir_catalog = '/priv/'.$uname.'/'.$thisdisfn.'/default.meta';              my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
               $currdir =~ s#[^/]+$##;
             $menuitems=(<<ENDMENUITEMS);              $menuitems=(<<ENDMENUITEMS);
 s&2&1&mcrs.gif&list[_1]&dir[_1]&gopost('/adm/pubdir',currentURL)&List current directory  s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory
 s&2&3&mcrs.gif&retrieve[_1]&version[_1]&gopost('/adm/retrieve',currentURL)&Retreive old version  s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive old version
 s&6&1&mcrs.gif&publish[_1]&resource[_1]&gopost('/adm/publish',currentURL)&Publish this resource  s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource
 s&6&3&mcrs.gif&delete[_1]&resource[_2]&gopost('/adm/cfile?action=delete',currentURL)&Delete this resource  s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource
 s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document  s&7&2&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
 ENDMENUITEMS  ENDMENUITEMS
         } else {          } else {
     $menuitems=(<<ENDMENUITEMS);      $menuitems=(<<ENDMENUITEMS);
Line 974  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 996  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') {

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


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