--- loncom/interface/lonhtmlcommon.pm	2010/06/10 16:14:34	1.278
+++ loncom/interface/lonhtmlcommon.pm	2010/07/09 14:40:20	1.280
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.278 2010/06/10 16:14:34 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.280 2010/07/09 14:40:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -940,7 +940,7 @@ Inputs:
 =item $extraInfo A description of the items being iterated over.  Typically
 'student'.
 
-=item $step (optional) counter step. Will be set to default 1 if ommited.
+=item $step (optional) counter step. Will be set to default 1 if ommited. step must be greater than 0 or empty.
 
 =back
 
@@ -1052,9 +1052,7 @@ sub Update_PrgWin {
 # increment progress state
 sub Increment_PrgWin {
     my ($r,$prog_state,$extraInfo,$step)=@_;
-    if ( ($step == 0) || ($step !~ /^\d+(\.\d+)*$/) ) {
-        $step = 1; # default
-    }
+    $step = $step > 0 ? $step : 1;
     $$prog_state{'done'} += $step;
 
     # Catch (max modulo step) <> 0
@@ -1811,15 +1809,15 @@ sub role_select_row {
 
 sub course_select_row {
     my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
-	$css_class,$crstype) = @_;
+	$css_class,$crstype,$standardnames) = @_;
     my $output = &row_title($title,$css_class);
-    $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype);
+    $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype,$standardnames);
     $output .= &row_closure();
     return $output;
 }
 
 sub course_selection {
-    my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype) = @_;
+    my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype,$standardnames) = @_;
     my $output = qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1866,7 +1864,7 @@ sub course_selection {
         if ($numtitles > 0) {
             $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
-               '<select name="'.$$codetitles[0].
+               '<select name="'.$standardnames->[0].
                '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
                ' <option value="-1" />Select'."\n";
             my @items = ();
@@ -1896,7 +1894,7 @@ sub course_selection {
             $output .= '</select></td>';
             for (my $i=1; $i<$numtitles; $i++) {
                 $output .= '<td>'.$$codetitles[$i].'<br />'."\n".
-                          '<select name="'.$$codetitles[$i].
+                          '<select name="'.$standardnames->[$i].
                           '" onChange="courseSet('."'$$codetitles[$i]'".')">'."\n".
                           '<option value="-1">&lt;-Pick '.$$codetitles[$i-1].'</option>'."\n".
                           '</select>'."\n".