--- loncom/interface/lonprintout.pm	2012/12/17 14:16:06	1.627
+++ loncom/interface/lonprintout.pm	2013/06/01 00:22:37	1.632
@@ -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.632 2013/06/01 00:22:37 raeburn 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})) {
@@ -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)=
@@ -4659,8 +4662,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 +4889,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>