--- loncom/interface/lonprintout.pm	2006/07/03 12:59:58	1.454
+++ loncom/interface/lonprintout.pm	2006/07/14 21:03:47	1.458
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.454 2006/07/03 12:59:58 foxr Exp $
+# $Id: lonprintout.pm,v 1.458 2006/07/14 21:03:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -758,16 +758,16 @@ sub page_format_transformation {
     my $name = &get_name();
     my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-    my $HeaderText  = $parmhash{'print_header_format'};
-    $HeaderText     = &format_page_header($HeaderText, $assignment, $courseidinfo, $name);
-    &Apache::lonnet::logthis("Header Format: $HeaderText");
+    my $header_text  = $parmhash{'print_header_format'};
+    $header_text     = &format_page_header($header_text, $assignment,
+					   $courseidinfo, $name);
     my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
     my $fancypagestatement='';
     if ($numberofcolumns eq '2') {
-	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$HeaderText}";
+	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
     } else {
-	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$HeaderText}";
+	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
     }
     if ($layout eq 'album') {
 	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
@@ -1296,7 +1296,7 @@ ENDPART
 	    }
 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
 	    $result .= '\end{document}';   
-	} elsif ($cleanURL=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) { 
+	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		$resources_printed .= $currentURL.':';
@@ -1406,21 +1406,20 @@ ENDPART
 		    my $courseidinfo = &get_course();
 		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
-		    my $HeaderText = $parmhash{'print_header_format'};
-		    $HeaderText    = &format_page_header($HeaderText,
-							 $assignment, 
-							 $courseidinfo, 
-							 $name);
-		    &Apache::lonnet::logthis("Hdr Format $HeaderText");
+		    my $header_text = $parmhash{'print_header_format'};
+		    $header_text    = &format_page_header($header_text,
+							  $assignment, 
+							  $courseidinfo, 
+							  $name);
 		    if ($numberofcolumns eq '1') {
-			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$HeaderText.'}} \vskip 5 mm ';
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
 		    } else {
-			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$HeaderText.'}} \vskip 5 mm ';
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
 		    }			
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    } elsif ($urlp=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) { 
+	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
@@ -1915,7 +1914,7 @@ sub print_resources {
 			$rendered =~ s/\\end{document}//;
 		    }
 		    $current_output .= $rendered;		    
-		} elsif ($res_url=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) {
+		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
 		    $printed .= $curresline.':';
 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 
@@ -1946,7 +1945,6 @@ sub print_resources {
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $HeaderLine = $parmhash{'print_header_format'};
     $HeaderLine = format_page_header($HeaderLine, $currentassignment, $courseidinfo, $fullname);
-    &Apache::lonnet::logthis("Hdr format: $HeaderLine");
     if ($current_output=~/\\documentclass/) {
 	if ($columns_in_format == 1) {
 	    $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\lhead{$HeaderLine$namepostfix}}\\vskip 5 mm /;
@@ -2182,7 +2180,7 @@ sub printHelper {
     my $paramHash;
 
     if ($resourceTitle) {
-        push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('what you just saw on the screen').")", 'current_document', 'PAGESIZE'];
+        push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
     }
 
     # Useful filter strings
@@ -2200,37 +2198,35 @@ sub printHelper {
 
 
     # If we're in a sequence...
+    my $startnew=&mt('Start new page<br />before selected');
     if (($helper->{'VARS'}->{'construction'} ne '1') &&
 
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
-        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
-
+        push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
-    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
       </resource>
     </state>
 
   <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
-    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
       </resource>
     </state>
 HELPERFRAGMENT
@@ -2241,37 +2237,35 @@ HELPERFRAGMENT
     # If the user has pfo (print for otheres) allow them to print all 
     # problems and resources  in the entier course, optionally for selected students
     if ($perm{'pfo'} && 
-        ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|grppg|aboutme|bulletinboard)$/)) { 
+        ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
-        push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
-	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+        push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+	push @{$printChoices}, ['Selected <b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
-    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" toponly='0' multichoice="1"
 	suppressEmptySequences='0' addstatus="1" closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
     </resource>
   </state>
   <state name="ALL_RESOURCES" title="Select Resource(s) to print">
-    <message>(Mark them then click "next" button) <br /> </message>
     <resource variable="RESOURCES" toponly='0' multichoice='1'
               suppressEmptySequences='0' addstatus='1' closeallpages='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap; </filterfunc>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='NewPage' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
     </resource>
   </state>
 ALL_PROBLEMS
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
-	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
+	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
+	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
 
 	# resource_selector will hold a few states that:
@@ -2292,7 +2286,7 @@ ALL_PROBLEMS
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='New Page' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
       </resource>
     </state>
     <state name="PRINT_FORMATTING" title="How should results be printed?">
@@ -2442,8 +2436,8 @@ CHOOSE_ANON1
 
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
-	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
+	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
 	    
 
@@ -2456,7 +2450,7 @@ CHOOSE_ANON1
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
       </resource>
     </state>
     <state name="PRINT_FORMATTING" title="Format of the print job">
@@ -2549,12 +2543,12 @@ CHOOSE_ANON2
 
     # FIXME: That RE should come from a library somewhere.
     if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
-        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+        push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
-    <message>(mark them then click "next" button) <br /></message>
+
     <files variable="FILES" multichoice='1'>
       <nextstate>PAGESIZE</nextstate>
       <filechoice>return '$subdir';</filechoice>
@@ -2575,7 +2569,7 @@ CHOOSE_FROM_SUBDIR
     # Allow the user to select any sequence in the course, feed it to
     # another resource selector for that sequence
     if (!$helper->{VARS}->{'construction'}) {
-	push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+	push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
 			      'select_sequences', 'CHOOSE_SEQUENCE'];
 	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
 	#Escape apostrophes and backslashes for Perl
@@ -2600,7 +2594,7 @@ CHOOSE_FROM_SUBDIR
       <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      <option text='$startnew' variable='FINISHPAGE' />
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE