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

[albertel]

albertel		Fri Nov 11 15:37:47 2005 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm 
  Log:
  - removing some copy and paste coding
  - <label>
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.263 loncom/interface/lonparmset.pm:1.264
--- loncom/interface/lonparmset.pm:1.263	Fri Nov  4 15:08:09 2005
+++ loncom/interface/lonparmset.pm	Fri Nov 11 15:37:47 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.263 2005/11/04 20:08:09 banghart Exp $
+# $Id: lonparmset.pm,v 1.264 2005/11/11 20:37:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2755,34 +2755,22 @@
     my $output;
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
-    my $checked;
     unless (defined($options)) {
         $options = 'active,stuadd';
         $values = '';
     }
     $output.='<strong>'.$field_text.':</strong>';
-    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" /><br />';
-    if ($options =~ m/active/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = '  ';
-    }
-    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_active" value="yes"'.$checked.' />';
-    $output.='Show to student <br />';
-    if ($options =~ m/onlyone/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = '  ';
-    }
-    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_onlyone" value="yes"'.$checked.' />';
-    $output.='Student may select only one choice <br />';
-    if ($options =~ m/stuadd/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = ' ';
+    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+
+    my @options= ( ['active', 'Show to student'],
+		   ['onlyone','Student may select only one choice'],
+		   ['stuadd', 'Student may type choices']);
+    foreach my $opt (@options) {
+	my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+	$output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+	    &mt($opt->[1]).'</label> <br />';
     }
-    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_stuadd" value="yes"'.$checked.' />';
-    $output.='Student may type choices <br />';
     return ($output);
 }