--- loncom/interface/lonprintout.pm	2006/06/26 22:16:06	1.446
+++ loncom/interface/lonprintout.pm	2006/06/30 01:11:04	1.449
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.446 2006/06/26 22:16:06 foxr Exp $
+# $Id: lonprintout.pm,v 1.449 2006/06/30 01:11:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1805,9 +1805,6 @@ sub print_resources {
     }
     #  Fullname may have special latex characters that need \ prefixing:
     #
-#    &Apache::lonnet::logthis("Prior to latex escape: $fullname");
-#    $fullname = &escape_LaTeX($fullname);
-#    &Apache::lonnet::logthis("After escape $fullname");
 
     my $i           = 0;
     #goes through all resources, checks if they are available for 
@@ -2268,8 +2265,8 @@ ALL_PROBLEMS
        <choice computer="all">All assignments in a single PDF file</choice>
        <choice computer="sections">Each PDF contains exactly one section</choice>
        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT" relateddefault="all">
-            Specify Number:</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+            Specify the number of assignments per PDF:</choice>
     </choices>
     </state>
 RESOURCE_SELECTOR
@@ -2317,10 +2314,16 @@ CHOOSE_STUDENTS
 	}
 	if (%codes_to_print) {
 	    $code_selection .='   
-             <exec>
-               push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
-            </exec>
+	    <message><b>Choose single code from list</b></message>
+		<message></td><td></message>
+		<choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+                  <exec>
+                     push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+                  </exec>
+		</choices>
+	    <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
             '.$/;
+
 	}
 
 	
@@ -2378,12 +2381,9 @@ CHOOSE_STUDENTS
         </validator>
     </string>
     <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
-    <message><b>Choose single code from list</b></message>
-    <message></td><td></message>
-    <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
         $code_selection
-    </choices>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+
+    
     <message><b>Reprint a set of saved CODEs:</b></message>
     <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
@@ -2429,8 +2429,8 @@ CHOOSE_ANON1
        <choice computer="all">All assignments in a single PDF file</choice>
        <choice computer="sections">Each PDF contains exactly one section</choice>
        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT" relateddefault="all">
-           Specify Number:</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+           Specify the number of assignments per PDF:</choice>
     </choices>
     </state>
 RESOURCE_SELECTOR
@@ -2489,12 +2489,7 @@ CHOOSE_STUDENTS1
         </validator>
     </string>
     <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
-    <message><b>Choose single code from list</b></message>
-    <message></td><td></message>
-    <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
         $code_selection
-    </dropdown>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>
     <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
@@ -2548,7 +2543,7 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
-      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },1,0);
+      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
 	</choicefunc>
       </resource>
     </state>