--- loncom/interface/lonnavdisplay.pm	2014/05/22 12:25:32	1.22.4.5
+++ loncom/interface/lonnavdisplay.pm	2013/08/07 00:03:25	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Navigate Maps Display Handler
+# Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.22.4.5 2014/05/22 12:25:32 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.23 2013/08/07 00:03:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 package Apache::lonnavdisplay;
 
 use strict;
-use Apache::Constants qw(:common :http REDIRECT);
+use Apache::Constants qw(:common :http);
 use Apache::lonmenu();
 use Apache::loncommon();
 use Apache::lonnavmaps();
@@ -38,7 +38,7 @@ use Apache::lonhtmlcommon();
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::londocs();
-#use Time::HiRes qw( gettimeofday tv_interval );
+use Time::HiRes qw( gettimeofday tv_interval );
 
 sub handler {
     my $r = shift;
@@ -59,14 +59,6 @@ sub real_handler {
         return OK;
     }
 
-    # 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;
-    }
-
     # Send header, don't cache this page
     if ($env{'browser.mathml'}) {
         &Apache::loncommon::content_type($r,'text/xml');
@@ -254,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('Due Date').'</option>
+                       <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</option>
                        <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
                     </select>
                     <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
@@ -305,13 +297,14 @@ sub startContentScreen {
     my ($suppcount,$errors);
     unless ($allowed) {
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; 
         ($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
     }
-    if ($allowed || $suppcount) {
+    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;">');
 }