--- loncom/interface/lonprintout.pm	2008/10/31 18:02:33	1.544
+++ loncom/interface/lonprintout.pm	2008/12/15 23:12:26	1.545.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.544 2008/10/31 18:02:33 bisitz Exp $
+# $Id: lonprintout.pm,v 1.545.2.1 2008/12/15 23:12:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1505,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,$pdfFormFields)=@temporary_array;
+    my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
     if ($laystyle eq 'L') {
 	$laystyle='album';
     } else {
@@ -1526,7 +1526,6 @@ 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 
@@ -3222,10 +3221,12 @@ CHOOSE_FROM_ANY_SEQUENCE
 	&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');         
@@ -3233,11 +3234,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');         
@@ -3245,14 +3248,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");
@@ -3260,16 +3265,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'}) { 
@@ -3442,16 +3447,12 @@ sub render {
     my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');
-    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>'
@@ -3492,12 +3493,6 @@ sub render {
     $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();
@@ -3512,7 +3507,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.pdfFormFields"};
+        $env{"form.$var.paper"};
     return 1;
 }