--- loncom/interface/lonprintout.pm	2007/07/04 14:17:36	1.502
+++ loncom/interface/lonprintout.pm	2007/10/02 00:30:57	1.506.2.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.502 2007/07/04 14:17:36 foxr Exp $
+# $Id: lonprintout.pm,v 1.506.2.1 2007/10/02 00:30:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1371,6 +1371,14 @@ ENDPART
     if ($helper->{'VARS'}->{'showallfoils'} eq "1") { 
 	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
     }
+    
+    if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+	&Apache::lonnet::appenv('construct.style' =>
+				$helper->{'VARS'}->{'style_file'});
+    } elsif ($env{'construct.style'}) {
+	&Apache::lonnet::delenv('construct\\.style');
+    }
+
 
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
@@ -1394,12 +1402,6 @@ ENDPART
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
 		my %moreenv;
 		$moreenv{'request.filename'}=$cleanURL;
-		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
-		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
-		    my $dom = $env{'user.domain'};
-		    my $user = $env{'user.name'};
-		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
-		}
                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
@@ -1448,7 +1450,7 @@ ENDPART
 			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
 			my $URLpath=$cleanURL;
 			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
@@ -2446,8 +2448,8 @@ HELPERFRAGMENT
     if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
-        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'];
+        push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
+	push @{$printChoices}, [&mtn('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">
     <resource variable="RESOURCES" toponly='0' multichoice="1"
@@ -2792,7 +2794,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'} && !$is_published) {
-	push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
+	push @$printChoices, [&mtn("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
@@ -2883,7 +2885,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();
@@ -2932,9 +2934,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 	}
 
 	if ($helper->{'VARS'}->{'construction'}) { 
-	    my $stylevalue=$env{'construct.style'};
+	    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'>
@@ -2946,17 +2949,19 @@ CHOOSE_FROM_ANY_SEQUENCE
 	        </defaultvalue>
 	    </string>
 	     <message></td></tr><tr><td align="right">
-             <label for="style_file_value">$stylefiletext</label>:
+             <label for="style_file">$stylefiletext</label>:
              </td><td></message>
-             <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>
+             <string variable="style_file" size="40">
+		<defaultvalue>
+	            return $stylevalue;
+	        </defaultvalue>
+             </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
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
-	    
 	} 
     }
 
@@ -3061,6 +3066,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%" />
@@ -3072,8 +3079,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">
@@ -3229,15 +3236,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'>
@@ -3246,7 +3257,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'>
@@ -3255,7 +3266,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'>