--- loncom/interface/lonprintout.pm	2008/10/31 18:02:33	1.544
+++ loncom/interface/lonprintout.pm	2008/12/06 12:49:18	1.546
@@ -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.546 2008/12/06 12:49:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2696,9 +2696,9 @@ sub printHelper {
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
-        push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
@@ -2727,8 +2727,8 @@ HELPERFRAGMENT
 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }
 
-    # If the user has pfo (print for otheres) allow them to print all 
-    # problems and resources  in the entier course, optionally for selected students
+    # If the user has pfo (print for others) allow them to print all 
+    # problems and resources  in the entire course, optionally for selected students
     if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
@@ -2778,8 +2778,8 @@ HELPERFRAGMENT
 ALL_PROBLEMS
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
-	    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'];
+	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_students', 'CHOOSE_STUDENTS'];
+	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
 
 	my $randomly_ordered_warning = 
@@ -2957,8 +2957,8 @@ CHOOSE_ANON1
 
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
-	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
+	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
 	    
 
@@ -3081,7 +3081,7 @@ CHOOSE_ANON2
 	) {
 
 	my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
-        push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+        push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
 
@@ -3222,10 +3222,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 +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');         
@@ -3245,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");
@@ -3260,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'}) {