--- loncom/interface/lonparmset.pm	2006/04/14 11:55:58	1.286
+++ loncom/interface/lonparmset.pm	2007/03/17 02:14:26	1.362
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.286 2006/04/14 11:55:58 www Exp $
+# $Id: lonparmset.pm,v 1.362 2007/03/17 02:14:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,6 +63,9 @@ use Apache::lonhomework;
 use Apache::lonxml;
 use Apache::lonlocal;
 use Apache::lonnavmaps;
+use Apache::longroup;
+use Apache::lonrss;
+use LONCAPA qw(:DEFAULT :match);
 
 # --- Caches local to lonparmset
 
@@ -90,11 +93,11 @@ Inputs:  $what - a parameter spec (inclu
 
 Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 14 possible levels
 
-14 - General Course
-13 - Map or Folder level in course
+14- General Course
+13- Map or Folder level in course
 12- resource default
 11- map default
-10 - resource level in course
+10- resource level in course
 9 - General for section
 8 - Map or Folder level for section
 7 - resource level in section
@@ -117,15 +120,18 @@ sub parmval {
 sub parmval_by_symb {
     my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
 # load caches
-
     &cacheparmhash();
 
-    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    my $useropt;
+    if ($uname ne '' && $udom ne '') {
+	$useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+    }
 
     my $result='';
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$what;
     my $mapparm=$map.'___(all).'.$what;
@@ -170,7 +176,7 @@ sub parmval_by_symb {
     }
 
 # ------------------------------------------------------ fourth, back to course
-    if (defined($csec)) {
+    if ($csec ne '') {
         if (defined($$courseopt{$seclevel})) {
 	    $outpar[9]=$$courseopt{$seclevel};
 	    $result=9;
@@ -186,7 +192,7 @@ sub parmval_by_symb {
 	}
     }
 # ------------------------------------------------------ fifth, check course group
-    if (defined($cgroup)) {
+    if ($cgroup ne '') {
         if (defined($$courseopt{$grplevel})) {
             $outpar[6]=$$courseopt{$grplevel};
             $result=6;
@@ -203,7 +209,7 @@ sub parmval_by_symb {
 
 # ---------------------------------------------------------- fifth, check user
 
-    if (defined($uname)) {
+    if ($uname ne '') {
 	if (defined($$useropt{$courselevel})) {
 	    $outpar[3]=$$useropt{$courselevel};
 	    $result=3;
@@ -266,10 +272,8 @@ sub resetrulescache {
 
 sub rulescache {
     my $id=shift;
-    if ($rulesid ne $env{'request.course.id'}) {
-	%rules=();
-    }
-    unless (defined($rules{$id})) {
+    if ($rulesid ne $env{'request.course.id'}
+	&& !defined($rules{$id})) {
 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
@@ -394,41 +398,18 @@ sub storeparm_by_symb {
     return '';
 }
 
-{
-    my $logid;
-    sub log_parmset {
-	my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
-	$logid++;
-	my $id=time().'00000'.$$.'00000'.$logid;
-	&Apache::lonnet::put('nohist_parameterlog',
-			     {
-				 $id.'_exe_uname' => $env{'user.name'},
-				 $id.'_exe_udom'  => $env{'user.domain'},
-				 $id.'_exe_time'  => time(),
-				 $id.'_exe_ip'    => $ENV{'REMOTE_ADDR'},
-				 $id.'_symb'      => $symb,
-				 $id.'_spnam'     => $spnam,
-				 $id.'_snum'      => $snum,
-				 $id.'_nval'      => $nval,
-				 $id.'_ntype'     => $ntype,
-				 $id.'_uname'     => $uname,
-				 $id.'_udom'      => $udom,
-				 $id.'_csec'      => $csec,
-				 $id.'_cgroup'    => $cgroup
-			     },
-			     $env{'course.'.$env{'request.course.id'}.'.domain'},
-			     $env{'course.'.$env{'request.course.id'}.'.num'}
-			     );
-    }
+sub log_parmset {
+    return &Apache::lonnet::instructor_log('parameterlog',@_);
 }
 
 sub storeparm_by_symb_inner {
 # ---------------------------------------------------------- Get symb, map, etc
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
-    &log_parmset(@_);
 # ---------------------------------------------------------- Construct prefixes
     $spnam=~s/\_([^\_]+)$/\.$1/;
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    $map = &Apache::lonnet::deversion($map);
+
     my $symbparm=$symb.'.'.$spnam;
     my $mapparm=$map.'___(all).'.$spnam;
 
@@ -479,9 +460,11 @@ sub storeparm_by_symb_inner {
 	if ($delete) {
 	    $reply=&Apache::lonnet::del
 		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+            &log_parmset(\%storecontent,1);
 	} else {
 	    $reply=&Apache::lonnet::cput
 		('resourcedata',\%storecontent,$cdom,$cnum);
+	    &log_parmset(\%storecontent);
 	}
 	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
     } else {
@@ -502,15 +485,17 @@ sub storeparm_by_symb_inner {
 	if ($delete) {
 	    $reply=&Apache::lonnet::del
 		('resourcedata',[keys(%storecontent)],$udom,$uname);
+	    &log_parmset(\%storecontent,1,$uname,$udom);
 	} else {
 	    $reply=&Apache::lonnet::cput
 		('resourcedata',\%storecontent,$udom,$uname);
+	    &log_parmset(\%storecontent,0,$uname,$udom);
 	}
 	&Apache::lonnet::devalidateuserresdata($uname,$udom);
     }
     
     if ($reply=~/^error\:(.*)/) {
-	return "<font color=red>Write Error: $1</font>";
+	return "<span class=\"LC_error\">Write Error: $1</span>";
     }
     return '';
 }
@@ -524,21 +509,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 = '&nbsp;&nbsp;';
+	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);
@@ -564,7 +554,8 @@ sub valout {
             }
             $result=~s/\s+$//;
         } elsif (&isdateparm($type)) {
-            $result = localtime($value).&date_sanity_info($value);
+            $result = &Apache::lonlocal::locallocaltime($value).
+		&date_sanity_info($value);
         } else {
             $result = $value;
         }
@@ -606,7 +597,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 {
@@ -671,8 +662,7 @@ sub startpage {
 				       &page_js(),
 				       {'add_entries' => \%loaditems,});
     my $breadcrumbs = 
-	&Apache::lonhtmlcommon::breadcrumbs(undef,
-					    'Table Mode Parameter Setting');
+	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
     $r->print(<<ENDHEAD);
 $start_page
 $breadcrumbs
@@ -719,7 +709,7 @@ sub print_row {
     }
     my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
     if ($automatic) {
-	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
     }
     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
    
@@ -1074,15 +1064,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>");
@@ -1090,7 +1080,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>
@@ -1140,21 +1130,15 @@ sub usermenu {
 		    'oi'    => "or ID",
 		    'ad'    => "at Domain"
 				       );
-    my %sectionhash=();
     my $sections='';
-    my $numsec = &Apache::loncommon::get_sections(
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'},
-					 \%sectionhash);
+    my %sectionhash = &Apache::loncommon::get_sections();
+
     my $groups;
-    my %grouphash;
-    my $numgrp = &Apache::loncommon::coursegroups(
-                 \%grouphash,
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'});
-    if ($numsec > 0) {
+    my %grouphash = &Apache::longroup::coursegroups();
+
+    if (%sectionhash) {
         $sections=$lt{'se'}.': <select name="csec"';
-        if ($numsec && $numgrp && $parmlev ne 'full') {
+        if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
         $sections .= '>';
@@ -1165,7 +1149,7 @@ sub usermenu {
         }
         $sections.='</select>';
     }
-    if ($numsec && $numgrp && $parmlev ne 'full') {
+    if (%sectionhash && %grouphash && $parmlev ne 'full') {
         $sections .= '&nbsp;or&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
@@ -1191,9 +1175,10 @@ function group_or_section(caller) {
 </script>
 |;
     } 
-    if ($numgrp > 0) {
+
+    if (%grouphash) {
         $groups=$lt{'gr'}.': <select name="cgroup"';
-        if ($numsec && $numgrp && $env{'form.action'} eq 'settable') {
+        if (%sectionhash && $env{'form.action'} eq 'settable') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
@@ -1270,49 +1255,40 @@ sub levelmenu {
 
 sub sectionmenu {
     my ($r,$selectedsections)=@_;
-    my %sectionhash=();
-    my $sections='';
-    my $numsec = &Apache::loncommon::get_sections(
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'},
-					 \%sectionhash);
-    if ($numsec) {
-	$r->print('<select name="Section" multiple="true" size="8" >');
-	foreach my $s ('all',sort keys %sectionhash) {
-	    $r->print('    <option value="'.$s.'"');
-	    foreach (@{$selectedsections}) {
-		if ($s eq $_) {
-		    $r->print(' selected');
-		    last;
-		}
+    my %sectionhash = &Apache::loncommon::get_sections();
+    return if (!%sectionhash);
+
+    $r->print('<select name="Section" multiple="true" size="8" >');
+    foreach my $s ('all',sort keys %sectionhash) {
+	$r->print('    <option value="'.$s.'"');
+	foreach (@{$selectedsections}) {
+	    if ($s eq $_) {
+		$r->print(' selected');
+		last;
 	    }
-	    $r->print('>'.$s."</option>\n");
 	}
-        $r->print("</select>\n");
-   }
+	$r->print('>'.$s."</option>\n");
+    }
+    $r->print("</select>\n");
 }
 
 sub groupmenu {
     my ($r,$selectedgroups)=@_;
-    my %grouphash;
-    my $numgrp = &Apache::loncommon::coursegroups(
-                 \%grouphash,
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'});
-    if ($numgrp) {
-        $r->print('<select name="Group" multiple="true" size="8" >');
-        foreach my $group (sort(keys(%grouphash))) {
-            $r->print('    <option value="'.$group.'"');
-            foreach (@{$selectedgroups}) {
-                if ($group eq $_) {
-                    $r->print(' selected');
-                    last;
-                }
-            }
-            $r->print('>'.$group."</option>\n");
-        }
-        $r->print("</select>\n");
+    my %grouphash = &Apache::longroup::coursegroups();
+    return if (!%grouphash);
+
+    $r->print('<select name="Group" multiple="true" size="8" >');
+    foreach my $group (sort(keys(%grouphash))) {
+	$r->print('    <option value="'.$group.'"');
+	foreach (@{$selectedgroups}) {
+	    if ($group eq $_) {
+		$r->print(' selected');
+		last;
+	    }
+	}
+	$r->print('>'.$group."</option>\n");
     }
+    $r->print("</select>\n");
 }
 
 
@@ -1437,7 +1413,6 @@ sub assessparms {
     my $uhome;
     my $csec;
     my $cgroup;
-    my $grouplist;
     my @usersgroups = ();
  
     my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
@@ -1509,8 +1484,8 @@ sub assessparms {
 	    $id='';
 	} else {
 	    $message=
-		"<font color=red>".&mt("Unknown ID")." '$id' ".
-		&mt('at domain')." '$udom'</font>";
+		'<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
+		&mt('at domain')." '$udom'</span>";
 	}
     } else {
 	$uname=$env{'form.uname'};
@@ -1521,17 +1496,17 @@ sub assessparms {
 	$uhome=&Apache::lonnet::homeserver($uname,$udom);
         if ($uhome eq 'no_host') {
 	    $message=
-		"<font color=red>".&mt("Unknown user")." '$uname' ".
-		&mt("at domain")." '$udom'</font>";
+		'<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
+		&mt("at domain")." '$udom'</span>";
 	    $uname='';
         } else {
 	    $csec=&Apache::lonnet::getsection($udom,$uname,
 					      $env{'request.course.id'});
             
 	    if ($csec eq '-1') {
-		$message="<font color=red>".
+		$message='<span class="LC_error">'.
 		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
-		    &mt("not in this course")."</font>";
+		    &mt("not in this course")."</span>";
 		$uname='';
 		$csec=$env{'form.csec'};
                 $cgroup=$env{'form.cgroup'};
@@ -1541,18 +1516,14 @@ 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>';
 	    }
-            $grouplist = &Apache::lonnet::get_users_groups(
+            @usersgroups = &Apache::lonnet::get_users_groups(
                                        $udom,$uname,$env{'request.course.id'});
-            if ($grouplist) {
-                @usersgroups = &Apache::lonnet::sort_course_groups($grouplist,
-                                                    $env{'request.course.id'});
-                unless (grep/^\Q$cgroup\E$/,@usersgroups) {
+            if (@usersgroups > 0) {
+                unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
                     $cgroup = $usersgroups[0];
-                } 
-            } else {
-                $cgroup = '';
+                }
             }
         }
     }
@@ -1593,7 +1564,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) {
@@ -1608,8 +1579,9 @@ sub assessparms {
 	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
-        $r->print(&mt('Specific Resource').": ".$resource.
-                  '<input type="hidden" value="'.$pssymb.'" name="symb">'.
+	my $title = &Apache::lonnet::gettitle($pssymb);
+        $r->print(&mt('Specific Resource: [_1] ([_2])',$title,$resource).
+                  '<input type="hidden" value="'.$pssymb.'" name="symb" />'.
 		  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
 		  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
     }
@@ -1669,7 +1641,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>
 
@@ -1769,9 +1741,9 @@ ENDTABLEHEADFOUR
                              '</font></tt><p><b>'.
                              "<a href=\"javascript:openWindow('".
 				  &Apache::lonnet::clutter($uri).'?symb='.
-				  &Apache::lonnet::escape($symbp{$rid}).
-                             "', 'metadatafile', '450', '500', 'no', 'yes')\";".
-                             " TARGET=_self>$title");
+				  &escape($symbp{$rid}).
+                             "', 'metadatafile', '450', '500', 'no', 'yes');\"".
+                             " target=\"_self\">$title");
 
                         if ($thistitle) {
                             $r->print(' ('.$thistitle.')');
@@ -1968,7 +1940,7 @@ ENDMAPONE
             }
             
             if ($csec) {$r->print(&mt("Section")."<font color=\"red\"> <i>$csec</i></font>\n")};
-            if ($cgroup) {$r->print(&mt("Group")."<font color=\"red\"> <i>$csec</i></font>\n")};
+            if ($cgroup) {$r->print(&mt("Group")."<font color=\"red\"> <i>$cgroup</i></font>\n")};
             $r->print("</h4>\n");
 #---------------------------------------------------------------- print table
             $r->print('<p><table border="2">');
@@ -2011,8 +1983,8 @@ sub crsenv {
     my $r=shift;
     my $setoutput='';
 
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,
-						    'Edit Course Environment');
+    my $breadcrumbs = 
+	&Apache::lonhtmlcommon::breadcrumbs('Edit Course Environment');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
@@ -2035,7 +2007,7 @@ sub crsenv {
                 ('environment',
                  {'top level map backup '.$bkuptime => $tmp[1] },
                  $dom,$crs).
-                     '<br>';
+                     '<br />';
         }
         #
         # Deal with modified default spreadsheets
@@ -2113,9 +2085,14 @@ sub crsenv {
             }
         }
     }
+
+    my $start_table     =&Apache::loncommon::start_data_table();
+    my $start_header_row=&Apache::loncommon::start_data_table_header_row();
+    my $end_header_row  =&Apache::loncommon::end_data_table_header_row();
 # ------------------------- Re-init course environment entries for this session
 
-    &Apache::lonnet::coursedescription($env{'request.course.id'});
+    &Apache::lonnet::coursedescription($env{'request.course.id'},
+				       {'freshen_cache' => 1});
 
 # -------------------------------------------------------- Get parameters again
 
@@ -2128,9 +2105,9 @@ sub crsenv {
 	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
                                  '<a href="javascript:openbrowser'.
                                  "('envform','url','sequence')\">".
-                                 &mt('Select Map').'</a><br /><font color=red> '.
+                                 &mt('Select Map').'</a><br /><span class="LC_warning"> '.
                                  &mt('Modification may make assessment data inaccessible').
-                                 '</font>',
+                                 '</span>',
              'description'    => '<b>'.&mt('Course Description').'</b>',
              'courseid'       => '<b>'.&mt('Course ID or number').
                                  '</b><br />'.
@@ -2141,14 +2118,20 @@ 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>)',
+             'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
+                                 '</b>',
              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
                                  '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+             'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
+                                 '</b>',
              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+             'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
+                                 '</b>',
              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
                                  '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
@@ -2201,8 +2184,8 @@ sub crsenv {
                     '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
 	     'rndseed'
 	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
-                    '<font color="red">'.&mt('Modifying this will make problems').' '.
-                    &mt('have different numbers and answers').'</font>',
+                    '<span class="LC_error">'.&mt('Modifying this will make problems').' '.
+                    &mt('have different numbers and answers').'</span>',
 	     'receiptalg'
 	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
                     &mt('This controls how receipt numbers are generated.'),
@@ -2217,6 +2200,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</b>:  %n student name %c course id %a assignment note, numbers after the % limit the field size',
              'anonymous_quiz'
                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
@@ -2228,6 +2213,8 @@ sub crsenv {
              'disable_receipt_display'
                  => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+	     'task_messages'
+	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
 	     'disablesigfigs'
 	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
@@ -2242,7 +2229,7 @@ sub crsenv {
         my @Display_Order = ('url','description','courseid','cloners','grading',
                              'externalsyllabus',
                              'default_xml_style','pageseparators',
-                             'question.email','comment.email','policy.email',
+                             'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
                              'student_classlist_view',
                              'plc.roles.denied','plc.users.denied',
                              'pch.roles.denied','pch.users.denied',
@@ -2255,6 +2242,7 @@ sub crsenv {
                              'problem_stream_switch',
 			     'suppress_tries',
                              'default_paper_size',
+			     'print_header_format',
                              'disable_receipt_display',
                              'spreadsheet_default_classcalc',
                              'spreadsheet_default_studentcalc',
@@ -2264,7 +2252,8 @@ sub crsenv {
                              'default_enrollment_end_date',
 			     'tthoptions',
 			     'disablesigfigs',
-			     'disableexampointprint'
+			     'disableexampointprint',
+			     'task_messages'
                              );
 	foreach my $parameter (sort(keys(%values))) {
             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
@@ -2274,13 +2263,15 @@ sub crsenv {
                 }
             }
 	}
+	
         foreach my $parameter (@Display_Order) {
             my $description = $descriptions{$parameter};
             # onchange is javascript to automatically check the 'Set' button.
             my $onchange = 'onFocus="javascript:window.document.forms'.
                 "['envform'].elements['".$parameter."_setparmval']".
                 '.checked=true;"';
-            $output .= '<tr><td>'.$description.'</td>';
+            $output .= &Apache::loncommon::start_data_table_row().
+		'<td>'.$description.'</td>';
             if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
                 $output .= '<td>'.
                     &Apache::lonhtmlcommon::date_setter('envform',
@@ -2297,17 +2288,19 @@ sub crsenv {
             $output .= '<td>'.
                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
                 '</td>';
-            $output .= "</tr>\n";
+            $output .= &Apache::loncommon::end_data_table_row()."\n";
 	}
         my $onchange = 'onFocus="javascript:window.document.forms'.
             '[\'envform\'].elements[\'newp_setparmval\']'.
             '.checked=true;"';
-	$output.='<tr><td><i>'.&mt('Create New Environment Variable').'</i><br />'.
+	$output.=&Apache::loncommon::start_data_table_row().
+	    '<td><i>'.&mt('Create New Environment Variable').'</i><br />'.
 	    '<input type="text" size=40 name="newp_name" '.
                 $onchange.' /></td><td>'.
             '<input type="text" size=40 name="newp_value" '.
                 $onchange.' /></td><td>'.
-	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
+	    '<input type="checkbox" name="newp_setparmval" /></td>'.
+	    &Apache::loncommon::end_data_table_row()."\n";
     }
     my %lt=&Apache::lonlocal::texthash(
 		    'par'   => 'Parameter',
@@ -2325,20 +2318,22 @@ 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();
+    my $end_table=&Apache::loncommon::end_data_table();
     $r->print(<<ENDENV);
 $start_page
 $breadcrumbs
 <form method="post" action="/adm/parmset?action=crsenv" name="envform">
 $setoutput
-<p>
-<table border=2>
-<tr><th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th></tr>
+$start_table
+$start_header_row
+<th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th>
+$end_header_row
 $output
-</table>
+$end_table
 <input type="submit" name="crsenv" value="$lt{'sce'}">
 </form>
 $end_page
@@ -2354,7 +2349,7 @@ sub tablestart {
 	return '';
     } else {
 	$tableopen=1;
-	return '<table border="2"><tr><th>'.&mt('Parameter').'</th><th>'.
+	return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
 	    &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
     }
 }
@@ -2362,7 +2357,7 @@ sub tablestart {
 sub tableend {
     if ($tableopen) {
 	$tableopen=0;
-	return '</table>';
+	return &Apache::loncommon::end_data_table();
     } else {
 	return'';
     }
@@ -2376,8 +2371,7 @@ sub readdata {
 
     my $classlist=&Apache::loncoursedata::get_classlist();
     foreach (keys %$classlist) {
-        # the following undefs are for 'domain', and 'username' respectively.
-        if ($_=~/^(\w+)\:(\w+)$/) {
+        if ($_=~/^($match_username)\:($match_domain)$/) {
 	    my ($tuname,$tudom)=($1,$2);
 	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
             foreach my $userkey (keys %{$useropt}) {
@@ -2421,11 +2415,12 @@ sub storedata {
 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
 								 $tkey.'.type' => $typeof},
 						 $tudom,$tuname) eq 'ok') {
+			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
 			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
 				      &Apache::loncommon::plainname($tuname,$tudom));
 			} else {
-			    $r->print('<h2><font color="red">'.
-				      &mt('Error storing parameters').'</font></h2>');
+			    $r->print('<div class="LC_error">'.
+				      &mt('Error storing parameters').'</div>');
 			}
 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
 		    } else {
@@ -2436,14 +2431,15 @@ sub storedata {
 	    } elsif ($cmd eq 'del') {
 		if ($tuname) {
 		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+			    &log_parmset({$tkey=>''},1,$tuname,$tudom);
 			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
 		    } else {
-			$r->print('<h2><font color="red">'.
-				  &mt('Error deleting parameters').'</font></h2>');
+			$r->print('<div class="LC_error">'.
+				  &mt('Error deleting parameters').'</div>');
 		    }
 		    &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{$_});
@@ -2453,10 +2449,11 @@ sub storedata {
 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
 								 $tkey.'.type' => $typeof},
 						 $tudom,$tuname) eq 'ok') {
+			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
 			} else {
-			    $r->print('<h2><font color="red">'.
-				      &mt('Error storing parameters').'</font></h2>');
+			    $r->print('<div class="LC_error">'.
+				      &mt('Error storing parameters').'</div>');
 			}
 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
 		    } else {
@@ -2473,19 +2470,22 @@ sub storedata {
     my $putentries=$#newdatakeys+1;
     if ($delentries) {
 	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+	    my %loghash=map { $_ => '' } @deldata;
+	    &log_parmset(\%loghash,1);
 	    $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
 	} else {
-	    $r->print('<h2><font color="red">'.
-		      &mt('Error deleting parameters').'</font></h2>');
+	    $r->print('<div class="LC_error">'.
+		      &mt('Error deleting parameters').'</div>');
 	}
 	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
+			    &log_parmset(\%newdata,0);
 	    $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');
 	} else {
-	    $r->print('<h2><font color="red">'.
-		      &mt('Error storing parameters').'</font></h2>');
+	    $r->print('<div class="LC_error">'.
+		      &mt('Error storing parameters').'</div>');
 	}
 	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
@@ -2493,7 +2493,7 @@ sub storedata {
 
 sub extractuser {
     my $key=shift;
-    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
 }
 
 sub listdata {
@@ -2551,7 +2551,7 @@ sub listdata {
 	    my $section=&mt('All Students');
 	    if ($middle=~/^\[(.*)\]/) {
 		my $issection=$1;
-		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+		if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
 		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
 		} else {
 		    $section=&mt('Group/Section').': '.$issection;
@@ -2560,12 +2560,12 @@ sub listdata {
 	    }
 	    $middle=~s/\.+$//;
 	    $middle=~s/^\.+//;
-	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
+	    my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
+		$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
 	    } elsif ($middle) {
 		my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
-		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
+		$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
 	    }
 	    if ($sortorder eq 'realmstudent') {
 		if ($realm ne $oldrealm) {
@@ -2592,23 +2592,16 @@ sub listdata {
 	    }
 	    if ($part ne $oldpart) {
 		$r->print(&tableend().
-			  "\n<font color='blue'>".&mt('Part').": $part</font>");
+			  "\n<span class=\"LC_parm_part\">".&mt('Part').": $part</span>");
 		$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().'<tr><td><b>'.$name.
-		      ':</b></td><td><input type="checkbox" name="del_'.
+	    $r->print(&tablestart().
+		      &Apache::loncommon::start_data_table_row().
+		      '<td><b>'.&standard_parameter_names($name).
+		      '</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
 	    if (&isdateparm($thistype)) {
@@ -2618,7 +2611,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})
 			  );
@@ -2626,8 +2619,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"');
@@ -2645,15 +2636,13 @@ sub listdata {
 		my $showval;
 		if (defined($$resourcedata{$thiskey})) {
 		    $showval=$$resourcedata{$thiskey};
-		} else {
-		    $showval=$val;
 		}
 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
 			  $showval.'">');
 	    }
 	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
 		      $thistype.'">');
-	    $r->print('</td></tr>');
+	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
 	}
     }
     return $foundkeys;
@@ -2665,7 +2654,7 @@ sub newoverview {
     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('Set Parameters');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print(<<ENDOVER);
 $start_page
 $breadcrumbs
@@ -2723,24 +2712,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>');
@@ -2819,7 +2811,7 @@ sub overview {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $start_page=&Apache::loncommon::start_page('Modify Parameters');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print(<<ENDOVER);
 $start_page
 $breadcrumbs
@@ -2847,9 +2839,132 @@ 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>');
+	    my $display_value = $resourcedata->{$thiskey};
+	    if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
+		$display_value = 
+		    &Apache::lonlocal::locallocaltime($display_value);
+	    }
+	    $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(' <br />&nbsp;&nbsp;&nbsp;'.&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\:($match_username)\:($match_domain)/) {
+	    $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
@@ -3010,10 +3125,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',
@@ -3023,30 +3140,35 @@ 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,
-            },          
-	  { text => 'Parameter Change Log and Course Blog Posting',
+            help => 'Parameter_Overview',
+ 	    },          
+	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
             action => 'parameterchangelog',
             permission => $parm_permission,
             },
@@ -3054,19 +3176,19 @@ 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'});
         $menu_html.='<p>';
-        $menu_html.='<font size="+1">';
+        $menu_html.='<span class="LC_parm_menu_item">';
         if (exists($menu_item->{'url'})) {
             $menu_html.=qq{<a href="$menu_item->{'url'}">};
         } else {
             $menu_html.=
                 qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
         }
-        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        $menu_html.= &mt($menu_item->{'text'}).'</a></span>';
         if (exists($menu_item->{'help'})) {
             $menu_html.=
                 &Apache::loncommon::help_open_topic($menu_item->{'help'});
@@ -3078,39 +3200,202 @@ 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 />';
-
-    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 (!($options =~ /deleted/)) {
+        my @options= ( ['active', 'Show to student'],
+                    ['stuadd', 'Provide text area for students to type catalog information'],
+                    ['choices','Provide choices for students to select from']);
+#		   ['onlyone','Student may select only one choice']);
+        if ($added_flag) {
+            push @options,['deleted', 'Delete Metadata Field'];
+        }
+       $output = &Apache::loncommon::start_data_table_row();
+        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
+        foreach my $opt (@options) {
+	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+	    $output .= &Apache::loncommon::continue_data_table_row();
+	    $output .= '<td>'.('&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>';
+	    $output .= &Apache::loncommon::end_data_table_row();
+	}
+        $output .= &Apache::loncommon::continue_data_table_row();
+        $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
+        my $multiple_checked;
+        my $single_checked;
+        if ($options =~ m/onlyone/) {
+            $multiple_checked = "";
+            $single_checked = " CHECKED ";
+        } else {
+            $multiple_checked = " CHECKED ";
+            $single_checked = "";
+        }
+	$output .= &Apache::loncommon::continue_data_table_row();
+	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
+	            Student may select multiple choices from list</span></td>';
+	$output .= &Apache::loncommon::end_data_table_row();
+	$output .= &Apache::loncommon::continue_data_table_row();
+	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
+	            Student may select only one choice from list</span></td>';
+	$output .= &Apache::loncommon::end_data_table_row();
     }
     return ($output);
 }
-
+sub order_meta_fields {
+    my ($r)=@_;
+    my $idx = 1;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+    &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/parmset?action=setrestrictmeta",
+              text=>"Restrict Metadata"},
+             {text=>"Order Metadata"});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+    if ($env{'form.storeorder'}) {
+        my $newpos = $env{'form.newpos'} - 1;
+        my $currentpos = $env{'form.currentpos'} - 1;
+        my @neworder = ();
+        my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+        my $i;
+        if ($newpos > $currentpos) {
+        # moving stuff up
+            for ($i=0;$i<$currentpos;$i++) {
+        	$neworder[$i]=$oldorder[$i];
+            }
+            for ($i=$currentpos;$i<$newpos;$i++) {
+        	$neworder[$i]=$oldorder[$i+1];
+            }
+            $neworder[$newpos]=$oldorder[$currentpos];
+            for ($i=$newpos+1;$i<=$#oldorder;$i++) {
+        	$neworder[$i]=$oldorder[$i];
+            }
+        } else {
+        # moving stuff down
+    	    for ($i=0;$i<$newpos;$i++) {
+    	        $neworder[$i]=$oldorder[$i];
+    	    }
+    	    $neworder[$newpos]=$oldorder[$currentpos];
+    	    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
+    	        $neworder[$i]=$oldorder[$i-1];
+    	    }
+    	    for ($i=$currentpos+1;$i<=$#oldorder;$i++) {
+    	        $neworder[$i]=$oldorder[$i];
+    	    }
+        }
+	my $ordered_fields = join ",", @neworder;
+        my $put_result = &Apache::lonnet::put('environment',
+                           {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 	
+	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
+    }
+    my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
+    my $ordered_fields;
+    my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+    if (!@fields_in_order) {
+        # no order found, pick sorted order then create metadata.addedorder key.
+        foreach my $key (sort keys %$fields) {
+            push @fields_in_order, $key;
+            $ordered_fields = join ",", @fields_in_order;
+        }
+        my $put_result = &Apache::lonnet::put('environment',
+                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 
+    } 
+    $r->print('<table>');
+    my $num_fields = scalar(@fields_in_order);
+    foreach my $key (@fields_in_order) {
+        $r->print('<tr><td>');
+        $r->print('<form method="post" action="">');
+        $r->print('<select name="newpos" onChange="this.form.submit()">');
+        for (my $i = 1;$i le $num_fields;$i ++) {
+            if ($i eq $idx) {
+                $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
+            } else {
+                $r->print('<option value="'.$i.'">'.$i.'</option>');
+            }
+        }
+        $r->print('</select></td><td>');
+        $r->print('<input type="hidden" name="currentpos" value="'.$idx.'" />');
+        $r->print('<input type="hidden" name="storeorder" value="true" />');
+        $r->print('</form>');
+        $r->print($$fields{$key}.'</td></tr>');
+        $idx ++;
+    }
+    $r->print('</table>');
+    return 'ok';
+}
+sub continue {
+    my $output;
+    $output .= '<form action="" method="post">';
+    $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
+    $output .= '<input type="submit" value="Continue" />';
+    return ($output);
+}
+sub addmetafield {
+    my ($r)=@_;
+    $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    if (exists($env{'form.undelete'})) {
+        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
+        foreach my $meta_field(@meta_fields) {
+            my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
+            $options =~ s/deleted//;
+            $options =~ s/,,/,/;
+            my $put_result = &Apache::lonnet::put('environment',
+                                        {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
+                                        
+            $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+        }
+        $r->print(&continue());
+    } elsif (exists($env{'form.fieldname'})) {
+        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",
+                             'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
+        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+        $r->print(&continue());
+    } else {
+        my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
+        if ($fields) {
+            $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+            $r->print('<form method="post" action="">');
+            foreach my $key(keys(%$fields)) {
+                $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
+            }
+            $r->print('<input type="submit" name="undelete" value="Undelete" />');
+            $r->print('</form>');
+        }
+        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<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;
-    
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-						    'Restrict Metadata'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('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'}.'.'};
@@ -3126,12 +3411,18 @@ sub setrestrictmeta {
             	    if ($env{'form.'.$meta_field.'_stuadd'}) {
             	        $options.='stuadd,';
             	    } 
-            	    if ($env{'form.'.$meta_field.'_onlyone'}) {
+            	    if ($env{'form.'.$meta_field.'_choices'}) {
+            	        $options.='choices,';
+            	    } 
+            	    if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
             	        $options.='onlyone,';
             	    } 
             	    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,
@@ -3141,32 +3432,78 @@ sub setrestrictmeta {
             }
         }
     }
-    &Apache::lonnet::coursedescription($env{'request.course.id'});
+    &Apache::lonnet::coursedescription($env{'request.course.id'},
+				       {'freshen_cache' => 1});
+    # Get the default metadata fields
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+    # Now get possible added metadata fields
+    my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
+    my $row_alt = 1;
+    $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
-        &Apache::lonnet::logthis ($field);
         if ($field ne 'courserestricted') {
+            $row_alt = $row_alt ? 0 : 1;
 	    $output.= &output_row($r, $field, $metadata_fields{$field});
 	}
     }
+    my $buttons = (<<ENDButtons);
+        <input type="submit" name="restrictmeta" value="Save" />
+        </form><br />
+        <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+        </form>
+        <br />
+        <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+ENDButtons
+    my $added_flag = 1;
+    foreach my $field (sort(keys(%$added_metadata_fields))) {
+        $row_alt = $row_alt ? 0 : 1;
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+    }
+    $output .= &Apache::loncommon::end_data_table();
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
-        <p>
         $output
-        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+        $buttons
         </form>
 ENDenv
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
 ##################################################
-
+sub get_added_meta_fieldnames {
+    my ($cid) = @_;
+    my %fields;
+    foreach my $key(%env) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+            my $field_name = $1;
+            my ($display_field_name) = $env{$key};
+            $fields{$field_name} = $display_field_name;
+        }
+    }
+    return \%fields;
+}
+sub get_deleted_meta_fieldnames {
+    my ($cid) = @_;
+    my %fields;
+    foreach my $key(%env) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+            my $field_name = $1;
+            if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
+                my ($display_field_name) = $env{$key};
+                $fields{$field_name} = $display_field_name;
+            }
+        }
+    }
+    return \%fields;
+}
 sub defaultsetter {
     my ($r) = @_;
 
     my $start_page = 
 	&Apache::loncommon::start_page('Parameter Setting Default Actions');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Defaults');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print(<<ENDDEFHEAD);
 $start_page
 $breadcrumbs
@@ -3255,11 +3592,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})) {
@@ -3308,129 +3649,251 @@ 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 parm_change_log {
-    my ($r)=@_;
-    &startpage($r);
+sub components {
+    my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
 
-    my @ids=();
-    my %symbp=();
-    my %mapp=();
-    my %typep=();
-    my %keyp=();
-    my %uris=();
-    my %maptitles=();
+    if ($typeflag) {
+	$key=~s/\.type$//;
+    }
 
-# -------------------------------------------------------- Variable declaration
+    my ($middle,$part,$name)=
+	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    my $issection;
 
-    my %allmaps=();
-    my %alllevs=();
+    my $section=&mt('All Students');
+    if ($middle=~/^\[(.*)\]/) {
+	$issection=$1;
+	$section=&mt('Group/Section').': '.$issection;
+	$middle=~s/^\[(.*)\]//;
+    }
+    $middle=~s/\.+$//;
+    $middle=~s/^\.+//;
+    if ($uname) {
+	$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
+	$issection='';
+    }
+    my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+    my $realmdescription=&mt('all resources'); 
+    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+	$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
+ 	$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+   } elsif ($middle) {
+	my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+	$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
+	$realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
+    }
+    my $what=$part.'.'.$name;
+    return ($realm,$section,$name,$part,
+	    $what,$middle,$uname,$udom,$issection,$realmdescription);
+}
 
-    my $uname;
-    my $udom;
-    my $uhome;
-    my $csec;
-    my $cgroup;
-    my $grouplist;
-    my @usersgroups = ();
- 
-    my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
+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);	
+}
 
-    $alllevs{'Resource Level'}='full';
-    $alllevs{'Map/Folder Level'}='map';
-    $alllevs{'Course Level'}='general';
+sub standard_parameter_names {
+    my ($name)=@_;
+    if (!%standard_parms) {
+	&load_parameter_names();
+    }
+    if ($standard_parms{$name}) {
+	return $standard_parms{$name}; 
+    } else { 
+	return $name; 
+    }
+}
 
-    my %allparms;
-    my %allparts;
-    my %keyorder;
-# --------------------------------------------------------- Get all assessments
-    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, 
-				\%mapp, \%symbp,\%maptitles,\%uris,
-				\%keyorder);
+#
+# Parameter Change Log
+#
 
-    $mapp{'0.0'} = '';
-    $symbp{'0.0'} = '';
 
-    my %level=&Apache::lonlocal::texthash('parmlevel_14' => 'General Course',
-					  'parmlevel_13' => 'Map or Folder level in course',
-					  'parmlevel_12' => 'Resource default',
-					  'parmlevel_11' => 'Map default',
-					  'parmlevel_10' => 'Resource level in course',
-					  'parmlevel_9' => 'General for section',
-					  'parmlevel_8' => 'Map or Folder level for section',
-					  'parmlevel_7' => 'Resource level in section',
-					  'parmlevel_6' => 'General for group',
-					  'parmlevel_5' => 'Map or Folder level for group',
-					  'parmlevel_4' => 'Resource level in group',
-					  'parmlevel_3' => 'General for specific student',
-					  'parmlevel_2' => 'Map or Folder level for specific student',
-					  'parmlevel_1' => 'Resource level for specific student');
-
-#    $id.'_exe_uname' => $env{'user.name'},
-#    $id.'_exe_udom'  => $env{'user.domain'},
-#    $id.'_exe_time'  => time(),
-#    $id.'_exe_ip'    => $ENV{'REMOTE_ADDR'},
-#    $id.'_symb'      => $symb,
-#    $id.'_spnam'     => $spnam,
-#    $id.'_snum'      => $snum,
-#    $id.'_nval'      => $nval,
-#    $id.'_ntype'     => $ntype,
-#    $id.'_uname'     => $uname,
-#    $id.'_udom'      => $udom,
-#    $id.'_csec'      => $csec,
-#    $id.'_cgroup'    => $cgroup
+sub parm_change_log {
+    my ($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'});
-    my %exetime=();
-    foreach my $key (keys %parmlog) {
-	if ($key=~/^(.+)\_exe\_time$/) {
-	    $exetime{$1}=$parmlog{$key};
-	}
-    }
-    $r->print('<table border="2">');
-    foreach my $id (sort { $exetime{$a}<=>$exetime{$b} } keys %exetime) {
-        my ($part,$name)=($parmlog{$id.'_spnam'}=~/^(.*)[\_\.]([^\_\.]+)$/);
-        my $spnam=$part.'_'.$name;
-	$r->print('<tr><td>'.
-		  &Apache::lonlocal::locallocaltime($parmlog{$id.'_exe_time'}).
-		  '</td><td>'.
-		  &Apache::loncommon::aboutmewrapper(
-						     &Apache::loncommon::plainname($parmlog{$id.'_exe_uname'},
-										   $parmlog{$id.'_exe_udom'}),
-						     $parmlog{$id.'_exe_uname'},
-						     $parmlog{$id.'_exe_udom'}).'<br /><tt>'.
-		  $parmlog{$id.'_exe_uname'}.'@'.$parmlog{$id.'_exe_udom'}.'</tt>'.
-		  ((($parmlog{$id.'_exe_uname'} ne $env{'user.name'}) ||
-		    ($parmlog{$id.'_exe_udom'} ne $env{'user.domain'}))?
-		   '<br />'.&Apache::loncommon::messagewrapper(&mt('Send message'),
-							       $parmlog{$id.'_exe_uname'},
-							       $parmlog{$id.'_exe_udom'}):'').
-		  '</td><td>'.
-                  $level{'parmlevel_'.$parmlog{$id.'_snum'}}.
-                  '</td><td>'.
-                  &mt($allparms{$name}).'<br /><tt>'.$name.'</tt>'.
-                  '</td><td>'.
-                  ($part?&mt('Part: [_1]',$part):&mt('All parts')).
-		  '</td><td>'.
-                  $parmlog{$id.'_symb'}.
-		  '</td><td>'.
-		  ($parmlog{$id.'_nval'}?
-		   (&isdateparm($spnam)?&Apache::lonlocal::locallocaltime($parmlog{$id.'_nval'}):$parmlog{$id.'_nval'})
-		   :&mt('Deleted Parameter')).
-		  '</td></tr>');
+
+    if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
+
+    $r->print('<form action="/adm/parmset?action=parameterchangelog"
+                     method="post" name="parameterlog">');
+    
+    my %saveable_parameters = ('show' => 'scalar',);
+    &Apache::loncommon::store_course_settings('parameter_log',
+                                              \%saveable_parameters);
+    &Apache::loncommon::restore_course_settings('parameter_log',
+                                                \%saveable_parameters);
+    $r->print(&Apache::loncommon::display_filter().
+              '<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'});
+    $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
+	      '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
+	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
+	      &Apache::loncommon::end_data_table_header_row());
+    my $shown=0;
+    my $folder='';
+    if ($env{'form.displayfilter'} eq 'currentfolder') {
+	my $last='';
+	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+		&GDBM_READER(),0640)) {
+	    $last=$hash{'last_known'};
+	    untie(%hash);
+	}
+	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
+    }
+    foreach my $id (sort 
+		    {
+			if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+			    return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+			}
+			my $aid = (split('00000',$a))[-1];
+			my $bid = (split('00000',$b))[-1];
+			return $bid<=>$aid;
+		    } (keys(%parmlog))) {
+        my @changes=keys(%{$parmlog{$id}{'logentry'}});
+	my $count = 0;
+	my $time =
+	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
+	my $plainname = 
+	    &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
+					  $parmlog{$id}{'exe_udom'});
+	my $about_me_link = 
+	    &Apache::loncommon::aboutmewrapper($plainname,
+					       $parmlog{$id}{'exe_uname'},
+					       $parmlog{$id}{'exe_udom'});
+	my $send_msg_link='';
+	if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'}) 
+	     || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+	    $send_msg_link ='<br />'.
+		&Apache::loncommon::messagewrapper(&mt('Send message'),
+						   $parmlog{$id}{'exe_uname'},
+						   $parmlog{$id}{'exe_udom'});
+	}
+	my $row_start=&Apache::loncommon::start_data_table_row();
+	my $makenewrow=0;
+	my %istype=();
+	my $output;
+	foreach my $changed (reverse(sort(@changes))) {
+            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 ($env{'form.displayfilter'} eq 'currentfolder') {
+		if ($folder) {
+		    if ($middle!~/^\Q$folder\E/) { next; }
+		}
+	    }
+	    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>';
+	    my $stillactive=0;
+	    if ($parmlog{$id}{'delflag'}) {
+		$output .= &mt('Deleted');
+	    } else {
+		if ($typeflag) {
+		    $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})) {
+			$output .= &Apache::lonlocal::locallocaltime($value);
+		    } else {
+			$output .= $value;
+		    }
+		    if ($value ne $all[$level]) {
+			$output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
+		    } else {
+			$stillactive=1;
+		    }
+		}
+	    }
+	    $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)) {
+		    $output .= 
+			&Apache::loncommon::messagewrapper('Notify User',
+							   $uname,$udom,$title,
+							   $description);
+		} else {
+		    $output .= 
+			&Apache::lonrss::course_blog_link($id,$title,
+							  $description);
+		}
+	    }
+	    $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+	}
+        if ($env{'form.displayfilter'} eq 'containing') {
+	    my $wholeentry=$about_me_link.':'.
+		$parmlog{$id}{'exe_uname'}.':'.$parmlog{$id}{'exe_udom'}.':'.
+		$output;
+	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }        
+	}
+        if ($count) {
+	    $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>'.$output);
+	    $shown++;
+	}
+	if (!($env{'form.show'} eq &mt('all') 
+	      || $shown<=$env{'form.show'})) { last; }
     }
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table());
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub check_for_course_info {
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    return 1 if ($navmap);
+    return 0;
+}
+
 ##################################################
 ##################################################
 
@@ -3466,14 +3929,17 @@ 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 =
 	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
 	 &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
 				  $env{'request.course.sec'}));
-    if ($env{'request.course.id'} &&  $parm_permission) {
+    my $exists = &check_for_course_info();
+
+    if ($env{'request.course.id'} &&  $parm_permission && $exists) {
 
         # Start Page
         &Apache::loncommon::content_type($r,'text/html');
@@ -3491,12 +3957,13 @@ 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'})) {
             $r->print(&header());
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-							 'Parameter Manager'));
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
             &print_main_menu($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
@@ -3506,6 +3973,14 @@ 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 'ordermetadata' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+						    text=>"Add Metadata Field"});
+	    &order_meta_fields($r);
         } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
 						    text=>"Restrict Metadata"});
@@ -3525,13 +4000,22 @@ sub handler {
 	    &assessparms($r);
         } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Parameter Change Log and Course Blog Posting"});
+						    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
-	$env{'user.error.msg'}=
-	    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+	if ($exists) {
+	    $env{'user.error.msg'}=
+		"/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+	} else {
+	    $env{'user.error.msg'}=
+		"/adm/parmset::0:1:Course environment gone, reinitialize the course";
+	}
 	return HTTP_NOT_ACCEPTABLE;
     }
     return OK;