--- loncom/interface/lonhtmlcommon.pm 2012/11/30 11:28:51 1.335 +++ loncom/interface/lonhtmlcommon.pm 2012/12/03 14:47:30 1.336 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.335 2012/11/30 11:28:51 bisitz Exp $ +# $Id: lonhtmlcommon.pm,v 1.336 2012/12/03 14:47:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1895,12 +1895,9 @@ returns: nothing sub docs_breadcrumbs { my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_; my ($folderpath,@folders); - if ($env{'form.pagepath'}) { - @folders = split('&',$env{'form.pagepath'}); - } else { - @folders = split('&',$env{'form.folderpath'}); - } + my @folders = split('&',$env{'form.folderpath'}); my $plain=''; + my $container = 'sequence'; my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0); my @docs_crumbs; while (@folders) { @@ -1916,9 +1913,9 @@ sub docs_breadcrumbs { } $url .= &escape($folderpath); my $name=&unescape($foldername); -# each of randompick number, hidden, encrypted, random order are -# appended with ":"s to the foldername - $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//; +# each of randompick number, hidden, encrypted, random order, is_page +# are appended with ":"s to the foldername + $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//; if ($contenteditor) { if ($1 ne '') { $randompick=$1; @@ -1928,6 +1925,7 @@ sub docs_breadcrumbs { if ($2) { $ishidden=1; } if ($3) { $isencrypted=1; } if ($4 ne '') { $is_random_order = 1; } + if ($5 == 1) {$container = 'page'; } } if ($folder eq 'supplemental') { $name = &mt('Supplemental '.$crstype.' Contents'); @@ -1964,7 +1962,7 @@ sub docs_breadcrumbs { return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef, $contenteditor), $randompick,$ishidden,$isencrypted,$plain, - $is_random_order); + $is_random_order,$container); } else { return \@docs_crumbs; }