--- loncom/interface/lonnavdisplay.pm	2014/05/20 20:30:59	1.27
+++ loncom/interface/lonnavdisplay.pm	2015/03/01 20:47:54	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-
+# Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.27 2014/05/20 20:30:59 musolffc Exp $
+# $Id: lonnavdisplay.pm,v 1.30 2015/03/01 20:47:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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,14 +46,9 @@ 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;
     }
@@ -67,18 +61,6 @@ sub real_handler {
         return REDIRECT;
     }
 
-
-
-    # Send header, don't cache this page
-    if ($env{'browser.mathml'}) {
-        &Apache::loncommon::content_type($r,'text/xml');
-    } else {
-        &Apache::loncommon::content_type($r,'text/html');
-    }
-    &Apache::loncommon::no_cache($r);
-
-    my %toplinkitems=();
-
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
@@ -88,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
@@ -127,6 +112,7 @@ sub real_handler {
         return OK;
     }
 
+    my %toplinkitems=();
     my @resources = $navmap->retrieveResources();
     my $sequenceCount = 0;
     my $problemCount = 0;
@@ -293,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();