--- loncom/interface/lonprintout.pm	2012/12/17 14:16:06	1.627
+++ loncom/interface/lonprintout.pm	2013/08/23 17:00:38	1.636
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.627 2012/12/17 14:16:06 raeburn Exp $
+# $Id: lonprintout.pm,v 1.636 2013/08/23 17:00:38 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,8 +149,7 @@ sub printable_sequence {
 # Return:
 #     XML that can be parsed by the helper to drive the state machine.
 #
-sub create_incomplete_folder_selstud_helper($helper)
-{
+sub create_incomplete_folder_selstud_helper {
     my ($helper, $map)  = @_;
 
 
@@ -721,7 +720,7 @@ sub incomplete {
 #   print_resources.
 # 
 sub master_seq_to_person_seq {
-    my ($map, $seq, $who, $code) = @_;
+    my ($map, $seq, $who, $code, $nohidemap) = @_;
 
 
     my ($username, $userdomain, $usersection) = split(/:/, $who);
@@ -732,9 +731,14 @@ sub master_seq_to_person_seq {
 
     my %seq_hash = map {$_  => 1} @$seq;
     my @output_seq;
+
+    my $unhidden;
+    if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) {
+        $unhidden = &Apache::lonnet::clutter($map);
+    }
     
     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
-                                                           $code);
+                                                           $code, $unhidden);
     my ($start,$finish);
 
     if ($map) {
@@ -761,7 +765,6 @@ sub master_seq_to_person_seq {
 	#  Only process resources..that are not removed by randomout...
 	#  and are selected for printint as well.
 	#
-
         if (ref($curres) && ! $curres->randomout()) {
             my $currsymb = $curres->symb();
             if (exists($seq_hash{$currsymb})) {
@@ -1102,7 +1105,7 @@ sub format_page_header {
     # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
     if($format =~ /\\\\\s\\\\\s/) {
         #TODO find sensible caption for page header
-        my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+        my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
         $format =~ s/\\\\\s\\\\\s/$testPrintout/;
     }
     #
@@ -2215,7 +2218,7 @@ sub print_page_in_course {
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                        &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -2796,7 +2799,7 @@ ENDPART
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                        &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    }
@@ -3189,7 +3192,7 @@ ENDPART
 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
 	     }
 	     my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
-                                                       $person);
+                                                       $person, undef, 1);
 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
 						     \%moreenv,  $actual_seq,
@@ -3306,11 +3309,11 @@ ENDPART
 		 $moreenv{'CODE'}=&num_to_letters($code);
 	     }
              my $actual_seq = \@master_seq;
-             if ($randomorder) {
+             if ($randomorder || $randompick) {
                  $env{'form.CODE'} = $moreenv{'CODE'};
                  $actual_seq = master_seq_to_person_seq($map, \@master_seq,
                                                         undef,
-                                                        $moreenv{'CODE'});
+                                                        $moreenv{'CODE'}, 1);
                  delete($env{'form.CODE'});
              }
 	     my ($output,$fullname, $printed)=
@@ -3368,7 +3371,7 @@ ENDPART
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			} else {
 			    $texversion.='\vskip 0 mm \noindent\textbf{'.
-                                         &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                                         &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			}
 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -4132,13 +4135,13 @@ sub printHelper {
     my $start_new_option;
     if ($perm{'pav'}) {
 	$start_new_option = 
-	    "<option text='".&mt('Start new page<br />before selected').
+	    "<option text='".&mt('Start new page[_1]before selected','<br />').
 	    "' variable='FINISHPAGE' />".
-	    "<option text='".&mt('Extra space<br />before selected').
+	    "<option text='".&mt('Extra space[_1]before selected','<br />').
 	    "' variable='EXTRASPACE' type='text' />" .
 	    "<option " .
 	    "' variable='POSSIBLE_RESOURCES' type='hidden' />".
-	    "<option text='".&mt('Space units<br />check for mm').
+	    "<option text='".&mt('Space units[_1]check for mm','<br />').
 	    "' variable='EXTRASPACE_UNITS' type='checkbox' />"
 	    ;
 	    
@@ -4303,7 +4306,7 @@ my $suffixXml = <<ALL_PROBLEMS;
 ALL_PROBLEMS
          &Apache::lonxml::xmlparse($r, 'helper', 
 				   &generate_resource_chooser('ALL_PROBLEMS',
-							      'SelectProblem(s) to print',
+							      'Select Problem(s) to print',
 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
 							      'RESOURCES',
 							      'PAGESIZE',
@@ -4446,6 +4449,7 @@ ALL_PROBLEMS
         my @lines = &Apache::grades::get_scantronformat_file();
 	my $codechoice='';
 	foreach my $line (@lines) {
+            next if (($line =~ /^\#/) || ($line eq ''));
 	    my ($name,$description,$code_type,$code_length)=
 		(split(/:/,$line))[0,1,2,4];
 	    if ($code_length > 0 && 
@@ -4659,8 +4663,9 @@ CHOOSE_FROM_ANY_SEQUENCE
     if (!$res_printable) {
 	$paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{MESSAGE_TEXT} = 
-	    &mt('[_1]Printing for current resource is only possible between [_2] and [_3]',
-	        '<p><b>',$res_printstartdate, $res_printenddate.'</b></p>');
+            '<p class="LC_info">'
+           .&mt('Printing for current resource is only possible between [_1] and [_2]',
+                $res_printstartdate, $res_printenddate).'</p>';
 	Apache::lonhelper::message->new();
     }
     $paramHash = Apache::lonhelper::getParamHash();
@@ -4885,7 +4890,7 @@ FONT_SELECTION
 		      return "$helper->{VARS}->{'probstatus'}";
                    </defaultvalue>
 		   <choice computer="problem">Homework Problem</choice>
-		   <choice computer="exam">Exam Problem</choice>
+		   <choice computer="exam">Bubblesheet Exam Problem</choice>
 		   <choice computer="survey">Survey question</choice>
                    ,choice computer="anonsurvey"Anonymous survey question</choice>
 		</dropdown>