--- loncom/interface/lonprintout.pm	2008/08/25 10:16:27	1.537
+++ loncom/interface/lonprintout.pm	2008/11/04 14:13:16	1.545
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.537 2008/08/25 10:16:27 foxr Exp $
+# $Id: lonprintout.pm,v 1.545 2008/11/04 14:13:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -280,6 +280,13 @@ sub format_page_header {
     # to \% else LaTeX will think they are comments and terminate
     # the line.. which is bad!!!
     
+    # If the user has role author, $course and $assignment are empty so
+    # 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 ');
+        $format =~ s/\\\\\s\\\\\s/$testPrintout/;
+    }
     
 
     return $format;
@@ -385,8 +392,8 @@ sub is_valid_alpha_code {
 sub is_code_valid {
     my ($code_value, $code_option) = @_;
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
-    open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
-    foreach my $line (<FG>) {
+    my @lines = &Apache::grades::get_scantronformat_file();
+    foreach my $line (@lines) {
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -1153,6 +1160,7 @@ sub print_latex_header {
 	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\usepackage[T1]{fontenc}'."\n".
+             '\usepackage{lmodern}'."\n".
 	     '\usepackage[postscript]{ucs}'."\n".
 	     '\usepackage[utf8x]{inputenc}'."\n".
 	     '\usepackage{pifont}'  . "\n".
@@ -1273,20 +1281,43 @@ sub recently_generated {
 	    $cuid,$cgid,$crdev,$csize,
 	    $catime,$cmtime,$cctime,
 	    $cblksize,$cblocks)=stat($prtspool.'/'.$filename);
-	my $result="<a href='/prtspool/$filename'>".
-	    &mt('Generated [_1] ([_2] bytes)',
-		&Apache::lonlocal::locallocaltime($cctime),$csize).
-		'</a><br />';
+        my $ext_text = 'pdf' ? &mt('PDF File'):&mt('Zip File');
+	my $result=&Apache::loncommon::start_data_table_row()
+                  .'<td>'
+                  .'<a href="/prtspool/'.$filename.'">'.$ext_text.'</a>'
+                  .'</td>'
+                  .'<td>'.&Apache::lonlocal::locallocaltime($cctime).'</td>'
+                  .'<td align="right">'.$csize.'</td>'
+                  .&Apache::loncommon::end_data_table_row();
 	if ($ext eq 'pdf') { $pdf_result .= $result; }
 	if ($ext eq 'zip') { $zip_result .= $result; }
     }
+    if ($zip_result || $pdf_result) {
+        $r->print('<hr />');
+    }
     if ($zip_result) {
-	$r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"
-		  .$zip_result);
+	$r->print('<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
+                  .&Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.&mt('Download').'</th>'
+                  .'<th>'.&mt('Creation Date').'</th>'
+                  .'<th>'.&mt('File Size (Bytes)').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row()
+                  .$zip_result
+                  .&Apache::loncommon::end_data_table()
+        );
     }
     if ($pdf_result) {
-	$r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"
-		  .$pdf_result);
+	$r->print('<h3>'.&mt('Recently generated printouts')."</h3>\n"
+                  .&Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.&mt('Download').'</th>'
+                  .'<th>'.&mt('Creation Date').'</th>'
+                  .'<th>'.&mt('File Size (Bytes)').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row()
+                  .$pdf_result
+                  .&Apache::loncommon::end_data_table()
+        );
     }
 }
 
@@ -1474,7 +1505,7 @@ ENDPART
     my ($result,$selectionmade) = ('','');
     my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my @temporary_array=split /\|/,$format_from_helper;
-    my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
+    my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
     if ($laystyle eq 'L') {
 	$laystyle='album';
     } else {
@@ -1495,6 +1526,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+    $form{'pdfFormFields'} = $pdfFormFields;
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -1934,9 +1966,9 @@ ENDPART
 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
 
 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
-	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+         my @lines = &Apache::grades::get_scantronformat_file();
 	 my ($code_type,$code_length)=('letter',6);
-	 foreach my $line (<FH>) {
+	 foreach my $line (@lines) {
 	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
 	     if ($name eq $code_option) {
 		 $code_length=$length;
@@ -2639,9 +2671,9 @@ sub printHelper {
     }
 
     # Useful filter strings
-    my $isProblem = '($res->is_problem()||$res->contains_problem) ';
+    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
     my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
@@ -2852,10 +2884,9 @@ CHOOSE_STUDENTS
 
 	}
 
-	
-	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+        my @lines = &Apache::grades::get_scantronformat_file();
 	my $codechoice='';
-	foreach my $line (<FH>) {
+	foreach my $line (@lines) {
 	    my ($name,$description,$code_type,$code_length)=
 		(split(/:/,$line))[0,1,2,4];
 	    if ($code_length > 0 && 
@@ -3120,10 +3151,18 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
-	addMessage("<hr width='33%' /><table><tr><td align='right'>".
-                   '<label for="ANSWER_TYPE_forminput">'.
-                   &mt('Print').
-                   "</label>: </td><td>");
+	&addMessage('<br />'
+                   .'<h3>'.&mt('Print Options').'</h3>'
+                   .&Apache::lonhtmlcommon::start_pick_box()
+#                  .&Apache::lonhtmlcommon::row_headline()
+#                  .'<h3>'.&mt('Print Options').'</h3>'
+#                  .&Apache::lonhtmlcommon::row_closure()
+                   .&Apache::lonhtmlcommon::row_title(
+                       '<label for="ANSWER_TYPE_forminput">'
+                      .&mt('Print Answers')
+                      .'</label>'
+                    )
+        );
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
 	$helper->declareVar('ANSWER_TYPE');         
@@ -3133,7 +3172,7 @@ CHOOSE_FROM_ANY_SEQUENCE
                                    ['Only Answers', 'only']
                                 ];
         Apache::lonhelper::dropdown->new();
-	addMessage("</td></tr>");
+	&addMessage(&Apache::lonhtmlcommon::row_closure());
 	$startedTable = 1;
     }
 
@@ -3145,10 +3184,12 @@ CHOOSE_FROM_ANY_SEQUENCE
                        "</label>: </td><td>");
 	    $startedTable = 1;
 	} else {
-	    addMessage("<tr><td align='right'>".
-                       '<label for="LATEX_TYPE_forminput">'.
-                        &mt('LaTeX mode').
-                       "</label>: </td><td>");
+	    &addMessage(&Apache::lonhtmlcommon::row_title(
+                           '<label for="LATEX_TYPE_forminput">'
+                           .&mt('LaTeX mode')
+                           .'</label>'
+                        )
+            );
 	}
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -3164,10 +3205,13 @@ CHOOSE_FROM_ANY_SEQUENCE
 	}
         Apache::lonhelper::dropdown->new();
  
-	addMessage("</td></tr><tr><td align='right'>".
-                   '<label for="TABLE_CONTENTS_forminput">'.
-                   &mt('Print Table of Contents').
-                   "</label>: </td><td>");
+	&addMessage(&Apache::lonhtmlcommon::row_closure()
+                   .&Apache::lonhtmlcommon::row_title(
+                        '<label for="TABLE_CONTENTS_forminput">'
+                       .&mt('Print Table of Contents')
+                       .'</label>'
+                    )
+        );
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
 	$helper->declareVar('TABLE_CONTENTS');         
@@ -3175,13 +3219,15 @@ CHOOSE_FROM_ANY_SEQUENCE
                                    ['No', 'no'],
                                    ['Yes', 'yes'] ];
         Apache::lonhelper::dropdown->new();
-	addMessage("</td></tr>");
+	&addMessage(&Apache::lonhtmlcommon::row_closure());
         
 	if (not $helper->{VARS}->{'construction'}) {
-	    addMessage("<tr><td align='right'>".
-                       '<label for="TABLE_INDEX_forminput">'.
-                       &mt('Print Index').
-                       "</label>: </td><td>");
+	    &addMessage(&Apache::lonhtmlcommon::row_title(
+                            '<label for="TABLE_INDEX_forminput">'
+                           .&mt('Print Index')
+                           .'</label>'
+                        )
+            );
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'TABLE_INDEX';   
 	    $helper->declareVar('TABLE_INDEX');         
@@ -3189,11 +3235,13 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['No', 'no'],
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
-	    addMessage("</td></tr>");
-	    addMessage("<tr><td align='right'>".
-                       '<label for="PRINT_DISCUSSIONS_forminput">'.
-                       &mt('Print Discussions').
-                       "</label>: </td><td>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure());
+            &addMessage(&Apache::lonhtmlcommon::row_title(
+                            '<label for="PRINT_DISCUSSIONS_forminput">'
+                           .&mt('Print Discussions')
+                           .'</label>'
+                        )
+            );
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';   
 	    $helper->declareVar('PRINT_DISCUSSIONS');         
@@ -3201,14 +3249,16 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['No', 'no'],
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
-	    addMessage("</td></tr>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure());
 
 	    # Prompt for printing annotations too.
 		
-	    addMessage("<tr><td align='right'>".
-		       '<label for="PRINT_ANNOTATIONS_forminput">'.
-		       &mt('Print Annotations').
-		       "</label>:</td><td>");
+	    &addMessage(&Apache::lonhtmlcommon::row_title(
+                            '<label for="PRINT_ANNOTATIONS_forminput">'
+                           .&mt('Print Annotations')
+                           .'</label>'
+                        )
+            );
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
 	    $helper->declareVar("PRINT_ANNOTATIONS");
@@ -3216,16 +3266,16 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['No', 'no'],
 				     ['Yes', 'yes']];
 	    Apache::lonhelper::dropdown->new();
-	    addMessage("</td></tr>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure());
 
-	    addMessage("<tr><td align = 'right'>  </td><td>");
+            &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Foils')));
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'multichoice'} = "true";
 	    $paramHash->{'allowempty'}  = "true";
 	    $paramHash->{'variable'}   = "showallfoils";
 	    $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
 	    Apache::lonhelper::choices->new();
-	    addMessage("</td></tr>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure(1));
 	}
 
 	if ($helper->{'VARS'}->{'construction'}) { 
@@ -3234,32 +3284,44 @@ CHOOSE_FROM_ANY_SEQUENCE
             my $stylefiletext=&mt("Use style file");
             my $selectfiletext=&mt("Select style file");
 
-	    my $xmlfrag .= <<"RNDSEED";
-	    <message><tr><td align='right'>
-            <label for="curseed_forminput">$randseedtext</label>:
-            </td><td></message>
-	    <string variable="curseed" size="15" maxlength="15">
-		<defaultvalue>
-	            return $helper->{VARS}->{'curseed'};
-	        </defaultvalue>
-	    </string>
-	     <message></td></tr><tr><td align="right">
-             <label for="style_file">$stylefiletext</label>:
-             </td><td></message>
+	    my $xmlfrag .= '<message>'
+            .&Apache::lonhtmlcommon::row_title('<label for="curseed_forminput">'
+                                              .$randseedtext
+                                              .'</label>'
+             )
+            .'</message>
+            <string variable="curseed" size="15" maxlength="15">
+                <defaultvalue>
+                   return '.$helper->{VARS}->{'curseed'}.';
+                </defaultvalue>'
+            .'</string>'
+            .'<message>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .&Apache::lonhtmlcommon::row_title('<label for="style_file">'
+                                              .$stylefiletext
+                                              .'</label>'
+             )
+            .'</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>
+                <defaultvalue>
+                    return '.$stylevalue.';
+                </defaultvalue>
+             </string><message>&nbsp;'
+.qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
+.$selectfiletext.'</a>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .&Apache::lonhtmlcommon::row_title(&mt('Show all foils'))
+            .'</message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
-                <choice computer="1">Show all foils</choice>
-             </choices>
-	     <message></td></tr></message>
-RNDSEED
+                <choice computer="1">&nbsp;</choice>
+             </choices>'
+	    .'<message>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .'</message>';
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
 
 
-	    addMessage("<tr><td>Problem Type:</td><td>");
+            &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Problem Type')));
 	    #
 	    # Initial value from construction space:
 	    #
@@ -3278,16 +3340,16 @@ RNDSEED
 PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
 	    
-	    addMessage("</td></tr>"); 
+            &addMessage(&Apache::lonhtmlcommon::row_closure(1));
 
-	} 
+        }
     }
 
 
 
 
     if ($startedTable) {
-	addMessage("</table>");
+        &addMessage(&Apache::lonhtmlcommon::end_pick_box());
     }
 
     Apache::lonprintout::page_format_state->new("FORMAT");
@@ -3386,23 +3448,25 @@ sub render {
     my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');
-    $result .= <<STATEHTML;
+    my $pdfFormLabel=&mt('PDF-Formfields');
+    my $with=&mt('with Formfields');
+    my $without=&mt('without Formfields');
+    $result.='<h3>'.&mt('Layout Options').'</h3>'
+            .&Apache::loncommon::start_data_table()
+            .&Apache::loncommon::start_data_table_header_row()
+            .'<th>'.$PageLayout.'</th>'
+            .'<th>'.$NumberOfColumns.'</th>'
+            .'<th>'.$PaperType.'</th>'
+            .'<th>'.$pdfFormLabel.'</th>'
+            .&Apache::loncommon::end_data_table_header_row()
+            .&Apache::loncommon::start_data_table_row()
+    .'<td>'
+    .'<label><input type="radio" name="'.${var}.'.layout" value="L" />'.$landscape.'</label><br />'
+    .'<label><input type="radio" name="'.${var}.'.layout" value="P" checked="checked" />'.$portrait.'</label>'
+    .'</td>';
 
-<hr width="33%" />
-<table cellpadding="3">
-  <tr>
-    <td align="center"><b>$PageLayout</b></td>
-    <td align="center"><b>$NumberOfColumns</b></td>
-    <td align="center"><b>$PaperType</b></td>
-  </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>
-    </td>
-    <td align="center">
-      <select name="${var}.cols">
-STATEHTML
+    $result.='<td align="center">'
+            .'<select name="'.${var}.'.cols">';
 
     my $i;
     for ($i = 1; $i <= $maxColumns; $i++) {
@@ -3431,7 +3495,19 @@ STATEHTML
         }
         $i++;
     }
-    $result .= "</select></td></tr></table>";
+    $result .= <<HTML;
+        </select>
+    </td>
+    <td align='center'>
+        <select name='${var}.pdfFormFields'>
+            <option selected value='no'>$without</option>
+            <option value='yes'>$with</option>
+        </select>
+    </td>
+HTML
+    $result.=&Apache::loncommon::end_data_table_row()
+            .&Apache::loncommon::end_data_table();
+
     return $result;
 }
 
@@ -3442,7 +3518,7 @@ sub postprocess {
     my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} = 
         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-        $env{"form.$var.paper"};
+        $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
     return 1;
 }