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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.335 and 1.336

version 1.335, 2012/11/30 11:28:51 version 1.336, 2012/12/03 14:47:30
Line 1895  returns: nothing Line 1895  returns: nothing
 sub docs_breadcrumbs {  sub docs_breadcrumbs {
     my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;      my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;
     my ($folderpath,@folders);      my ($folderpath,@folders);
     if ($env{'form.pagepath'}) {      my @folders = split('&',$env{'form.folderpath'});
         @folders = split('&',$env{'form.pagepath'});  
     } else {  
         @folders = split('&',$env{'form.folderpath'});  
     }  
     my $plain='';      my $plain='';
       my $container = 'sequence';
     my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0);      my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0);
     my @docs_crumbs;      my @docs_crumbs;
     while (@folders) {      while (@folders) {
Line 1916  sub docs_breadcrumbs { Line 1913  sub docs_breadcrumbs {
         }          }
         $url .= &escape($folderpath);          $url .= &escape($folderpath);
         my $name=&unescape($foldername);          my $name=&unescape($foldername);
 # each of randompick number, hidden, encrypted, random order are   # each of randompick number, hidden, encrypted, random order, is_page 
 # appended with ":"s to the foldername  # are appended with ":"s to the foldername
         $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;          $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//;
         if ($contenteditor) {           if ($contenteditor) { 
             if ($1 ne '') {              if ($1 ne '') {
                 $randompick=$1;                  $randompick=$1;
Line 1928  sub docs_breadcrumbs { Line 1925  sub docs_breadcrumbs {
             if ($2) { $ishidden=1; }              if ($2) { $ishidden=1; }
             if ($3) { $isencrypted=1; }              if ($3) { $isencrypted=1; }
             if ($4 ne '') { $is_random_order = 1; }              if ($4 ne '') { $is_random_order = 1; }
               if ($5 == 1) {$container = 'page'; }
         }          }
         if ($folder eq 'supplemental') {          if ($folder eq 'supplemental') {
             $name = &mt('Supplemental '.$crstype.' Contents');              $name = &mt('Supplemental '.$crstype.' Contents');
Line 1964  sub docs_breadcrumbs { Line 1962  sub docs_breadcrumbs {
         return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,          return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,
                              $contenteditor),                               $contenteditor),
                              $randompick,$ishidden,$isencrypted,$plain,                               $randompick,$ishidden,$isencrypted,$plain,
                              $is_random_order);                               $is_random_order,$container);
     } else {      } else {
         return \@docs_crumbs;          return \@docs_crumbs;
     }      }
Removed from v.1.335  
changed lines
  Added in v.1.336

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