--- loncom/interface/lonparmset.pm	2006/09/08 20:49:19	1.335
+++ loncom/interface/lonparmset.pm	2006/09/28 23:58:53	1.338
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.335 2006/09/08 20:49:19 banghart Exp $
+# $Id: lonparmset.pm,v 1.338 2006/09/28 23:58:53 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1514,7 +1514,7 @@ sub assessparms {
 		$message="\n<p>\n".&mt("Full Name").": ".
 		    $name{'firstname'}.' '.$name{'middlename'}.' '
 			.$name{'lastname'}.' '.$name{'generation'}.
-			    "<br>\n".&mt('ID').": ".$name{'id'}.'<p>';
+			    "<br />\n".&mt('ID').": ".$name{'id'}.'<p>';
 	    }
             @usersgroups = &Apache::lonnet::get_users_groups(
                                        $udom,$uname,$env{'request.course.id'});
@@ -1562,7 +1562,7 @@ sub assessparms {
     foreach ('tolerance','date_default','date_start','date_end',
 	     'date_interval','int','float','string') {
 	$r->print('<input type="hidden" value="'.
-		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'" />');
     }
                         
     if (!$pssymb) {
@@ -1639,7 +1639,7 @@ sub assessparms {
 					      );
            $r->print(<<ENDTABLETWO);
 <th rowspan=3>$lt{'pie'}</th>
-<th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
+<th rowspan=3>$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
 </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
 <th colspan=1>$lt{'ic'}</th>
 
@@ -1740,8 +1740,8 @@ ENDTABLEHEADFOUR
                              "<a href=\"javascript:openWindow('".
 				  &Apache::lonnet::clutter($uri).'?symb='.
 				  &escape($symbp{$rid}).
-                             "', 'metadatafile', '450', '500', 'no', 'yes')\";".
-                             " TARGET=_self>$title");
+                             "', 'metadatafile', '450', '500', 'no', 'yes');\"".
+                             " target=\"_self\">$title");
 
                         if ($thistitle) {
                             $r->print(' ('.$thistitle.')');
@@ -2005,7 +2005,7 @@ sub crsenv {
                 ('environment',
                  {'top level map backup '.$bkuptime => $tmp[1] },
                  $dom,$crs).
-                     '<br>';
+                     '<br />';
         }
         #
         # Deal with modified default spreadsheets
@@ -2116,7 +2116,7 @@ sub crsenv {
              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
-                    ",'sty')\">$SelectStyleFile</a><br>",
+                    ",'sty')\">$SelectStyleFile</a><br />",
              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
                                  '</b><br />(<tt>user:domain,'.
                                  'user:domain(section;section;...;*;...),...</tt>)',
@@ -3188,25 +3188,30 @@ ENDMAINFORMHEAD
 }
 ### Set portfolio metadata
 sub output_row {
-    my ($r, $field_name, $field_text) = @_;
+    my ($r, $field_name, $field_text, $added_flag) = @_;
     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'};
-    unless (defined($options)) {
+    if (!defined($options)) {
         $options = 'active,stuadd';
         $values = '';
     }
-    $output.='<strong>'.$field_text.':</strong>';
-    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+    if (!($options =~ /deleted/)) {
+        $output.='<strong>'.$field_text.':</strong>';
+        $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
 
-    my @options= ( ['active', 'Show to student'],
+        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 />';
+        if ($added_flag) {
+            push @options,['deleted', 'Delete Metadata Field'];
+        }
+        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 />';
+	}
     }
     return ($output);
 }
@@ -3220,6 +3225,7 @@ sub addmetafield {
         my $meta_field = $env{'form.fieldname'};
         my $display_field = $env{'form.fieldname'};
         $meta_field =~ s/\W/_/g;
+        $meta_field =~ tr/A-Z/a-z/;
         my $put_result = &Apache::lonnet::put('environment',
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
@@ -3261,6 +3267,10 @@ sub setrestrictmeta {
             	    if ($env{'form.'.$meta_field.'_active'}) {
             	        $options.='active,';
             	    }
+            	    if ($env{'form.'.$meta_field.'_deleted'}) {
+            	        $options.='deleted,';
+            	    }
+            	    
                     my $name = $save_field;
                      $put_result = &Apache::lonnet::put('environment',
                                                   {'metadata.'.$meta_field.'.options'=>$options,
@@ -3281,8 +3291,9 @@ sub setrestrictmeta {
 	    $output.= &output_row($r, $field, $metadata_fields{$field});
 	}
     }
+    my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field});
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag);
     }
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">