--- loncom/interface/lonnavmaps.pm 2022/06/11 03:58:58 1.556 +++ loncom/interface/lonnavmaps.pm 2022/06/11 14:51:49 1.558 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.556 2022/06/11 03:58:58 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.558 2022/06/11 14:51:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1425,7 +1425,7 @@ sub render { $condition = 1; } - if (!$env{'form.folderManip'} && !defined($args->{'iterator'})) { + if (!$env{'form.folderManip'} && !defined($args->{'iterator'}) && !$args->{'nocurrloc'}) { # Step 1: Check to see if we have a navmap if (!defined($navmap)) { $navmap = Apache::lonnavmaps::navmap->new(); @@ -1589,9 +1589,6 @@ sub render { '&here='.&escape($here); $text='Open all folders'; } - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } if ($args->{'caller'} eq 'navmapsdisplay') { unless ($args->{'notools'}) { &add_linkitem($args->{'linkitems'},'changefolder', @@ -1615,9 +1612,6 @@ sub render { END - if ($env{'form.register'}) { - $result .= ''; - } if ($args->{'sort'} eq 'discussion') { my $totdisc = 0; my $haveDisc = ''; @@ -1638,16 +1632,22 @@ END } $result.=''; } - if (($args->{'caller'} eq 'navmapsdisplay') && - ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) || - (&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) { + if (($args->{'caller'} eq 'navmapsdisplay') && ($env{'request.course.id'})) { my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - if ($env{'course.'.$env{'request.course.id'}.'.url'} eq + if ($env{'course.'.$env{'request.course.id'}.'.url'} eq "uploaded/$cdom/$cnum/default.sequence") { - &add_linkitem($args->{'linkitems'},'edittoplevel', - "javascript:gocmd('/adm/coursedocs','editdocs');", - 'Content Editor'); + if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) || + (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) { + &add_linkitem($args->{'linkitems'},'edittoplevel', + "javascript:gocmd('/adm/coursedocs','editdocs');", + 'Content Editor'); + } + if ($counter) { + &add_linkitem($args->{'linkitems'},'printout', + "javascript:gopost('/adm/printout','/adm/navmaps');", + 'Prepare a printable document'); + } } } @@ -2094,7 +2094,7 @@ sub show_linkitems_toolbar { $result .= ''."\n". '