--- loncom/interface/lonprintout.pm	2003/11/11 19:32:22	1.265
+++ loncom/interface/lonprintout.pm	2004/01/16 18:36:25	1.271
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.265 2003/11/11 19:32:22 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.271 2004/01/16 18:36:25 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -515,17 +515,16 @@ sub page_cleanup {
 
 sub details_for_menu {
 
-    my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
+    my $name_of_resourse = &Apache::lonnet::gettitle($ENV{'form.postdata'});
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);
-    my $name_of_sequence;
-    $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
+    my $name_of_sequence = &Apache::lonnet::gettitle($map);
     if ($name_of_sequence =~ /^\s*$/) {
 	$map =~ m|([^/]+)$|;
 	$name_of_sequence = $1;
     }
-    my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
+    my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
     if ($name_of_map =~ /^\s*$/) {
 	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
 	$name_of_map = $1;
@@ -873,6 +872,7 @@ ENDPART
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	my $prevassignment='';
+	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonxml::init_counter();
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
@@ -889,6 +889,7 @@ ENDPART
 	    $form{'symb'}=$master_seq[$i];
 	    my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
+	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
 	    my $texversion.=&Apache::lonnet::ssi($urlp,%form);
@@ -962,8 +963,8 @@ ENDPART
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
 	 foreach my $person (@students) {
 	    my $current_output = ''; 
-#	    my ($usersection,$username,$userdomain) = split /:/,$person;
-	    my ($username,$userdomain) = split /:/,$person;
+	    my ($username,$userdomain,$usersection) = split /:/,$person;
+#	    my ($username,$userdomain) = split /:/,$person;
 	    my $fullname = &get_name($username,$userdomain);
 
 	    if ($parmhash{'anonymous_quiz'}=~/yes/) {$fullname=' ';} #put here something reasonable for anonymous exams or quiz
@@ -1010,6 +1011,7 @@ ENDPART
 	    }
 	    my $courseidinfo = &get_course();
 	    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+            if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
 	    my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
 	    if ($current_output=~/\\documentclass/) {
 		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
@@ -1641,6 +1643,7 @@ use Apache::lonhelper;
 no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
+use Apache::lonlocal;
 
 my $maxColumns = 2;
 my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]", 
@@ -1668,15 +1671,17 @@ sub render {
     my $helper = Apache::lonhelper::getHelper();
     my $result = '';
     my $var = $self->{'variable'};
-
+    my $PageLayout=&mt('Page layout');
+    my $NumberOfColumns=&mt('Number of columns');
+    my $PaperType=&mt('Paper type');
     $result .= <<STATEHTML;
 
 <hr width="33%" />
 <table cellpadding="3">
   <tr>
-    <td align="center"><b>Page layout</b></td>
-    <td align="center"><b>Number of columns</b></td>
-    <td align="center"><b>Paper type</b></td>
+    <td align="center"><b>$PageLayout</b></td>
+    <td align="center"><b>$NumberOfColumns</b></td>
+    <td align="center"><b>$PaperType</b></td>
   </tr>
   <tr>
     <td>