--- loncom/interface/lonnavmaps.pm 2006/03/13 17:29:50 1.368 +++ loncom/interface/lonnavmaps.pm 2006/03/16 20:48:30 1.371 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.368 2006/03/13 17:29:50 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.371 2006/03/16 20:48:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -194,10 +194,7 @@ MENU MENU } $r->send_http_header; - my $html=&Apache::lonxml::xmlbegin(); - $r->print(<<"ENDSUBM"); - $html - + my $js =<<"ENDSUBM"; - - - ENDSUBM + $r->print(&Apache::lonxml::xmlbegin(). + &Apache::loncommon::head(undef,$js). + ''. + &Apache::loncommon::end_page(undef,$js)); + return OK; } if ($ENV{QUERY_STRING} =~ /^launchExternal/) { @@ -239,9 +238,7 @@ MENU return HTTP_NOT_ACCEPTABLE; } $r->send_http_header; - my $html=&Apache::lonxml::xmlbegin(); - $r->print("$html\n"); - $r->print("".&mt('Navigate Course Contents').""); + # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']); @@ -249,12 +246,13 @@ MENU my $addentries=''; my $more_unload; my $body_only=''; + my $js; if ($env{'environment.remotenavmap'} eq 'on') { - $r->print(''); + $js=''; # FIXME need to be smarter to only catch window close events # $more_unload="collapse()" $body_only=1; @@ -269,7 +267,8 @@ MENU } # Header - $r->print(''. + $r->print(&Apache::lonxml::xmlbegin(). + &Apache::loncommon::head('Navigate Course Contents',$js). &Apache::loncommon::bodytag('Navigate Course Contents','', $addentries,$body_only,'', $env{'form.register'})); @@ -281,7 +280,7 @@ MENU if (!($navmap->courseMapDefined())) { $r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT')); $r->print('Coursemap undefined.' . - ''); + &Apache::loncommon::end_page()); return OK; } @@ -434,7 +433,7 @@ MENU #my $td=&tv_interval($t0); #$r->print("
$td"); - $r->print(""); + $r->print(&Apache::loncommon::end_page()); $r->rflush(); return OK; @@ -3657,7 +3656,7 @@ sub kind { my $self=shift; return $self- sub randomout { my $self=shift; return $self->navHash("randomout_", 1); } sub randompick { my $self = shift; - return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb().'.0.randompick'}; + return $self->parmval('randompick'); } sub link { my $self=shift; @@ -3775,6 +3774,16 @@ sub retrieveResources { return $self->{NAV_MAP}->retrieveResources(@_); } +sub is_exam { + my ($self,$part) = @_; + if ($self->parmval('type',$part) eq 'exam') { + return 1; + } + if ($self->src() =~ /\.(exam)$/) { + return 1; + } + return 0; +} sub is_html { my $self=shift; my $src = $self->src();