[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

albertel lon-capa-cvs@mail.lon-capa.org
Fri, 30 Jun 2006 21:37:10 -0000


albertel		Fri Jun 30 17:37:10 2006 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - swithch the code selector to a drop down and add in a blank one
  - since the default of all got removed need to call adjust number to print
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.451 loncom/interface/lonprintout.pm:1.452
--- loncom/interface/lonprintout.pm:1.451	Fri Jun 30 17:26:53 2006
+++ loncom/interface/lonprintout.pm	Fri Jun 30 17:37:05 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.451 2006/06/30 21:26:53 albertel Exp $
+# $Id: lonprintout.pm,v 1.452 2006/06/30 21:37:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1562,6 +1562,7 @@
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+	 &adjust_number_to_print($helper);
 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
 	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
 	     $number_per_page=$num_todo;
@@ -2304,7 +2305,7 @@
 	    }
 	}
 
-	my $code_selection = "<choice></choice>\n";
+	my $code_selection;
 	foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
 	    my $choice  = $code;
 	    if ($code =~ /^[A-Z]+$/) { # Alpha code
@@ -2316,11 +2317,12 @@
 	    $code_selection .='   
 	    <message><b>Choose single code from list</b></message>
 		<message></td><td></message>
-		<choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+		<dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+                  <choice></choice>
                   <exec>
                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
                   </exec>
-		</choices>
+		</dropdown>
 	    <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
             '.$/;