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

[banghart]

banghart		Mon Nov 20 16:04:45 2006 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm 
  Log:
  	Use existing data_table calls.
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.346 loncom/interface/lonparmset.pm:1.347
--- loncom/interface/lonparmset.pm:1.346	Wed Nov 15 17:33:13 2006
+++ loncom/interface/lonparmset.pm	Mon Nov 20 16:04:44 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.346 2006/11/15 22:33:13 banghart Exp $
+# $Id: lonparmset.pm,v 1.347 2006/11/20 21:04:44 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3188,15 +3188,9 @@
 }
 ### Set portfolio metadata
 sub output_row {
-    my ($r, $field_name, $field_text, $added_flag, $alt_row) = @_;
+    my ($r, $field_name, $field_text, $added_flag) = @_;
     my $row_class;
-    if ($alt_row) {
-        $row_class = ' class="LC_metadata_light" ';
-    } else {
-        $row_class = ' class="LC_metadata_dark" ';
-    }
     my $output;
-    $output = "<tr $row_class>";
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
     if (!defined($options)) {
@@ -3204,10 +3198,11 @@
         $values = '';
     }
     if (!($options =~ /deleted/)) {
-        $output = "<tr $row_class>";
+        $output = &Apache::loncommon::start_data_table_row();
         $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+        # $output .= '<td><strong>'.$field_text.':</strong></td>';
         $output .= '<td><span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
-        $output .= "</tr>\n";
+        $output .= &Apache::loncommon::end_data_table_row();
         my @options= ( ['active', 'Show to student'],
 		   ['onlyone','Student may select only one choice'],
 		   ['stuadd', 'Student may type choices']);
@@ -3216,9 +3211,11 @@
         }
         foreach my $opt (@options) {
 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
-	    $output .= '<tr '.$row_class.'><td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
+	    $output .= &Apache::loncommon::continue_data_table_row();
+	    $output .= '<td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
 	        $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-	        &mt($opt->[1]).'</label></span> </td></tr>'."\n";
+	        &mt($opt->[1]).'</label></span> </td>';
+	    $output .= &Apache::loncommon::end_data_table_row();
 	}
 	
     }
@@ -3402,11 +3399,11 @@
     # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
     my $row_alt = 1;
-    $output .= '<table class="LC_metadata_table" cellspacing="0">';
+    $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
         if ($field ne 'courserestricted') {
             $row_alt = $row_alt ? 0 : 1;
-	    $output.= &output_row($r, $field, $metadata_fields{$field}, undef, $row_alt);
+	    $output.= &output_row($r, $field, $metadata_fields{$field});
 	}
     }
     my $added_flag = 1;
@@ -3414,7 +3411,7 @@
         $row_alt = $row_alt ? 0 : 1;
         $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
     }
-    $output .= "</table>";
+    $output .= &Apache::loncommon::end_data_table();
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
         $output