--- loncom/interface/lonparmset.pm	2005/10/14 04:25:56	1.259
+++ loncom/interface/lonparmset.pm	2005/11/11 20:37:47	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.259 2005/10/14 04:25:56 banghart Exp $
+# $Id: lonparmset.pm,v 1.264 2005/11/11 20:37:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2753,35 +2753,24 @@ ENDMAINFORMHEAD
 sub output_row {
     my ($r, $field_name, $field_text) = @_;
     my $output;
-    my $options=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.options'};
-    my $values=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.values'};
-    my $checked;
+    my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
+    my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
     unless (defined($options)) {
         $options = 'active,stuadd';
-        $values = 'Type a list of values separated by commas.';
+        $values = '';
     }
-    if ($options =~ m/active/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = '  ';
-    }
-    $output.='<tr><td><center><input type="checkbox" name="'.$field_name.'_active" value="yes"'.$checked.' /></center></td>';
-    $output.='<td><strong>'.$field_text.'</strong></td>';
-    $output.='<td><input name="'.$field_name.'_values" type="text" value="'.$values.'" /></td>';
-    if ($options =~ m/onlyone/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = '  ';
-    }
-    $output.='<td><center><input type="checkbox" name="'.$field_name.'_onlyone" value="yes"'.$checked.' /></center></td>';
-    if ($options =~ m/stuadd/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = ' ';
+    $output.='<strong>'.$field_text.':</strong>';
+    $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.='<td><input type="checkbox" name="'.$field_name.'_stuadd" value="yes"'.$checked.' /></td>';
-    
-    $output.='</tr>';
     return ($output);
 }
 
@@ -2793,11 +2782,11 @@ sub setrestrictmeta {
     my $put_result;
     $r->print(&Apache::lonxml::xmlbegin());
     $r->print('<head>
-            <title>LON-CAPA Set Portfolio Metadata</title>
+            <title>LON-CAPA Restrict Metadata</title>
             </head>');
-    $r->print(&Apache::loncommon::bodytag('Set Portfolio Metadata'));
+    $r->print(&Apache::loncommon::bodytag('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-						    'Set Portfolio Metadata'));
+						    'Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
@@ -2821,34 +2810,25 @@ sub setrestrictmeta {
             	    }
                     my $name = $save_field;
                      $put_result = &Apache::lonnet::put('environment',
-                                                  {$meta_field.'.options'=>$options,
-                                                   $meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+                                                  {'metadata.'.$meta_field.'.options'=>$options,
+                                                   'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
                                                    },$dom,$crs);
                 }
             }
         }
-        
     }
     &Apache::lonnet::coursedescription($env{'request.course.id'});
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
-    
     foreach my $field (sort(keys(%metadata_fields))) {
 	$output.= &output_row($r, $field, $metadata_fields{$field});
     }
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
-        
         <p>
-        <table border=2>
-        <tr><th>Active</th><th>Metadata Item</th><th>Values</th><th>Only One Choice</th><th>Student Can Add Choices</th></tr>
         $output
-        </table>
         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
         </form>
-
 ENDenv
-        
-    
     $r->print('</body>
                 </html>');
     return 'ok';
