--- loncom/interface/lonprintout.pm 2006/03/14 23:24:46 1.429 +++ loncom/interface/lonprintout.pm 2006/03/29 11:47:03 1.434 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.429 2006/03/14 23:24:46 foxr Exp $ +# $Id: lonprintout.pm,v 1.434 2006/03/29 11:47:03 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1022,12 +1022,8 @@ sub output_data { my ($r,$helper,$rparmhash) = @_; my %parmhash = %$rparmhash; my $resources_printed = ''; - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Preparing Printout'); - $r->print(< - -LON-CAPA output for printing - -$bodytag -

-Please stand by while processing your print request, this may take some time ... -

ENDPART + my $start_page = &Apache::loncommon::start_page('Preparing Printout',$js); + my $msg = &mt('Please stand by while processing your print request, this may take some time ...'); + $r->print($start_page."\n

\n$msg\n

\n"); # fetch the pagebreaks and store them in the course environment # The page breaks will be pulled into the hash %page_breaks which is @@ -1471,7 +1464,7 @@ ENDPART my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75'); my $student_counter=-1; my $i = 0; - my ($junku, $junkd, $last_section) = split /:/,$students[0]; + my $last_section = (split(/:/,$students[0]))[2]; foreach my $person (@students) { my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due"; @@ -1481,8 +1474,7 @@ ENDPART } $student_counter++; if ($split_on_sections) { - my $this_section; - ($junku, $junkd, $this_section) = split /:/,$person; + my $this_section = (split(/:/,$person))[2]; if ($this_section ne $last_section) { $i++; $last_section = $this_section; @@ -1771,12 +1763,12 @@ ENDPART "cgi.$identifier.coursedom" => $cdom, "cgi.$identifier.resources" => $resources_printed); -$r->print(<print(< Continue - - +$end_page FINALEND } @@ -2158,10 +2150,11 @@ sub printHelper { my $helperFragment = < (mark them then click "next" button)
- PAGESIZE - return $isProblem; + return $isProblemOrMap; + return $isNotMap; $map return $symbFilter;