--- rat/lonsequence.pm	2012/12/19 05:21:13	1.43
+++ rat/lonsequence.pm	2017/08/21 21:30:05	1.46
@@ -2,7 +2,7 @@
 #
 # Sequence Handler
 #
-# $Id: lonsequence.pm,v 1.43 2012/12/19 05:21:13 raeburn Exp $
+# $Id: lonsequence.pm,v 1.46 2017/08/21 21:30:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,8 @@ use Apache::lonpageflip();
 use Apache::loncommon();
 use Apache::groupsort();
 use Apache::lonlocal;
+use Apache::lonnavmaps();
+use Apache::lonenc();
 use HTML::Entities();
 
 my %selhash;
@@ -133,13 +135,13 @@ ENDSELECT
                 .'</p><br />');
     }
     my $idx=0;
-    foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
-	if (defined($_)) {
+    foreach my $entry (&attemptread(&Apache::lonnet::filelocation('',$url))) {
+	if (defined($entry)) {
             $idx++;
             if ($successtied) { 
 		$r->print('<form name="form'.$idx.'">');
             }
-	    my ($title,$url)=split(/\:/,$_);
+	    my ($title,$url)=split(/\:/,$entry);
 	    $title = &LONCAPA::map::qtescape($title);
 	    unless ($title) { $title=(split(/\//,$url))[-1] };
             my $enc_title = &HTML::Entities::encode($title,'\'"<>&');
@@ -184,12 +186,12 @@ ENDCHECKBOX
 
 # ----------------------------------------------------------- Clean out selhash
 sub start_fresh_session {
-    foreach (keys %selhash) {
-	if ($_ =~ /^pre_/) {
-	    delete $selhash{$_};
+    foreach my $item (keys(%selhash)) {
+	if ($item =~ /^pre_/) {
+	    delete $selhash{$item};
 	}
-	if ($_ =~ /^store/) {
-	    delete $selhash{$_};
+	if ($item =~ /^store/) {
+	    delete $selhash{$item};
 	}
     }
 }
@@ -205,13 +207,105 @@ sub handler {
       $r->send_http_header;
       return OK;
    }
- 
+
+   my $requrl=$r->uri;
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                          ['forceselect','launch']);
+                                          ['forceselect','launch','navmap']);
+
+   if (($env{'request.course.fn'}) && ($env{'form.navmap'}) && ($env{'request.course.id'})) {
+       my $crstype = &Apache::loncommon::course_type();
+       unless (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
+
+           # Check for critical messages and redirect if present.
+           my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');
+           if ($redirect) {
+               &Apache::loncommon::content_type($r,'text/html');
+               $r->header_out(Location => $url);
+               return REDIRECT;
+           }
+
+           # Check if course needs to be re-initialized
+           my $loncaparev = $r->dir_config('lonVersion');
+           my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+
+           if ($result eq 'switch') {
+               &Apache::loncommon::content_type($r,'text/html');
+               $r->send_http_header;
+               $r->print(&Apache::loncommon::check_release_result(@reinit));
+               return OK;
+           } elsif ($result eq 'update') {
+               my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+               my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+               my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+               if ($ferr) {
+                   my $requrl = $r->uri;
+                   $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
+                   $env{'user.reinit'} = 1;
+                   return HTTP_NOT_ACCEPTABLE;
+               }
+           }
+
+           # Create the nav map
+           my $navmap = Apache::lonnavmaps::navmap->new();
+
+           if (ref($navmap)) {
+               # renderer call
+               if (&Apache::lonnet::is_on_map($requrl)) {
+                   my $mapurl = &Apache::lonnet::declutter($requrl);
+                   my @crumbs = ({text  => $crstype.' Contents',
+                                  href  => "javascript:gopost('/adm/navmaps','')"});
+                   my $res = $navmap->getResourceByUrl($mapurl);
+                   if (ref($res)) {
+                       my ($parent) = &Apache::lonnet::decode_symb($res->symb());
+                       if ($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
+                           my @mapcrumbs = $navmap->recursed_crumbs($parent);
+                           if (@mapcrumbs) {
+                               push(@crumbs,@mapcrumbs);
+                           } else {
+                               push(@crumbs,{text  => '...',
+                                             no_mt => 1});
+                           }
+                       }
+                   }
+                   my $maptitle = &Apache::lonnet::gettitle($mapurl);
+                   push(@crumbs,{text => $maptitle, no_mt => 1});
+                   my $args = {'bread_crumbs' => \@crumbs,
+                               'bread_crumbs_nomenu' => 1};
+                   &Apache::loncommon::content_type($r,'text/html');
+                   $r->send_http_header;
+
+                   $r->print(&Apache::loncommon::start_page($maptitle,undef,$args));
+
+                   my $renderArgs = { 'cols'                    => [0,1,2,3],
+                                      'url'                     => $mapurl,
+                                      'navmap'                  => $navmap,
+                                      'suppressNavmap'          => 1,
+                                      'suppressEmptySequences'  => 1,
+                                      'filterFunc'              => undef,
+                                      'resource_no_folder_link' => 1,
+                                      'r'                       => $r,
+                                      'caller'                  => 'sequence',
+                                      'notools'                 => 1,
+                                      'iterator_map'            => $mapurl,
+                                    };
+
+                   my $render = &Apache::lonnavmaps::render($renderArgs);
+
+                   # If no resources were found let the user know.
+                   if ($renderArgs->{'counter'} == 0) {
+                       $r->print("<p><span class=\"LC_info\">".
+                                 &mt("This folder is empty.")."</span></p>");
+                   }
+                   $r->print(&Apache::loncommon::end_page());
+                   $r->rflush();
+                   return OK;
+               }
+           }
+       }
+   }
 
    my %hash;
    my %bighash;
-   my $requrl=$r->uri;
 
    $successtied=0;
 # ------------------------------------------------------------ Tie symb db file
@@ -305,8 +399,11 @@ sub handler {
            my %lt =&Apache::lonlocal::texthash(
                    'nere' => 'Next resource could not be displayed',
                    'goba' => 'Go Back',
-                   'nacc' => 'Navigate Course Content',
+                   'nacc' => 'Course Contents',
                           );
+           if (&Apache::loncommon::course_type() eq 'Community') {
+               $lt{'nav'} = &mt('Community Contents');
+           }
            my $warnmsg;
            if ($arrow_dir eq 'forward') {
                $warnmsg = &mt('As all folders and sequences '