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

Diff for /loncom/interface/lonmenu.pm between versions 1.382 and 1.383

version 1.382, 2012/07/05 19:22:47 version 1.383, 2012/08/03 01:23:38
Line 247  sub primary_menu { Line 247  sub primary_menu {
             my @primsub;              my @primsub;
             if (ref($primary_submenu{$title}) eq 'ARRAY') {              if (ref($primary_submenu{$title}) eq 'ARRAY') {
                 foreach my $item (@{$primary_submenu{$title}}) {                  foreach my $item (@{$primary_submenu{$title}}) {
                     next if (($item->[2] eq 'wishlist') &&                      next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'}));
                              ((!&Apache::lonnet::allowed('bre',"/res/$env{'user.domain'}/")) &&  
                               (!&Apache::lonnet::allowed('bro',"/res/$env{'user.domain'}/"))));  
                     next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));                      next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));
                     next if ((($item->[2] eq 'portfolio') ||                      next if ((($item->[2] eq 'portfolio') ||
                              ($item->[2] eq 'blog')) &&                               ($item->[2] eq 'blog')) &&
Line 663  sub innerregister { Line 661  sub innerregister {
         ###          ###
         ###          ###
 # Prepare the rest of the buttons  # Prepare the rest of the buttons
         my $menuitems;          my ($menuitems,$got_prt,$got_wishlist);
         if ($const_space) {          if ($const_space) {
 #  #
 # We are in construction space  # We are in construction space
Line 699  ENDMENUITEMS Line 697  ENDMENUITEMS
         } elsif ( defined($env{'request.course.id'}) &&           } elsif ( defined($env{'request.course.id'}) && 
  $env{'request.symb'} ne '' ) {   $env{'request.symb'} ne '' ) {
 #  #
 # We are in a course and looking at a registred URL  # We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab  # Should probably be in mydesk.tab
 #  #
     $menuitems=(<<ENDMENUITEMS);      $menuitems=(<<ENDMENUITEMS);
Line 711  c&8&1 Line 709  c&8&1
 c&8&2  c&8&2
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document  s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS  ENDMENUITEMS
             if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F' && $env{'request.uri'} =~ /^\/res/) {              $got_prt = 1;
               if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
                   && (!$env{'request.enc'})) {
                 # wishlist is only available for users with access to resource-pool                  # wishlist is only available for users with access to resource-pool
                 # and links can only be set for resources within the resource-pool                  # and links can only be set for resources within the resource-pool
                 $menuitems .= (<<ENDMENUITEMS);                  $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1  s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS  ENDMENUITEMS
                   $got_wishlist = 1;
             }              }
   
 my $currentURL = &Apache::loncommon::get_symb();  my $currentURL = &Apache::loncommon::get_symb();
Line 748  ENDREALRES Line 749  ENDREALRES
     }      }
         }          }
  if ($env{'request.uri'} =~ /^\/res/) {   if ($env{'request.uri'} =~ /^\/res/) {
     $menuitems .= (<<ENDMENUITEMS);              unless ($got_prt) {
           $menuitems .= (<<ENDMENUITEMS);
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document  s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS  ENDMENUITEMS
             if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F') {                  $gotprt = 1;
                 # wishlist is only available for users with access to resource-pool              }
                 $menuitems .= (<<ENDMENUITEMS);              unless ($got_wishlist) {
                   if (($env{'user.adv'}) && (!$env{'request.enc'})) {
                       # wishlist is only available for users with access to resource-pool
                       $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1  s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS  ENDMENUITEMS
             }                      $got_wishlist = 1;
  }                  }
       }
           }
         my $buttons='';          my $buttons='';
         foreach (split(/\n/,$menuitems)) {          foreach (split(/\n/,$menuitems)) {
     my ($command,@rest)=split(/\&/,$_);      my ($command,@rest)=split(/\&/,$_);
Removed from v.1.382  
changed lines
  Added in v.1.383

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