--- loncom/interface/lonprintout.pm	2007/07/25 20:39:57	1.505
+++ loncom/interface/lonprintout.pm	2007/08/29 00:55:37	1.507
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.505 2007/07/25 20:39:57 albertel Exp $
+# $Id: lonprintout.pm,v 1.507 2007/08/29 00:55:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2222,6 +2222,28 @@ sub init_perm {
     }
 }
 
+sub get_randomly_ordered_warning {
+    my ($helper,$map) = @_;
+
+    my $message;
+
+    my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $res = $navmap->getResourceByUrl($map);
+    if ($res) {
+	my $func = 
+	    sub { return ($_[0]->is_map() && $_[0]->randomorder); };
+	my @matches = $navmap->retrieveResources($res, $func,1,1,1);
+	if (@matches) {
+	    $message = "Some folders are set to be randomly ordered. When printing the contents of these folders will be printed in the original order for all students.";
+	}
+    }
+    if ($message) {
+	return '<message type="warning">'.$message.'</message>';
+    }
+    return;
+}
+
 sub printHelper {
     my $r = shift;
 
@@ -2477,6 +2499,9 @@ ALL_PROBLEMS
 	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
 
+	my $randomly_ordered_warning = 
+	    &get_randomly_ordered_warning($helper,$map);
+
 	# resource_selector will hold a few states that:
 	#   - Allow resources to be selected for printing.
 	#   - Determine pagination between assignments.
@@ -2488,6 +2513,8 @@ ALL_PROBLEMS
 	#
 	my $resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_PROBLEMS" title="Select resources to print">
+    $randomly_ordered_warning
+
    <nextstate>PRINT_FORMATTING</nextstate> 
    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1" 
@@ -2655,6 +2682,8 @@ CHOOSE_ANON1
 
 	$resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_RESOURCES" title="Select Resources">
+    $randomly_ordered_warning
+
     <nextstate>PRINT_FORMATTING</nextstate>
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1" 
@@ -2885,7 +2914,7 @@ CHOOSE_FROM_ANY_SEQUENCE
         Apache::lonhelper::dropdown->new();
  
 	addMessage("</td></tr><tr><td align='right'>".
-                   '<label="TABLE_CONTENTS_forminput">'.
+                   '<label for="TABLE_CONTENTS_forminput">'.
                    &mt('Print Table of Contents').
                    "</label>: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
@@ -2937,6 +2966,7 @@ CHOOSE_FROM_ANY_SEQUENCE
 	    my $stylevalue='$Apache::lonnet::env{"construct.style"}';
             my $randseedtext=&mt("Use random seed");
             my $stylefiletext=&mt("Use style file");
+            my $selectfiletext=&mt("Select style file");
 
 	    my $xmlfrag .= <<"RNDSEED";
 	    <message><tr><td align='right'>
@@ -2954,9 +2984,9 @@ CHOOSE_FROM_ANY_SEQUENCE
 		<defaultvalue>
 	            return $stylevalue;
 	        </defaultvalue>
-             </string><message>&nbsp; <a href="javascript:openbrowser('helpform','style_file_forminput','sty')">Select style file</a> </td><tr><td></message>
+             </string><message>&nbsp; <a href="javascript:openbrowser('helpform','style_file_forminput','sty')">$selectfiletext</a> </td></tr><tr><td></td><td align="left"></message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
-                <choice computer="1">Show all foils?</choice>
+                <choice computer="1">Show all foils</choice>
              </choices>
 	     <message></td></tr></message>
 RNDSEED
@@ -3065,6 +3095,8 @@ sub render {
     my $PageLayout=&mt('Page layout');
     my $NumberOfColumns=&mt('Number of columns');
     my $PaperType=&mt('Paper type');
+    my $landscape=&mt('Landscape');
+    my $portrait=&mt('Portrait');
     $result .= <<STATEHTML;
 
 <hr width="33%" />
@@ -3076,8 +3108,8 @@ sub render {
   </tr>
   <tr>
     <td>
-      <label><input type="radio" name="${var}.layout" value="L" /> Landscape </label><br />
-      <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait </label>
+      <label><input type="radio" name="${var}.layout" value="L" /> $landscape </label><br />
+      <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> $portrait </label>
     </td>
     <td align="center">
       <select name="${var}.cols">
@@ -3233,15 +3265,19 @@ sub render {
     }  else {
 	$size{'margin'} += 2.54;
     }
-    $result .= <<ELEMENTHTML;
+    my %text = ('format' => 'How should each column be formatted?',
+		'width'  => 'Width:',
+		'height' => 'Height:',
+		'margin' => 'Left Margin:',);
+    %text = &Apache::lonlocal::texthash(%text);
 
-  
+    $result .= <<ELEMENTHTML;
 
-<p>How should each column be formatted?</p>
+<p>$text{'format'}</p>
 
 <table cellpadding='3'>
   <tr>
-    <td align='right'><b>Width</b>:</td>
+    <td align='right'><b>$text{'width'}</b></td>
     <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
     <td align='left'>
       <select name='$var.widthunit'>
@@ -3250,7 +3286,7 @@ sub render {
     </td>
   </tr>
   <tr>
-    <td align='right'><b>Height</b>:</td>
+    <td align='right'><b>$text{'height'}</b></td>
     <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
     <td align='left'>
       <select name='$var.heightunit'>
@@ -3259,7 +3295,7 @@ sub render {
     </td>
   </tr>
   <tr>
-    <td align='right'><b>Left margin</b>:</td>
+    <td align='right'><b>$text{'margin'}</b></td>
     <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
     <td align='left'>
       <select name='$var.lmarginunit'>