--- loncom/interface/lonnavdisplay.pm	2011/12/28 04:11:05	1.21
+++ loncom/interface/lonnavdisplay.pm	2015/03/01 20:47:54	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Navigate Maps Handler
+# Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.21 2011/12/28 04:11:05 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.30 2015/03/01 20:47:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 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();
@@ -38,7 +38,6 @@ use Apache::lonhtmlcommon();
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::londocs();
-use Time::HiRes qw( gettimeofday tv_interval );
 
 sub handler {
     my $r = shift;
@@ -47,27 +46,20 @@ 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);
+    if ($redirect) {
         &Apache::loncommon::content_type($r,'text/html');
+        $r->header_out(Location => $url);
+        return REDIRECT;
     }
-    &Apache::loncommon::no_cache($r);
-
-    my %toplinkitems=();
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -78,6 +70,9 @@ 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
@@ -100,7 +95,11 @@ sub real_handler {
         $start_page = &Apache::loncommon::start_page($title,undef,$args);
     }
     $r->print($start_page.
-              '<script type="text/javascript">window.focus();</script>');
+              '<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
+              'window.focus();'."\n".
+              '// ]]>'."\n".
+              '</script>');
     &startContentScreen($r,'navmaps');
     $r->rflush();
 
@@ -113,6 +112,7 @@ sub real_handler {
         return OK;
     }
 
+    my %toplinkitems=();
     my @resources = $navmap->retrieveResources();
     my $sequenceCount = 0;
     my $problemCount = 0;
@@ -246,7 +246,7 @@ sub real_handler {
                     <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="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'}.'" />
@@ -279,8 +279,6 @@ 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();
@@ -292,8 +290,17 @@ 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;'.&mt('Main Content').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
-    $r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
+    $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");