Diff for /loncom/interface/lonmenu.pm between versions 1.119 and 1.122

version 1.119, 2004/10/28 18:12:48 version 1.122, 2004/11/02 21:02:01
Line 43  use Apache::lonnet(); Line 43  use Apache::lonnet();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonnavmaps();  
 use Apache::lonlocal;  use Apache::lonlocal;
   
 use vars qw(@desklines $readdesk);  use vars qw(@desklines $readdesk);
Line 226  sub innerregister { Line 225  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 244  sub innerregister { Line 251  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 348  sub innerregister { Line 387  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 359  sub innerregister { Line 398  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 370  s&8&3&prt.gif&prepare[_1]&printout[_1]&g Line 421  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 899  sub footer { Line 951  sub footer {
   
 }  }
   
   sub nav_control_js {
       my $nav=($ENV{'environment.remotenavmap'} eq 'on');
       return (<<NAVCONTROL);
       var w_loncapanav_flag="$nav";
   
   
   function gonav(url) {
      if (w_loncapanav_flag != 1) {
         gopost(url,'');
      }  else {
         navwindow=window.open(url,
                     "loncapanav","height=600,width=400,scrollbars=1"); 
      }
   }
   NAVCONTROL
   }
   
 sub utilityfunctions {  sub utilityfunctions {
     unless (($ENV{'browser.interface'} eq 'textual')  ||      unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($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();      my $nav_control=&nav_control_js();
 return (<<ENDUTILITY)  return (<<ENDUTILITY)
   
     var currentURL="$currenturl";      var currentURL="$currenturl";
Line 943  function gocmd(url,cmd) { Line 1012  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 965  sub serverform { Line 1048  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.119  
changed lines
  Added in v.1.122


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