--- loncom/interface/lonnavdisplay.pm 2014/05/22 12:25:32 1.22.4.5 +++ loncom/interface/lonnavdisplay.pm 2015/03/01 20:42:08 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.22.4.5 2014/05/22 12:25:32 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.29 2015/03/01 20:42:08 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,7 +46,6 @@ sub handler { sub real_handler { my $r = shift; - #my $t0=[&gettimeofday()]; # Handle header-only request if ($r->header_only) { if ($env{'browser.mathml'}) { @@ -59,7 +57,7 @@ sub real_handler { return OK; } - # Check for critical messages and redirect if present. + # 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'); @@ -67,6 +65,8 @@ sub real_handler { return REDIRECT; } + + # Send header, don't cache this page if ($env{'browser.mathml'}) { &Apache::loncommon::content_type($r,'text/xml'); @@ -108,7 +108,11 @@ sub real_handler { $start_page = &Apache::loncommon::start_page($title,undef,$args); } $r->print($start_page. - ''); + ''); &startContentScreen($r,'navmaps'); $r->rflush(); @@ -287,8 +291,6 @@ sub real_handler { $r->print("

".&mt("This course is empty.")."

"); } } - #my $td=&tv_interval($t0); - #$r->print("
$td"); &endContentScreen($r); $r->print(&Apache::loncommon::end_page()); $r->rflush(); @@ -312,6 +314,7 @@ sub startContentScreen { $r->print('
  • '.&mt('Supplemental Content').'
  • '); } $r->print('     '.&mt('Content Search').'     '."\n"); + $r->print('      '.&mt('Content Index').'      '."\n"); $r->print("\n".''."\n"); $r->print('
    '); }