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

version 1.144, 2005/02/07 23:37:45 version 1.145, 2005/02/08 00:01:32
Line 156  ENDMAINMENU Line 156  ENDMAINMENU
 ENDNAV  ENDNAV
     if (      if (
  ($ENV{'request.noversionuri'}=~m[^/(res|public)/] &&   ($ENV{'request.noversionuri'}=~m[^/(res|public)/] &&
  $ENV{'request.symb'} ne '')   $ENV{'request.symb'} eq '')
  ||   ||
  (($ENV{'request.noversionuri'}=~/^\/adm\//) &&   (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
  ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&   ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
Line 302  sub innerregister { Line 302  sub innerregister {
     my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');      my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
 # =============================================================================  # =============================================================================
 # ============================ This is for URLs that actually can be registered  # ============================ This is for URLs that actually can be registered
     if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {      if (($ENV{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges  # -- This applies to homework problems for users with grading privileges
  my $crs='/'.$ENV{'request.course.id'};   my $crs='/'.$ENV{'request.course.id'};
  if ($ENV{'request.course.sec'}) {   if ($ENV{'request.course.sec'}) {
Line 311  sub innerregister { Line 311  sub innerregister {
  $crs=~s/\_/\//g;   $crs=~s/\_/\//g;
   
         my $hwkadd='';          my $hwkadd='';
         if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {          if ($ENV{'request.symb'} ne '' &&
       $ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
     if (&Apache::lonnet::allowed('vgr',$crs)) {      if (&Apache::lonnet::allowed('vgr',$crs)) {
  $hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',   $hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
                        "gocmd('/adm/grades','submission')",                         "gocmd('/adm/grades','submission')",
Line 323  sub innerregister { Line 324  sub innerregister {
                        'Modify user grades for this assessment resource');                         'Modify user grades for this assessment resource');
             }              }
  }   }
  if (&Apache::lonnet::allowed('opa',$crs)) {   if ($ENV{'request.symb'} ne '' &&
       &Apache::lonnet::allowed('opa',$crs)) {
     $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',      $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
      "gocmd('/adm/parmset','set')",       "gocmd('/adm/parmset','set')",
      'Modify deadlines, etc, for this resource');       'Modify deadlines, etc, for this resource');
Line 408  s&7&1&del.gif&delete[_1]&resource[_2]&go Line 410  s&7&1&del.gif&delete[_1]&resource[_2]&go
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document  s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
 ENDMENUITEMS  ENDMENUITEMS
             }              }
         } elsif (defined($ENV{'request.course.id'})) {          } elsif (defined($ENV{'request.course.id'}) && 
    $ENV{'request.symb'} ne '') {
     $menuitems=(<<ENDMENUITEMS);      $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
Line 437  ENDREALRES Line 440  ENDREALRES
                 $buttons.=&clear(@rest);                  $buttons.=&clear(@rest);
             }              }
         }          }
         if ($textual) {   my $addremote=0;
    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } }
           if ($textual && $addremote) {
 # Registered, textual output  # Registered, textual output
     my $inlinebuttons='';      my $inlinebuttons='';
   

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


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