--- loncom/interface/lonnavdisplay.pm 2007/04/20 01:54:29 1.2 +++ loncom/interface/lonnavdisplay.pm 2009/03/16 15:25:40 1.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavdisplay.pm,v 1.2 2007/04/20 01:54:29 albertel Exp $ +# $Id: lonnavdisplay.pm,v 1.8 2009/03/16 15:25:40 schulted Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,7 @@ sub real_handler { "Select Action"); if ($ENV{QUERY_STRING} eq 'collapseExternal') { &Apache::lonnet::put('environment',{'remotenavmap' => 'off'}); - &Apache::lonnet::appenv('environment.remotenavmap' => 'off'); + &Apache::lonnet::appenv({'environment.remotenavmap' => 'off'}); my $menu=&Apache::lonmenu::reopenmenu(); my $navstatus=&Apache::lonmenu::get_nav_status(); if ($menu) { @@ -110,7 +110,7 @@ ENDSUBM } if ($ENV{QUERY_STRING} =~ /^launchExternal/) { &Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); - &Apache::lonnet::appenv('environment.remotenavmap' => 'on'); + &Apache::lonnet::appenv({'environment.remotenavmap' => 'on'}); my $menu=&Apache::lonmenu::reopenmenu(); my $navstatus=&Apache::lonmenu::get_nav_status(); if ($menu) { @@ -133,6 +133,7 @@ MENU if (!defined($navmap)) { my $requrl = $r->uri; $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; + $env{'user.reinit'} = 1; return HTTP_NOT_ACCEPTABLE; } $r->send_http_header; @@ -154,8 +155,8 @@ MENU # Header my $course_type = &Apache::loncommon::course_type(); - $r->print(&Apache::loncommon::start_page('Navigate '.$course_type. - ' Contents', + $r->print(&Apache::loncommon::start_page(#'Navigate '.$course_type. + 'Course Contents', $js, {'only_body' => $body_only, 'force_register' => @@ -255,7 +256,9 @@ MENU # If we found no problems, print a note to that effect. if (!$foundDoableProblem) { - $r->print("All homework assignments have been completed.

"); + $r->print("" + .&mt("All homework assignments have been completed.") + .""); } } else { &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework', @@ -278,7 +281,7 @@ MENU &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything', 'location.href="navmaps?sort='.$env{'form.sort'}.'"', "Show everything"); - $r->print("

".&mt("Uncompleted Problems")."

"); + $r->print("".&mt("Uncompleted Problems").""); $env{'form.filter'} = ''; $env{'form.condition'} = 1; $resource_no_folder_link = 1; @@ -290,11 +293,11 @@ MENU } my %selected=($env{'form.sort'} => 'selected=on'); - my $sort_html=("
+ my $sort_html=(" - - @@ -321,9 +324,9 @@ MENU # user knows there was no error. if ($renderArgs->{'counter'} == 0) { if ($showOnlyHomework) { - $r->print("

".&mt("All homework is currently completed").".

"); + $r->print("

".&mt("All homework is currently completed.")."

"); } else { # both jumpToFirstHomework and normal use the same: course must be empty - $r->print("

This course is empty.

"); + $r->print("

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

"); } } #my $td=&tv_interval($t0);