--- loncom/interface/lonparmset.pm	2006/06/23 05:25:27	1.316
+++ loncom/interface/lonparmset.pm	2006/09/07 21:57:52	1.334
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.316 2006/06/23 05:25:27 albertel Exp $
+# $Id: lonparmset.pm,v 1.334 2006/09/07 21:57:52 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -508,21 +508,26 @@ sub storeparm_by_symb_inner {
 
 Format a value for output.
 
-Inputs:  $value, $type
+Inputs:  $value, $type, $editable
 
 Returns: $value, formatted for output.  If $type indicates it is a date,
 localtime($value) is returned.
+$editable will return an icon to click on
 
 =cut
 
 ##################################################
 ##################################################
 sub valout {
-    my ($value,$type)=@_;
+    my ($value,$type,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
-	$result = '  ';
+	if ($editable) {
+	    $result = '<span class="LC_clickhere">*</span>';
+	} else {
+	    $result='&nbsp;';
+	}
     } else {
         if ($type eq 'date_interval') {
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
@@ -590,7 +595,7 @@ sub plink {
     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$marker.'" /></td></tr><tr><td align="center">'.
 	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
 	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
-		&valout($value,$type).'</a></td></tr></table>';
+		&valout($value,$type,1).'</a></td></tr></table>';
 }
 
 sub page_js {
@@ -655,7 +660,7 @@ sub startpage {
 				       &page_js(),
 				       {'add_entries' => \%loaditems,});
     my $breadcrumbs = 
-	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting');
+	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
     $r->print(<<ENDHEAD);
 $start_page
 $breadcrumbs
@@ -1057,15 +1062,15 @@ sub parmmenu {
 </script>
 ENDSCRIPT
     $r->print();
-    $r->print("\n<table><tr>");
+    $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
     my $cnt=0;
     foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
+	$r->print("\n<td><label><input type='checkbox' name='pscat' ");
 	$r->print('value="'.$tempkey.'"');
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $r->print(' checked');
 	}
-	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
+	$r->print('>'.$$allparms{$tempkey}.'</label></td>');
  	$cnt++;
         if ($cnt==3) {
 	    $r->print("</tr>\n<tr>");
@@ -1073,7 +1078,7 @@ ENDSCRIPT
 	}
     }
     $r->print('
-</tr><tr><td>
+</tr><tr id=\"LC_parm_overview_parm_menu_selectors\"><td>
 <a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
 <a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
 </td><td>
@@ -2187,6 +2192,8 @@ sub crsenv {
                     ' ('.&mt('supported types').': Letter [8 1/2x11 in], Legal [8 1/2x14 in],'. 
                     ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'. 
                     ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
+	     'print_header_format'
+	         => '<b>Print header format; substitutions:  %n student name %c course id %a assignment',
              'anonymous_quiz'
                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
@@ -2227,6 +2234,7 @@ sub crsenv {
                              'problem_stream_switch',
 			     'suppress_tries',
                              'default_paper_size',
+			     'print_header_format',
                              'disable_receipt_display',
                              'spreadsheet_default_classcalc',
                              'spreadsheet_default_studentcalc',
@@ -2302,7 +2310,7 @@ sub crsenv {
 	'</script>';
     
     my $start_page = 
-	&Apache::loncommon::start_page('Set Course Environment Parameters',
+	&Apache::loncommon::start_page('Set Course Environment',
 				       $browse_js);
     my $end_page = 
 	&Apache::loncommon::end_page();
@@ -2424,7 +2432,7 @@ sub storedata {
 		    }
 		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
 		} else {
-		    push (@deldata,$thiskey);
+		    push (@deldata,$thiskey,$thiskey.'.type');
 		}
 	    } elsif ($cmd eq 'datepointer') {
 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
@@ -2581,15 +2589,6 @@ sub listdata {
 		$oldpart=$part;
 	    }
 #
-# Preset defaults?
-#
-            my ($hour,$min,$sec,$val)=('','','','');
-	    unless ($$resourcedata{$thiskey}) {
-		my ($parmname)=($thiskey=~/\.(\w+)$/);
-		($hour,$min,$sec,$val)=&preset_defaults($parmname);
-	    }
-
-#
 # Ready to print
 #
 	    $r->print(&tablestart().
@@ -2605,7 +2604,7 @@ sub listdata {
 			  &Apache::lonhtmlcommon::date_setter('parmform',
 							      $jskey,
 						      $$resourcedata{$thiskey},
-							      '',1,'','',$hour,$min,$sec).
+							      '',1,'','').
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
 &date_sanity_info($$resourcedata{$thiskey})
 			  );
@@ -2613,8 +2612,6 @@ sub listdata {
 		my $showval;
 		if (defined($$resourcedata{$thiskey})) {
 		    $showval=$$resourcedata{$thiskey};
-		} else {
-		    $showval=$val;
 		}
 		$r->print('<label><input type="radio" name="set_'.$thiskey.
 			  '" value="yes"');
@@ -2632,8 +2629,6 @@ sub listdata {
 		my $showval;
 		if (defined($$resourcedata{$thiskey})) {
 		    $showval=$$resourcedata{$thiskey};
-		} else {
-		    $showval=$val;
 		}
 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
 			  $showval.'">');
@@ -2710,24 +2705,27 @@ ENDOVER
 
 # Menu to select levels, etc
 
-    $r->print('<table border="1"><tr><td>');
+    $r->print('<table id="LC_parm_overview_scope">
+               <tr><td class="LC_parm_overview_level_menu">');
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
-	$r->print('<td>');
+	$r->print('<td class="LC_parm_overview_map_menu">');
 	&mapmenu($r,\%allmaps,$pschp,\%maptitles);
 	$r->print('</td>');
     }
     $r->print('</td></tr></table>');
 
-    $r->print('<table border="1"><tr><td>');  
+    $r->print('<table id="LC_parm_overview_controls">
+               <tr><td class="LC_parm_overview_parm_selectors">');  
     &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $r->print('</td><td><table border="0" cellspacing="0" cellpadding="0">'.
-              '<tr><td>'.&mt('Parts').'</td><td></td><td>'.&mt('Section(s)').
-              '</td><td></td><td>'.&mt('Group(s)').'</td></tr><tr><td>');
+    $r->print('</td><td class="LC_parm_overview_restrictions">
+                <table class="LC_parm_overview_restrictions">'.
+              '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
+              '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
-    $r->print('</td><td>&nbsp;</td><td>');
+    $r->print('</td><td>');
     &sectionmenu($r,\@selected_sections);
-    $r->print('</td><td>&nbsp;</td><td>');
+    $r->print('</td><td>');
     &groupmenu($r,\@selected_groups);
     $r->print('</td></tr></table>');
     $r->print('</td></tr></table>');
@@ -2834,9 +2832,127 @@ ENDOVER
 	      &Apache::loncommon::end_page());
 }
 
+sub clean_parameters {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my $start_page=&Apache::loncommon::start_page('Clean Parameters');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
+    $r->print(<<ENDOVER);
+$start_page
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=cleanparameters" name="parmform">
+ENDOVER
+# Store modified
+
+    &storedata($r,$crs,$dom);
+
+# Read modified data
+
+    my $resourcedata=&readdata($crs,$dom);
+
+# List data
+
+    $r->print('<h3>'.
+	      &mt('These parameters refer to resources that do not exist.').
+	      '</h3>'.
+	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.'<br />'.
+	      '<br />');
+    $r->print(&Apache::loncommon::start_data_table().
+	      '<tr>'.
+	      '<th>'.&mt('Delete').'</th>'.
+	      '<th>'.&mt('Parameter').'</th>'.
+	      '</tr>');
+    foreach my $thiskey (sort(keys(%{$resourcedata}))) {
+	next if (!exists($resourcedata->{$thiskey.'.type'})
+		 && $thiskey=~/\.type$/);
+	my %data = &parse_key($thiskey);
+	if (exists($data{'realm_exists'})
+	    && !$data{'realm_exists'}) {
+	    $r->print(&Apache::loncommon::start_data_table_row().
+		      '<tr>'.
+		      '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'		      );
+	    
+	    $r->print('<td>');
+	    $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
+			  &standard_parameter_names($data{'parameter_name'}),
+			  $resourcedata->{$thiskey}));
+	    $r->print('<br />');
+	    if ($data{'scope_type'} eq 'all') {
+		$r->print(&mt('All users'));
+	    } elsif ($data{'scope_type'} eq 'user') {
+		$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
+	    } elsif ($data{'scope_type'} eq 'section') {
+		$r->print(&mt('Section: [_1]',$data{'scope'}));
+	    } elsif ($data{'scope_type'} eq 'group') {
+		$r->print(&mt('Group: [_1]',$data{'scope'}));
+	    }
+	    $r->print('<br />');
+	    if ($data{'realm_type'} eq 'all') {
+		$r->print(&mt('All Resources'));
+	    } elsif ($data{'realm_type'} eq 'folder') {
+		$r->print(&mt('Folder: [_1]'),$data{'realm'});
+	    } elsif ($data{'realm_type'} eq 'symb') {
+		my ($map,$resid,$url) =
+		    &Apache::lonnet::decode_symb($data{'realm'});
+		$r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
+			      $url,$resid,$map));
+	    }
+	    $r->print(&mt('Part: [_1]',$data{'parameter_part'}));
+	    $r->print('</td></tr>');
+	
+	}
+    }
+    $r->print(&Apache::loncommon::end_data_table().'<p>'.
+	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.
+	      '</p></form>'.
+	      &Apache::loncommon::end_page());
+}
+
+sub parse_key {
+    my ($key) = @_;
+    my %data;
+    my ($middle,$part,$name)=
+	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    $data{'scope_type'} = 'all';
+    if ($middle=~/^\[(.*)\]/) {
+       	$data{'scope'} = $1;
+	if ($data{'scope'}=~/^useropt\:(\w+)\:(\w+)/) {
+	    $data{'scope_type'} = 'user';
+	    $data{'scope'} = [$1,$2];
+	} else {
+	    #FIXME check for group scope
+	    $data{'scope_type'} = 'section';
+	}
+	$middle=~s/^\[(.*)\]//;
+    }
+    $middle=~s/\.+$//;
+    $middle=~s/^\.+//;
+    $data{'realm_type'}='all';
+    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+	$data{'realm'} = $1;
+	$data{'realm_type'} = 'folder';
+	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+	($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
+	&Apache::lonnet::logthis($1." siad ".	$data{'realm_exists'} );
+    } elsif ($middle) {
+	$data{'realm'} = $middle;
+	$data{'realm_type'} = 'symb';
+	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+	my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
+	$data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
+    }
+    
+    $data{'parameter_part'} = $part;
+    $data{'parameter_name'} = $name;
+
+    return %data;
+}
+
 ##################################################
 ##################################################
-                                                                                            
+
 =pod
 
 =item check_cloners
@@ -2997,10 +3113,12 @@ ENDMAINFORMHEAD
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
 
     my @menu =
-        (
-          { text => 'Set Course Environment Parameters',
+        ( { divider=>'Settings for Your Course',
+	  },
+          { text => 'Set Course Environment',
 	    action => 'crsenv',
             permission => $parm_permission,
+            help => 'Course_Environment',
             },
           { text => 'Set Portfolio Metadata',
 	    action => 'setrestrictmeta',
@@ -3010,29 +3128,34 @@ ENDMAINFORMHEAD
 	    url => '/adm/slotrequest?command=showslots',
 	    permission => $vgr,
             },
-	  { divider => 1,
+          { text => 'Set Parameter Setting Default Actions',
+            action => 'setdefaults',
+            permission => $parm_permission,
+            },          
+	  { divider => 'New and Existing Parameter Settings for Your Resources',
 	    },
           { text => 'Set/Modify Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
             permission => $parm_permission,
+            help => 'Parameter_Helper',
             },
-          { text => 'Modify Resource Parameters - Overview Mode',
-            action => 'setoverview',
-            permission => $parm_permission,
-            },          
-	  { text => 'Set Resource Parameters - Overview Mode',
+ 	  { text => 'Set/Modify Resource Parameters - Overview Mode',
             action => 'newoverview',
             permission => $parm_permission,
+            help => 'Parameter_Overview',
             },
           { text => 'Set/Modify Resource Parameters - Table Mode',
             action => 'settable',
             permission => $parm_permission,
-            help => 'Cascading_Parameters',
+            help => 'Table_Mode',
             },
-          { text => 'Set Parameter Setting Default Actions',
-            action => 'setdefaults',
+           { divider => 'Existing Parameter Settings for Your Resources',
+	  },
+	  { text => 'Modify Resource Parameters - Overview Mode',
+            action => 'setoverview',
             permission => $parm_permission,
-            },          
+            help => 'Parameter_Overview',
+ 	    },          
 	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
             action => 'parameterchangelog',
             permission => $parm_permission,
@@ -3041,7 +3164,7 @@ ENDMAINFORMHEAD
     my $menu_html = '';
     foreach my $menu_item (@menu) {
 	if ($menu_item->{'divider'}) {
-	    $menu_html .= '<hr />';
+	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
 	    next;
 	}
         next if (! $menu_item->{'permission'});
@@ -3087,14 +3210,25 @@ sub output_row {
     }
     return ($output);
 }
-
+sub addmetafield {
+    my ($r)=@_;
+    $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
+    if (exists($env{'form.fieldname'})) {
+        $r->print('Here is a field');
+    }
+    $r->print('<form method="post" action="/adm/parmset?action=addmetadata"');
+    $r->print('<input type="text" name="fieldname" /><br />');
+    $r->print('<input type="submit" value="Add Metadata Field" />');
+    $r->print('</form>');
+}
 sub setrestrictmeta {
     my ($r)=@_;
     my $next_meta;
     my $output;
     my $item_num;
     my $put_result;
-    
+    &Apache::lonnet::logthis("restricting metadata");    
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -3141,6 +3275,9 @@ sub setrestrictmeta {
         <p>
         $output
         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+        </form><br />
+        <form method="post" action="/adm/parmset?action=addmetadata" name="form">
+        <input type="submit" name="restrictmeta" value="Add a Metadata Field">
         </form>
 ENDenv
     $r->print(&Apache::loncommon::end_page());
@@ -3242,11 +3379,15 @@ ENDDEFHEAD
     }
 $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
 	  &mt('Automatic setting rules apply to table mode interfaces only.'));
-    $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
-	      &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
+    $r->print("\n".&Apache::loncommon::start_data_table().
+	      &Apache::loncommon::start_data_table_header_row().
+	      "<th>".&mt('Rule for parameter').'</th><th>'.
+	      &mt('Action').'</th><th>'.&mt('Value').'</th>'.
+	      &Apache::loncommon::end_data_table_header_row());
     foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
 	unless ($tempkey) { next; }
-	$r->print("\n<tr><td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
+	$r->print("\n".&Apache::loncommon::start_data_table_row().
+		  "<td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
 	my $action=&rulescache($tempkey.'_action');
 	$r->print('<select name="'.$tempkey.'_action">');
 	if (&isdateparm($defkeytype{$tempkey})) {
@@ -3295,23 +3436,26 @@ ENDYESNO
         } else {
 	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
 	}
-        $r->print('</td></tr>');
+        $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
-    $r->print("</table>\n<input type='submit' name='storerules' value='".
+    $r->print(&Apache::loncommon::end_data_table().
+	      "\n<input type='submit' name='storerules' value='".
 	      &mt('Store Rules')."' /></form>\n".
 	      &Apache::loncommon::end_page());
     return;
 }
 
 sub components {
-    my ($key,$uname,$udom,$exeuser,$exedomain)=@_;
-    my $typeflag=0;
-    if ($key=~/\.type$/) {
+    my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
+
+    if ($typeflag) {
 	$key=~s/\.type$//;
-        $typeflag=1;
     }
+
+    my ($middle,$part,$name)=
+	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
     my $issection;
-    my ($middle,$part,$name)=($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+
     my $section=&mt('All Students');
     if ($middle=~/^\[(.*)\]/) {
 	$issection=$1;
@@ -3335,31 +3479,33 @@ sub components {
 	$realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
     }
     my $what=$part.'.'.$name;
-    return ($realm,$section,$name,$part,$typeflag,
+    return ($realm,$section,$name,$part,
 	    $what,$middle,$uname,$udom,$issection,$realmdescription);
 }
 
+my %standard_parms;
+sub load_parameter_names {
+    open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+    while (my $configline=<$config>) {
+	if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
+	chomp($configline);
+	my ($short,$plain)=split(/:/,$configline);
+	my (undef,$name,$type)=split(/\&/,$short,3);
+	if ($type eq 'display') {
+	    $standard_parms{$name} = $plain;
+	}
+    }
+    close($config);
+    $standard_parms{'int_pos'}      = 'Positive Integer';
+    $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+    %standard_parms=&Apache::lonlocal::texthash(%standard_parms);	
+}
+
 sub standard_parameter_names {
     my ($name)=@_;
-    my %standard_parms=&Apache::lonlocal::texthash('duedate' => 'Due Date',
-						   'answerdate' => 'Answer Date',
-						   'opendate' => 'Open Date',
-						   'maxtries' => 'Max. Number of Tries',
-						   'weight' => 'Weight',
-						   'date_start' => 'Starting Date',
-						   'date_end' => 'Ending Date',
-                                                   'interval' => 'Time Interval Length',
-                                                   'tol' => 'Numerical Tolerance',
-                                                   'sig' => 'Significant Digits',
-                                                   'contentopen' => 'Content Opening Date',
-                                                   'contentclose' => 'Content Closing Date',
-                                                   'discussend' => 'End of Discussion Time',
-                                                   'discusshide' => 'Discussion Hidden',
-                                                   'problemstatus' => 'Problem Status Visible',
-						   'int_pos' => 'Positive Integer',
-						   'int_zero_pos' => 'Positive Integer or Zero',
-						   'hinttries' => 'Number of Tries till Hints appear',
-                                                   'numbubbles' => 'Number of Bubbles in Exam Mode');
+    if (!%standard_parms) {
+	&load_parameter_names();
+    }
     if ($standard_parms{$name}) {
 	return $standard_parms{$name}; 
     } else { 
@@ -3374,17 +3520,17 @@ sub standard_parameter_names {
 
 sub parm_change_log {
     my ($r)=@_;
-    &startpage($r);
+    $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
+
     my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
 				      $env{'course.'.$env{'request.course.id'}.'.domain'},
 				      $env{'course.'.$env{'request.course.id'}.'.num'});
 
     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
 
-    $r->print('<form action="/adm/parmset?action=settable"
-                     method="post" name"parameterlog">
-               <input type="hidden" name="action"
-                      value="parameterchangelog" />');
+    $r->print('<form action="/adm/parmset?action=parameterchangelog"
+                     method="post" name="parameterlog">');
     
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('parameter_log',
@@ -3398,7 +3544,9 @@ sub parm_change_log {
 				    (&mt('all'),10,20,50,100,1000,10000));
 
     $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
-	      '<input type="submit" value="'.&mt('Display').'" />');
+              '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
+	      ' '.&mt('Include parameter types').'</label>'.
+	      '<input type="submit" value="'.&mt('Display').'" /></form>');
 
     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
 						     $env{'course.'.$env{'request.course.id'}.'.domain'});
@@ -3409,7 +3557,7 @@ sub parm_change_log {
     my $shown=0;
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});
-	my $count=$#changes+1;
+	my $count = 0;
 	my $time =
 	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
 	my $plainname = 
@@ -3428,68 +3576,79 @@ sub parm_change_log {
 						   $parmlog{$id}{'exe_udom'});
 	}
 	my $row_start=&Apache::loncommon::start_data_table_row();
-	$r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>
-                       <td rowspan="'.$count.'">'.$about_me_link.
-		  '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
-			          ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
-		  $send_msg_link.'</td>');
+	$r->print($row_start);
 	my $makenewrow=0;
 	my %istype=();
+	my $output;
 	foreach my $changed (reverse(sort(@changes))) {
-            my $value=$parmlog{$id}{'logentry'}->{$changed};
-            my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection,$realmdescription)=
-		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'});
-	    if ($typeflag) { $istype{$parmname}=$value; }
-	    if ($makenewrow) { $r->print($row_start); } else { $makenewrow=1; }
-	    $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+            my $value=$parmlog{$id}{'logentry'}{$changed};
+	    my $typeflag = ($changed =~/\.type$/ &&
+			    !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
+            my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
+		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+	    if ($typeflag) {
+		$istype{$parmname}=$value; 
+		if (!$env{'form.includetypes'}) { next; } 
+	    }
+	    $count++;
+	    if ($makenewrow) {
+		$output .= $row_start;
+	    } else {
+		$makenewrow=1;
+	    }
+	    $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
 		      &standard_parameter_names($parmname).'</td><td>'.
-		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>');
+		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
 	    my $stillactive=0;
-	    if ($parmlog{$id}{'deleteflag'}) {
-		$r->print(&mt('Deleted'));
+	    if ($parmlog{$id}{'delflag'}) {
+		$output .= &mt('Deleted');
 	    } else {
 		if ($typeflag) {
-		    $r->print(&mt('Type: [_1]',&standard_parameter_names($value)));
+		    $output .= &mt('Type: [_1]',&standard_parameter_names($value));
 		} else {
 		    my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
 						      $uname,$udom,$issection,$issection,$courseopt);
 		    if (&isdateparm($istype{$parmname})) {
-			$r->print(&Apache::lonlocal::locallocaltime($value));
+			$output .= &Apache::lonlocal::locallocaltime($value);
 		    } else {
-			$r->print($value);
+			$output .= $value;
 		    }
 		    if ($value ne $all[$level]) {
-			$r->print('<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>');
+			$output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
 		    } else {
 			$stillactive=1;
 		    }
 		}
 	    }
-	    $r->print('</td>');
+	    $output .= '</td><td>';
 	    if ($stillactive) {
 		my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
                 my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
 				    (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
 		if (($uname) && ($udom)) {
-		    $r->print('<td>'.
-			      &Apache::loncommon::messagewrapper('Notify User',$uname,$udom,$title,$description).
-			      '</td>');
+		    $output .= 
+			&Apache::loncommon::messagewrapper('Notify User',
+							   $uname,$udom,$title,
+							   $description);
 		} else {
-		    $r->print('<td>'.
-			      &Apache::lonrss::course_blog_link($id,$title,$description).
-			      '</td>');
+		    $output .= 
+			&Apache::lonrss::course_blog_link($id,$title,
+							  $description);
 		}
-	    } else {
-		$r->print('<td>&nbsp;</td>');
 	    }
-	    $r->print(&Apache::loncommon::end_data_table_row());
+	    $output .= '</td>'.&Apache::loncommon::end_data_table_row();
 	}
+	$r->print('<td rowspan="'.$count.'">'.$time.'</td>
+                       <td rowspan="'.$count.'">'.$about_me_link.
+		  '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
+			          ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
+		  $send_msg_link.'</td>'.$output);
+
 	$shown++;
 	if (!($env{'form.show'} eq &mt('all') 
 	      || $shown<=$env{'form.show'})) { last; }
     }
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3528,7 +3687,8 @@ sub handler {
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
 					    text=>"Parameter Manager",
 					    faq=>10,
-					    bug=>'Instructor Interface'});
+					    bug=>'Instructor Interface',
+                                            help => 'Parameter_Manager'});
 
 # ----------------------------------------------------- Needs to be in a course
     my $parm_permission =
@@ -3553,6 +3713,8 @@ sub handler {
         #  the table mode
         if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
 	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+            &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+						    text=>"Problem Parameters"});
 	    &assessparms($r);
 
         } elsif (! exists($env{'form.action'})) {
@@ -3567,6 +3729,10 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});
 	    &overview($r);
+	} elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+						    text=>"Add Metadata Field"});
+	    &addmetafield($r);
         } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
 						    text=>"Restrict Metadata"});
@@ -3588,6 +3754,10 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
 						    text=>"Parameter Change Log"});
 	    &parm_change_log($r);
+        } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
+						    text=>"Clean Parameters"});
+	    &clean_parameters($r);
 	}       
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms