--- loncom/interface/lonnavdisplay.pm	2010/03/16 19:55:49	1.15
+++ loncom/interface/lonnavdisplay.pm	2017/06/26 01:56:58	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Navigate Maps Handler
+# Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.15 2010/03/16 19:55:49 droeschl Exp $
+# $Id: lonnavdisplay.pm,v 1.34 2017/06/26 01:56:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,14 +30,15 @@
 package Apache::lonnavdisplay;
 
 use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http REDIRECT);
 use Apache::lonmenu();
 use Apache::loncommon();
 use Apache::lonnavmaps();
 use Apache::lonhtmlcommon();
 use Apache::lonnet;
 use Apache::lonlocal;
-use Time::HiRes qw( gettimeofday tv_interval );
+use Apache::londocs();
+use Apache::lonuserstate;
 
 sub handler {
     my $r = shift;
@@ -46,29 +47,49 @@ sub handler {
 
 sub real_handler {
     my $r = shift;
-    #my $t0=[&gettimeofday()];
     # Handle header-only request
     if ($r->header_only) {
-        if ($env{'browser.mathml'}) {
-            &Apache::loncommon::content_type($r,'text/xml');
-        } else {
-            &Apache::loncommon::content_type($r,'text/html');
-        }
+        &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         return OK;
     }
 
-    # Send header, don't cache this page
-    if ($env{'browser.mathml'}) {
-        &Apache::loncommon::content_type($r,'text/xml');
-    } else {
+    # 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;
     }
-    &Apache::loncommon::no_cache($r);
 
-    my %toplinkitems=();
-    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','',
-				      "Select Action");
+    # 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;
+        }
+    }
+
+    my $course_type = &Apache::loncommon::course_type();
+    if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { 
+        my $furl = &Apache::lonpageflip::first_accessible_resource();
+        &Apache::loncommon::content_type($r,'text/html');
+        $r->header_out(Location => $furl);
+        return REDIRECT;
+    }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -79,22 +100,37 @@ sub real_handler {
         $env{'user.reinit'} = 1;
         return HTTP_NOT_ACCEPTABLE;
     }
+
+    # Send header, don't cache this page
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
 # ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
     
 # ----------------------------------------------------- Force menu registration
     # Header
     my $course_type = &Apache::loncommon::course_type();
     my $title = $course_type . ' Contents';
-    my $breadcrumb_text = mt($course_type . ' Contents');
-    $r->print(&Apache::loncommon::start_page($title, '',
-                         { 'force_register'  => $env{'form.register'},
-                           'bread_crumbs'    => [{text => $breadcrumb_text }],}));
-#SD
-    $r->print('<script type="text/javascript">window.focus();</script>');
-     
+    my ($start_page,$args);
+    if ($env{'form.register'}) {
+        $args = {'force_register' => $env{'form.register'}};
+        $start_page = &Apache::loncommon::start_page($title,undef,$args);
+    } else {
+        my $brcrum = [{href => '/adm/navmaps',
+                       text => &mt($course_type . ' Contents'),
+                       no_mt => 1},
+                     ];
+        $args = {'bread_crumbs' => $brcrum};
+        $start_page = &Apache::loncommon::start_page($title,undef,$args);
+    }
+    $r->print($start_page.
+              '<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
+              'window.focus();'."\n".
+              '// ]]>'."\n".
+              '</script>');
+    &startContentScreen($r,'navmaps');
     $r->rflush();
 
     # Check that it's defined
@@ -106,21 +142,32 @@ sub real_handler {
         return OK;
     }
 
-    # See if there's only one map in the top-level, if we don't
-    # already have a filter... if so, automatically display it
-    # (older code; should use retrieveResources)
-    if ($ENV{QUERY_STRING} !~ /filter/) {
-        my $iterator = $navmap->getIterator(undef, undef, undef, 0);
-        my $curRes;
-        my $sequenceCount = 0;
-        my $sequenceId;
-        while ($curRes = $iterator->next()) {
-            if (ref($curRes) && $curRes->is_sequence()) {
+    my %toplinkitems=();
+    my @resources = $navmap->retrieveResources();
+    my $sequenceCount = 0;
+    my $problemCount = 0;
+    my $notaprobCount = 0;
+    my $sequenceId;
+    my $notools;
+    foreach my $curRes (@resources) {
+        if (ref($curRes)) {
+            if ($curRes->is_sequence()) {
                 $sequenceCount++;
                 $sequenceId = $curRes->map_pc();
+            } elsif ($curRes->is_problem()) {
+                $problemCount ++;
+            } else {
+                $notaprobCount ++;
             }
         }
-        
+    }
+    if (($sequenceCount == 1) && (!$problemCount) && ($notaprobCount <= 1)) {
+        $notools = 1;
+    }
+
+    # If there's only one map in the top-level and we don't
+    # already have a filter, automatically display it
+    if ($ENV{QUERY_STRING} !~ /filter/) {
         if ($sequenceCount == 1) {
             # The automatic iterator creation in the render call 
             # will pick this up. We know the condition because
@@ -172,9 +219,15 @@ sub real_handler {
                      ."</span>");
         }
     } else {
-	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
-					  'location.href="navmaps?jumpToFirstHomework"',
-					  "Show my first due problem");
+        my $link = 'navmaps?jumpToFirstHomework';
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'}; 
+        }
+        unless ($notools) {
+	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
+					      'location.href="'.$link.'"',
+					      "Show my first due problem");
+        }
     }
 
     my $suppressEmptySequences = 0;
@@ -189,33 +242,47 @@ sub real_handler {
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
+        my $link = 'navmaps?sort='.$env{'form.sort'};
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'};
+        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
-					  'location.href="navmaps?sort='.$env{'form.sort'}.'"',
-					  "Show everything");
+					  'location.href="'.$link.'"',
+					  'Show everything');
         $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
         $env{'form.filter'} = '';
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
-					  'location.href="navmaps?sort='.$env{'form.sort'}.
-					  '&showOnlyHomework=1"',
-					  "Show only uncompleted problems");
+        my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'};
+        }
+        unless ($notools) {
+	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
+					      'location.href="'.$link.'"',
+					      'Show only uncompleted problems');
+        }
     }
 
     my %selected=($env{'form.sort'} => ' selected="selected"');
-    my $sort_html=("<form name=\"sortForm\">
-                 <span class=\"LC_nobreak\">
-                    <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
-                    ".&mt('Sort by:')."
-                    <select name=\"sort\" onChange=\"document.sortForm.submit()\">
-                       <option value=\"default\"$selected{'default'}>".&mt('Default')."</option>
-                       <option value=\"title\"$selected{'title'}  >".&mt('Title')."</option>
-                       <option value=\"duedate\"$selected{'duedate'}>".&mt('Duedate')."</option>
-                       <option value=\"discussion\"$selected{'discussion'}>".&mt('Has New Discussion')."</option>
+    my $sort_html;
+    unless ($notools) {
+        $sort_html=(
+              '<form name="sortForm" action="">
+                 <span class="LC_nobreak">
+                    <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
+                    '.&mt('Sort by:').'
+                    <select name="sort" onchange="document.sortForm.submit()">
+                       <option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>
+                       <option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>
+                       <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>
+                       <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
                     </select>
+                    <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>
-               </form>");
+               </form>');
+    }
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $env{'form.sort'},
@@ -228,7 +295,9 @@ sub real_handler {
 		       'sort_html'=> $sort_html,
                        'r' => $r,
                        'caller' => 'navmapsdisplay',
-                       'linkitems' => \%toplinkitems};
+                       'linkitems' => \%toplinkitems,
+                       'notools' => $notools};
+                      
     my $render = &Apache::lonnavmaps::render($renderArgs);
 
     # If no resources were printed, print a reassuring message so the
@@ -240,15 +309,39 @@ sub real_handler {
             $r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");
         }
     }
-    #my $td=&tv_interval($t0);
-    #$r->print("<br />$td");
-
+    &endContentScreen($r);
     $r->print(&Apache::loncommon::end_page());
     $r->rflush();
 
     return OK;
 }
 
+sub startContentScreen {
+    my ($r,$mode)=@_;
+
+    $r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
+    $r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main Content').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+    my ($suppcount,$errors);
+    unless ($allowed) {
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        ($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
+    }
+    if ($allowed || $suppcount) {
+        $r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
+    }
+    $r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    $r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    $r->print("\n".'</ul>'."\n");
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+}
+
+sub endContentScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>');
+}
+
 1;
 __END__