--- loncom/interface/lonmenu.pm 2017/09/04 19:17:02 1.476 +++ loncom/interface/lonmenu.pm 2017/09/10 00:11:27 1.479 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.476 2017/09/04 19:17:02 raeburn Exp $ +# $Id: lonmenu.pm,v 1.479 2017/09/10 00:11:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -665,10 +665,11 @@ sub innerregister { my $maptitle = &Apache::lonnet::gettitle($mapurl); my $restitle = &Apache::lonnet::gettitle($symb); my (@crumbs,@mapcrumbs); - if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '')) { + if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') && + (!(($crstype eq 'Placement') && !$env{'request.role.adv'}))) { $navmap = Apache::lonnavmaps::navmap->new(); if (ref($navmap)) { - @mapcrumbs = $navmap->recursed_crumbs($mapurl); + @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle); } } unless (($forcereg) && @@ -681,7 +682,7 @@ sub innerregister { if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { if (@mapcrumbs) { push(@crumbs,@mapcrumbs); - } else { + } elsif (!(($crstype eq 'Placement') && (!$env{'request.role.adv'}))) { push(@crumbs, {text => '...', no_mt => 1}); } @@ -692,8 +693,9 @@ sub innerregister { ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { push @crumbs, {text => $maptitle, no_mt => 1, href => $mapurl}; } - - push @crumbs, {text => $restitle, no_mt => 1} if $restitle; + if ($restitle && !@mapcrumbs) { + push(@crumbs,{text => $restitle, no_mt => 1}); + } my @tools; if ($env{'request.filename'} =~ /\.page$/) { my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); @@ -1145,7 +1147,8 @@ sub prepare_functions { # if (($perms{'mdc'}) && (($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) || - ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}))) { + ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) || + (($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) { if ($resurl =~ m{^/}) { $cfile = $resurl; } else { @@ -1157,9 +1160,17 @@ sub prepare_functions { } else { $forceedit = 1; } - $editbutton = &get_editbutton($cfile,$home,$switchserver, - $forceedit,$forceview,$forcereg, - $hostname); + if ($cfile =~ m{^/uploaded/$cdom/$cnum/default_\d+\.sequence$}) { + my $text = 'Edit Folder'; + &switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]', + "gocmd('/adm/coursedocs','direct')", + 'Folder/Page Content'); + $editbutton = 1; + } else { + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg, + $hostname); + } } elsif (($resurl eq '/adm/extresedit') && (($env{'form.symb'}) || ($env{'form.folderpath'}))) { ($cfile,$home,$switchserver,$forceedit,$forceview) =