--- loncom/interface/lonparmset.pm	2006/09/08 20:49:19	1.335
+++ loncom/interface/lonparmset.pm	2015/08/28 22:44:59	1.553
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.335 2006/09/08 20:49:19 banghart Exp $
+# $Id: lonparmset.pm,v 1.553 2015/08/28 22:44:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,8 +44,262 @@ This module sets coursewide and assessme
 
 =head1 INTERNAL SUBROUTINES
 
+=over
+
+=item parmval()
+
+Figure out a cascading parameter.
+
+Inputs:  $what - a parameter spec (incluse part info and name I.E. 0.weight)
+         $id   - a bighash Id number
+         $def  - the resource's default value   'stupid emacs
+
+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
+12- resource default
+11- map default
+10- resource level in course
+9 - General for section
+8 - Map or Folder level for section
+7 - resource level in section
+6 - General for group
+5 - Map or Folder level for group
+4 - resource level in group
+3 - General for specific student
+2 - Map or Folder level for specific student
+1 - resource level for specific student
+
+=item parmval_by_symb()
+
+=item reset_caches()
+
+=item cacheparmhash() 
+
+=item parmhash()
+
+=item symbcache()
+
+=item preset_defaults()
+
+=item date_sanity_info()
+
+=item storeparm()
+
+Store a parameter by symb
+
+    Takes
+    - symb
+    - name of parameter
+    - level
+    - new value
+    - new type
+    - username
+    - userdomain
+
+=item log_parmset()
+
+=item storeparm_by_symb_inner()
+
+=item valout()
+
+Format a value for output.
+
+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
+
+=item plink()
+
+Produces a link anchor.
+
+Inputs: $type,$dis,$value,$marker,$return,$call
+
+Returns: scalar with html code for a link which will envoke the 
+javascript function 'pjump'.
+
+=item page_js()
+
+=item startpage()
+
+=item print_row()
+
+=item print_td()
+
+=item print_usergroups()
+
+=item parm_control_group()
+
+=item extractResourceInformation() : 
+
+ extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.
+
+Input: See list below
+
+=over 4
+
+=item * B<env{'user.name'}> : Current username
+
+=item * B<env{'user.domain'}> : Domain of current user.
+
+=item * B<env{"request.course.fn"}> : Course
+
+=back
+
+Outputs: See list below:
+
 =over 4
 
+=item * B<ids> (out) : An array that will contain all of the ids in the course.
+
+=item * B<typep>(out) : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
+
+=item * B<keyp> (out) : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
+
+=item * B<allparms> (out) : hash, name of parameter->display value (what is the display value?)
+
+=item * B<allparts> (out) : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+
+=item * B<allmaps> (out) : hash, ???
+
+=item * B<mapp> : ??
+
+=item * B<symbp> : hash, id->full sym?
+
+=item * B<maptitles>
+
+=item * B<uris>
+
+=item * B<keyorder>
+
+=item * B<defkeytype>
+
+=back
+
+=item isdateparm()
+
+=item parmmenu()
+
+=item partmenu()
+
+=item usermenu()
+
+=item displaymenu()
+
+=item mapmenu()
+
+=item levelmenu()
+
+=item sectionmenu()
+
+=item keysplit()
+
+=item keysinorder()
+
+=item keysinorder_bytype()
+
+=item keysindisplayorder()
+
+=item standardkeyorder()
+
+=item assessparms() : 
+
+Show assessment data and parameters.  This is a large routine that should
+be simplified and shortened... someday.
+
+Inputs: $r - the Apache request object.
+  
+Returns: nothing
+
+Variables used (guessed by Jeremy):
+
+=over
+
+=item * B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
+
+=item * B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
+
+=item * B<@catmarker> contains list of all possible parameters including part #s
+
+=item * B<$fullkeyp> contains the full part/id # for the extraction of proper parameters
+
+=item * B<$tempkeyp> contains part 0 only (no ids - ie, subparts)
+        When storing information, store as part 0
+        When requesting information, request from full part
+
+=back
+
+=item tablestart()
+
+=item tableend()
+
+=item extractuser()
+
+=item parse_listdata_key()
+
+=item listdata()
+
+=item date_interval_selector()
+
+=item get_date_interval_from_form()
+
+=item default_selector()
+
+=item string_selector()
+
+=item dateshift()
+
+=item newoverview()
+
+=item secgroup_lister()
+
+=item overview()
+
+=item clean_parameters()
+
+=item date_shift_one()
+
+=item date_shift_two()
+
+=item parse_key()
+
+=item header()
+
+Output html header for page
+
+=item print_main_menu()
+
+=item output_row()
+
+Set portfolio metadata
+
+=item order_meta_fields()
+
+=item addmetafield()
+
+=item setrestrictmeta()
+
+=item get_added_meta_fieldnames()
+
+=item get_deleted_meta_fieldnames()
+
+=item defaultsetter()
+
+=item components()
+
+=item load_parameter_names()
+
+=item parm_change_log()
+
+=item handler() : 
+
+Main handler.  Calls &assessparms subroutine.
+
+=back
+
 =cut
 
 ###################################################################
@@ -65,52 +319,35 @@ use Apache::lonlocal;
 use Apache::lonnavmaps;
 use Apache::longroup;
 use Apache::lonrss;
-use LONCAPA;
-
-# --- Caches local to lonparmset
-
-my $parmhashid;
-my %parmhash;
-my $symbsid;
-my %symbs;
-my $rulesid;
-my %rules;
+use HTML::Entities;
+use LONCAPA qw(:DEFAULT :match);
 
-# --- end local caches
 
-##################################################
-##################################################
+sub startSettingsScreen {
+    my ($r,$mode,$crstype)=@_;
 
-=pod
-
-=item parmval
+    my $tabtext = &mt('Course Settings');
+    if ($crstype eq 'Community') {
+        $tabtext = &mt('Community Settings');
+    } 
+    $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
+    $r->print("\n".'<li'.($mode eq 'coursepref'?' class="active"':'').'><a href="/adm/courseprefs"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
+                                          $tabtext.
+                                          '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+
+    $r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').' id="tabbededitor"><a href="/adm/parmset"><b>'.
+                                                                 &mt('Content and Problem Settings').'</b></a></li>');
+    $r->print("\n".'</ul>'."\n");
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;" id="parameditor"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+}
 
-Figure out a cascading parameter.
+sub endSettingsScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>');
+}
 
-Inputs:  $what - a parameter spec (incluse part info and name I.E. 0.weight)
-         $id   - a bighash Id number
-         $def  - the resource's default value   'stupid emacs
 
-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
-12- resource default
-11- map default
-10- resource level in course
-9 - General for section
-8 - Map or Folder level for section
-7 - resource level in section
-6 - General for group
-5 - Map or Folder level for group
-4 - resource level in group
-3 - General for specific student
-2 - Map or Folder level for specific student
-1 - resource level for specific student
-
-=cut
-
-##################################################
 sub parmval {
     my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
@@ -119,15 +356,16 @@ 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];    
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];
     $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$what;
@@ -149,13 +387,13 @@ sub parmval_by_symb {
 # --------------------------------------------------------- first, check course
 
     if (defined($$courseopt{$courselevel})) {
-	$outpar[14]=$$courseopt{$courselevel};
-	$result=14;
+    $outpar[14]=$$courseopt{$courselevel};
+    $result=14;
     }
 
     if (defined($$courseopt{$courselevelm})) {
-	$outpar[13]=$$courseopt{$courselevelm};
-	$result=13;
+    $outpar[13]=$$courseopt{$courselevelm};
+    $result=13;
     }
 
 # ------------------------------------------------------- second, check default
@@ -164,32 +402,32 @@ sub parmval_by_symb {
 
 # ------------------------------------------------------ third, check map parms
 
-    my $thisparm=$parmhash{$symbparm};
+    my $thisparm=&parmhash($symbparm);
     if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }
 
     if (defined($$courseopt{$courselevelr})) {
-	$outpar[10]=$$courseopt{$courselevelr};
-	$result=10;
+    $outpar[10]=$$courseopt{$courselevelr};
+    $result=10;
     }
 
 # ------------------------------------------------------ fourth, back to course
-    if (defined($csec)) {
+    if ($csec ne '') {
         if (defined($$courseopt{$seclevel})) {
-	    $outpar[9]=$$courseopt{$seclevel};
-	    $result=9;
-	}
+        $outpar[9]=$$courseopt{$seclevel};
+        $result=9;
+    }
         if (defined($$courseopt{$seclevelm})) {
-	    $outpar[8]=$$courseopt{$seclevelm};
-	    $result=8;
-	}
+        $outpar[8]=$$courseopt{$seclevelm};
+        $result=8;
+    }
 
         if (defined($$courseopt{$seclevelr})) {
-	    $outpar[7]=$$courseopt{$seclevelr};
-	    $result=7;
-	}
+        $outpar[7]=$$courseopt{$seclevelr};
+        $result=7;
+    }
     }
 # ------------------------------------------------------ fifth, check course group
-    if (defined($cgroup)) {
+    if ($cgroup ne '') {
         if (defined($$courseopt{$grplevel})) {
             $outpar[6]=$$courseopt{$grplevel};
             $result=6;
@@ -206,96 +444,129 @@ sub parmval_by_symb {
 
 # ---------------------------------------------------------- fifth, check user
 
-    if (defined($uname)) {
-	if (defined($$useropt{$courselevel})) {
-	    $outpar[3]=$$useropt{$courselevel};
-	    $result=3;
-	}
-
-	if (defined($$useropt{$courselevelm})) {
-	    $outpar[2]=$$useropt{$courselevelm};
-	    $result=2;
-	}
-
-	if (defined($$useropt{$courselevelr})) {
-	    $outpar[1]=$$useropt{$courselevelr};
-	    $result=1;
-	}
+    if ($uname ne '') {
+    if (defined($$useropt{$courselevel})) {
+        $outpar[3]=$$useropt{$courselevel};
+        $result=3;
+    }
+
+    if (defined($$useropt{$courselevelm})) {
+        $outpar[2]=$$useropt{$courselevelm};
+        $result=2;
+    }
+
+    if (defined($$useropt{$courselevelr})) {
+        $outpar[1]=$$useropt{$courselevelr};
+        $result=1;
+    }
     }
     return ($result,@outpar);
 }
 
-sub resetparmhash {
-    $parmhashid='';
+
+
+# --- Caches local to lonparmset
+
+
+sub reset_caches {
+    &resetparmhash();
+    &resetsymbcache();
+    &resetrulescache();
 }
 
-sub cacheparmhash {
+{
+    my $parmhashid;
+    my %parmhash;
+    sub resetparmhash {
+    undef($parmhashid);
+    undef(%parmhash);
+    }
+
+    sub cacheparmhash {
     if ($parmhashid eq  $env{'request.course.fn'}) { return; }
     my %parmhashfile;
     if (tie(%parmhashfile,'GDBM_File',
-	      $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
-	%parmhash=%parmhashfile;
-	untie %parmhashfile;
-	$parmhashid=$env{'request.course.fn'};
+        $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
+        %parmhash=%parmhashfile;
+        untie(%parmhashfile);
+        $parmhashid=$env{'request.course.fn'};
+    }
     }
-}
 
-sub resetsymbcache {
-    $symbsid='';
-}
+    sub parmhash {
+    my ($id) = @_;
+    &cacheparmhash();
+    return $parmhash{$id};
+    }
+ }
 
-sub symbcache {
+{
+    my $symbsid;
+    my %symbs;
+    sub resetsymbcache {
+    undef($symbsid);
+    undef(%symbs);
+    }
+
+    sub symbcache {
     my $id=shift;
     if ($symbsid ne $env{'request.course.id'}) {
-	%symbs=();
+        undef(%symbs);
     }
-    unless ($symbs{$id}) {
-	my $navmap = Apache::lonnavmaps::navmap->new();
-	if ($id=~/\./) {
-	    my $resource=$navmap->getById($id);
-	    $symbs{$id}=$resource->symb();
-	} else {
-	    my $resource=$navmap->getByMapPc($id);
-	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
-	}
-	$symbsid=$env{'request.course.id'};
+    if (!$symbs{$id}) {
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        if ($id=~/\./) {
+        my $resource=$navmap->getById($id);
+        $symbs{$id}=$resource->symb();
+        } else {
+        my $resource=$navmap->getByMapPc($id);
+        $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+        }
+        $symbsid=$env{'request.course.id'};
     }
     return $symbs{$id};
-}
+    }
+ }
 
-sub resetrulescache {
-    $rulesid='';
-}
+{
+    my $rulesid;
+    my %rules;
+    sub resetrulescache {
+    undef($rulesid);
+    undef(%rules);
+    }
 
-sub rulescache {
+    sub rulescache {
     my $id=shift;
-    if ($rulesid ne $env{'request.course.id'}) {
-	%rules=();
-    }
-    unless (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);
-	$rulesid=$env{'request.course.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);
+        $rulesid=$env{'request.course.id'};
     }
     return $rules{$id};
+    }
 }
 
+
+
 sub preset_defaults {
     my $type=shift;
     if (&rulescache($type.'_action') eq 'default') {
 # yes, there is something
-	return (&rulescache($type.'_hours'),
-		&rulescache($type.'_min'),
-		&rulescache($type.'_sec'),
-		&rulescache($type.'_value'));
+    return (&rulescache($type.'_hours'),
+        &rulescache($type.'_min'),
+        &rulescache($type.'_sec'),
+        &rulescache($type.'_value'));
     } else {
 # nothing there or something else
-	return ('','','','','');
+    return ('','','','','');
     }
 }
 
-##################################################
+
+
 
 sub date_sanity_info {
    my $checkdate=shift;
@@ -304,14 +575,31 @@ sub date_sanity_info {
    my $crsprefix='course.'.$env{'request.course.id'}.'.';
    if ($env{$crsprefix.'default_enrollment_end_date'}) {
       if ($checkdate>$env{$crsprefix.'default_enrollment_end_date'}) {
-         $result.='<br />'.&mt('After course enrollment end!');
+         $result.='<div class="LC_warning">'
+                 .&mt('After course enrollment end!')
+                 .'</div>';
       }
    }
    if ($env{$crsprefix.'default_enrollment_start_date'}) {
       if ($checkdate<$env{$crsprefix.'default_enrollment_start_date'}) {
-         $result.='<br />'.&mt('Before course enrollment start!');
+         $result.='<div class="LC_warning">'
+                 .&mt('Before course enrollment start!')
+                 .'</div>';
       }
    }
+# Preparation for additional warnings about dates in the past/future.
+# An improved, more context sensitive version is recommended,
+# e.g. warn for due and answer dates which are defined before the corresponding open date, etc.
+#   if ($checkdate<time) {
+#      $result.='<div class="LC_info">'
+#              .'('.&mt('in the past').')'
+#              .'</div>';
+#      }
+#   if ($checkdate>time) {
+#      $result.='<div class="LC_info">'
+#              .'('.&mt('in the future').')'
+#              .'</div>';
+#      }
    return $result;
 }
 ##################################################
@@ -333,29 +621,17 @@ sub storeparm {
     &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
 }
 
-#
-# Store a parameter by symb
-#
-# Takes
-# - symb
-# - name of parameter
-# - level
-# - new value
-# - new type
-# - username
-# - userdomain
-
 my %recstack;
 sub storeparm_by_symb {
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
     unless ($recflag) {
 # first time call
-	%recstack=();
-	$recflag=1;
+    %recstack=();
+    $recflag=1;
     }
 # store parameter
     &storeparm_by_symb_inner
-	($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup);
+    ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup);
 # don't do anything if parameter was reset
     unless ($nval) { return; }
     my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
@@ -365,40 +641,40 @@ sub storeparm_by_symb {
     foreach my $triggered (split(/\:/,&rulescache($parm.'_triggers'))) {
 # don't backfire
        unless ((!$triggered) || ($recstack{$triggered})) {
-	   my $action=&rulescache($triggered.'_action');
-	   my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+       my $action=&rulescache($triggered.'_action');
+       my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
 # set triggered parameter on same level
-	   my $newspnam=$prefix.$triggered;
-	   my $newvalue='';
-	   my $active=1;
-	   if ($action=~/^when\_setting/) {
+       my $newspnam=$prefix.$triggered;
+       my $newvalue='';
+       my $active=1;
+       if ($action=~/^when\_setting/) {
 # are there restrictions?
-	       if (&rulescache($triggered.'_triggervalue')=~/\w/) {
-		   $active=0;
-		   foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
-		       if (lc($possiblevalue) eq lc($nval)) { $active=1; }
-		   }
-	       }
-	       $newvalue=&rulescache($triggered.'_value');
-	   } else {
-	       my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
-	       if ($action=~/^later\_than/) {
-		   $newvalue=$nval+$totalsecs;
-	       } else {
-		   $newvalue=$nval-$totalsecs;
-	       }
-	   }
-	   if ($active) {
-	       &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
-				   $uname,$udom,$csec,$recflag,$cgroup);
-	   }
+           if (&rulescache($triggered.'_triggervalue')=~/\w/) {
+           $active=0;
+           foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
+               if (lc($possiblevalue) eq lc($nval)) { $active=1; }
+           }
+           }
+           $newvalue=&rulescache($triggered.'_value');
+       } else {
+           my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
+           if ($action=~/^later\_than/) {
+           $newvalue=$nval+$totalsecs;
+           } else {
+           $newvalue=$nval-$totalsecs;
+           }
+       }
+       if ($active) {
+           &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
+                   $uname,$udom,$csec,$recflag,$cgroup);
+       }
        }
     }
     return '';
 }
 
 sub log_parmset {
-    return &Apache::lonnet::instructor_log('parameterlog',@_);
+    return &Apache::lonnet::write_log('course','parameterlog',@_);
 }
 
 sub storeparm_by_symb_inner {
@@ -406,7 +682,7 @@ sub storeparm_by_symb_inner {
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
 # ---------------------------------------------------------- Construct prefixes
     $spnam=~s/\_([^\_]+)$/\.$1/;
-    my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];
     $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$spnam;
@@ -419,11 +695,11 @@ sub storeparm_by_symb_inner {
     my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
     my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
     my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
-    
+
     my $courselevel=$env{'request.course.id'}.'.'.$spnam;
     my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
     my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
-    
+
     my $storeunder='';
     if (($snum==14) || ($snum==3)) { $storeunder=$courselevel; }
     if (($snum==13) || ($snum==2)) { $storeunder=$courselevelm; }
@@ -435,155 +711,137 @@ sub storeparm_by_symb_inner {
     if ($snum==5) { $storeunder=$grplevelm; }
     if ($snum==4) { $storeunder=$grplevelr; }
 
-    
+
     my $delete;
     if ($nval eq '') { $delete=1;}
     my %storecontent = ($storeunder         => $nval,
-			$storeunder.'.type' => $ntype);
+            $storeunder.'.type' => $ntype);
     my $reply='';
     if ($snum>3) {
 # ---------------------------------------------------------------- Store Course
 #
-	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
 # Expire sheets
-	&Apache::lonnet::expirespread('','','studentcalc');
-	if (($snum==10) || ($snum==7) || ($snum==4)) {
-	    &Apache::lonnet::expirespread('','','assesscalc',$symb);
-	} elsif (($snum==11) || ($snum==8) || ($snum==5)) {
-	    &Apache::lonnet::expirespread('','','assesscalc',$map);
-	} else {
-	    &Apache::lonnet::expirespread('','','assesscalc');
-	}
+    &Apache::lonnet::expirespread('','','studentcalc');
+    if (($snum==10) || ($snum==7) || ($snum==4)) {
+        &Apache::lonnet::expirespread('','','assesscalc',$symb);
+    } elsif (($snum==11) || ($snum==8) || ($snum==5)) {
+        &Apache::lonnet::expirespread('','','assesscalc',$map);
+    } else {
+        &Apache::lonnet::expirespread('','','assesscalc');
+    }
 # Store parameter
-	if ($delete) {
-	    $reply=&Apache::lonnet::del
-		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+    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 {
+        $reply=&Apache::lonnet::cput
+        ('resourcedata',\%storecontent,$cdom,$cnum);
+        &log_parmset(\%storecontent);
+    }
+    &Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
     } else {
 # ------------------------------------------------------------------ Store User
 #
 # Expire sheets
-	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
-	if ($snum==1) {
-	    &Apache::lonnet::expirespread
-		($uname,$udom,'assesscalc',$symb);
-	} elsif ($snum==2) {
-	    &Apache::lonnet::expirespread
-		($uname,$udom,'assesscalc',$map);
-	} else {
-	    &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
-	}
+    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+    if ($snum==1) {
+        &Apache::lonnet::expirespread
+        ($uname,$udom,'assesscalc',$symb);
+    } elsif ($snum==2) {
+        &Apache::lonnet::expirespread
+        ($uname,$udom,'assesscalc',$map);
+    } else {
+        &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+    }
 # Store parameter
-	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 ($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 "<span class=\"LC_error\">Write Error: $1</span>";
+    return "<span class=\"LC_error\">Write Error: $1</span>";
     }
     return '';
 }
 
-##################################################
-##################################################
-
-=pod
-
-=item valout
-
-Format a value for output.
-
-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,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
-	if ($editable) {
-	    $result = '<span class="LC_clickhere">*</span>';
-	} else {
-	    $result='&nbsp;';
-	}
+        if ($editable) {
+            $result =
+                '<img src="/res/adm/pages/editmap.png"'
+               .' alt="'.&mt('Change').'"'
+               .' title="'.&mt('Change').'" style="border:0;" />';
+        } else {
+            $result='&nbsp;';
+        }
     } else {
         if ($type eq 'date_interval') {
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my @timer;
             $year=$year-70;
             $mday--;
             if ($year) {
-		$result.=$year.' yrs ';
+#               $result.=&mt('[quant,_1,yr]',$year).' ';
+                push(@timer,&mt('[quant,_1,yr]',$year));
             }
             if ($mon) {
-		$result.=$mon.' mths ';
+#               $result.=&mt('[quant,_1,mth]',$mon).' ';
+                push(@timer,&mt('[quant,_1,mth]',$mon));
             }
             if ($mday) {
-		$result.=$mday.' days ';
+#               $result.=&mt('[quant,_1,day]',$mday).' ';
+                push(@timer,&mt('[quant,_1,day]',$mday));
             }
             if ($hour) {
-		$result.=$hour.' hrs ';
+#               $result.=&mt('[quant,_1,hr]',$hour).' ';
+                push(@timer,&mt('[quant,_1,hr]',$hour));
             }
             if ($min) {
-		$result.=$min.' mins ';
+#               $result.=&mt('[quant,_1,min]',$min).' ';
+                push(@timer,&mt('[quant,_1,min]',$min));
             }
             if ($sec) {
-		$result.=$sec.' secs ';
+#               $result.=&mt('[quant,_1,sec]',$sec).' ';
+                push(@timer,&mt('[quant,_1,sec]',$sec));
             }
-            $result=~s/\s+$//;
+#           $result=~s/\s+$//;
+            if (!@timer) { # Special case: all entries 0 -> display "0 secs" intead of empty field to keep this field editable
+                push(@timer,&mt('[quant,_1,sec]',0));
+            }
+            $result.=join(", ",@timer);
         } elsif (&isdateparm($type)) {
-            $result = localtime($value).&date_sanity_info($value);
+            $result = &Apache::lonlocal::locallocaltime($value).
+        &date_sanity_info($value);
         } else {
             $result = $value;
+            $result=~s/\,/\, /gs;
+        $result = &HTML::Entities::encode($result,'"<>&');
         }
     }
     return $result;
 }
 
-##################################################
-##################################################
 
-=pod
-
-=item plink
-
-Produces a link anchor.
-
-Inputs: $type,$dis,$value,$marker,$return,$call
-
-Returns: scalar with html code for a link which will envoke the 
-javascript function 'pjump'.
-
-=cut
-
-##################################################
-##################################################
 sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-	if (&isdateparm($type)) {
+    if (&isdateparm($type)) {
             $winvalue=$env{'form.recent_'.$type};
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
@@ -592,10 +850,17 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    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,1).'</a></td></tr></table>';
+    my $valout = &valout($value,$type,1);
+    my $unencmarker = $marker;
+    foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
+              \$hour, \$min, \$sec) {
+    $$item = &HTML::Entities::encode($$item,'"<>&');
+    $$item =~ s/\'/\\\'/g;
+    }
+    return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
+    '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
+        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
+        $valout.'</a></td></tr></table>';
 }
 
 sub page_js {
@@ -605,17 +870,11 @@ sub page_js {
 
     return(<<ENDJS);
 <script type="text/javascript">
-
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
+// <![CDATA[
 
     $pjump_def
 
     function psub() {
-        pclose();
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
@@ -624,12 +883,12 @@ sub page_js {
             if (typedef[0]=='date') {
                 eval('document.parmform.recent_'+
                      document.parmform.pres_type.value+
-		     '.value=document.parmform.pres_value.value;');
+             '.value=document.parmform.pres_value.value;');
             } else {
                 eval('document.parmform.recent_'+typedef[0]+
-		     '.value=document.parmform.pres_value.value;');
+             '.value=document.parmform.pres_value.value;');
             }
-	   }
+       }
             document.parmform.submit();
         } else {
             document.parmform.pres_value.value='';
@@ -644,73 +903,278 @@ sub page_js {
         var newWin = window.open(url, wdwName, options);
         newWin.focus();
     }
+
+// ]]>
+
 </script>
 $selscript
 ENDJS
 
 }
+
+sub showhide_js {
+    return <<"COURSECONTENTSCRIPT";
+
+function showHide_courseContent() {
+    var parmlevValue=document.getElementById("parmlev").value;
+    if (parmlevValue == 'general') {
+        document.getElementById('mapmenu').style.display="none";
+    } else {
+        if ((parmlevValue == "full") || (parmlevValue == "map")) {
+            document.getElementById('mapmenu').style.display ="";
+        } else {
+            document.getElementById('mapmenu').style.display="none";
+        }
+    }
+    return;
+}
+
+COURSECONTENTSCRIPT
+}
+
+sub toggleparmtextbox_js {
+    return <<"ENDSCRIPT";
+
+if (!document.getElementsByClassName) {
+    function getElementsByClassName(node, classname) {
+        var a = [];
+        var re = new RegExp('(^| )'+classname+'( |$)');
+        var els = node.getElementsByTagName("*");
+        for(var i=0,j=els.length; i<j; i++)
+            if(re.test(els[i].className))a.push(els[i]);
+        return a;
+    }
+}
+
+function showHideLenient() {
+    var lenients;
+    var setRegExp = /^set_/;
+    if (document.getElementsByClassName) {
+        lenients = document.getElementsByClassName('LC_lenient_radio');
+    } else {
+        lenients = getElementsByClassName(document.body,'LC_lenient_radio');
+    }
+    if (lenients != 'undefined') {
+        for (var i=0; i<lenients.length; i++) {
+            if (lenients[i].checked) {
+                if (lenients[i].value == 'weighted') {
+                    if (setRegExp.test(lenients[i].name)) {
+                        var identifier = lenients[i].name.replace(setRegExp,'');
+                        toggleParmTextbox(document.parmform,identifier);
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function toggleParmTextbox(form,key) {
+    var divfortext = document.getElementById('LC_parmtext_'+key);
+    if (divfortext) {
+        var caller = form.elements['set_'+key];
+        if (caller.length) {
+            for (i=0; i<caller.length; i++) {
+                if (caller[i].checked) {
+                    if (caller[i].value == 'weighted') {
+                        divfortext.style.display = 'inline';
+                    } else {
+                        divfortext.style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+ENDSCRIPT
+}
+
+sub validateparms_js {
+    return <<'ENDSCRIPT';
+
+function validateParms() {
+    var textRegExp = /^settext_/;
+    var tailLenient = /\.lenient$/;
+    var patternRelWeight = /^\-?[\d.]+$/;
+    var patternLenientStd = /^(yes|no|default)$/;
+    var ipallowRegExp = /^setipallow_/;
+    var ipdenyRegExp = /^setipdeny_/; 
+    var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
+    if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
+        if (document.parmform.elements.length) {
+            for (i=0; i<document.parmform.elements.length; i++) {
+                var name=document.parmform.elements[i].name;
+                if (textRegExp.test(name)) { 
+                    var identifier = name.replace(textRegExp,'');
+                    if (tailLenient.test(identifier)) {
+                        if (document.parmform.elements['set_'+identifier].length) {
+                            for (var j=0; j<document.parmform.elements['set_'+identifier].length; j++) {
+                                if (document.parmform.elements['set_'+identifier][j].checked) {
+                                    if (!(patternLenientStd.test(document.parmform.elements['set_'+identifier][j].value))) {
+                                        var relweight = document.parmform.elements[i].value;
+                                        relweight = relweight.replace(/^\s+|\s+$/g,'');
+                                        if (!patternRelWeight.test(relweight)) {
+                                            relweight = '0.0';
+                                        }
+                                        if (document.parmform.elements['set_'+identifier][j].value == 'weighted') {
+                                            document.parmform.elements['set_'+identifier][j].value = relweight;
+                                        } else {
+                                            document.parmform.elements['set_'+identifier][j].value += ','+relweight;
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    if (ipallowRegExp.test(name)) {
+                        var identifier = name.replace(ipallowRegExp,'');
+                        var possallow = document.parmform.elements[i].value;
+                        possallow = possallow.replace(/^\s+|\s+$/g,'');
+                        if (patternIP.test(possallow)) {
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possallow = ','+possallow;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possallow; 
+                        }
+                    } else {
+                        if (ipdenyRegExp.test(name)) {
+                            var identifier = name.replace(ipdenyRegExp,'');
+                            var possdeny = document.parmform.elements[i].value;
+                            possdeny = possdeny.replace(/^\s+|\s+$/g,'');
+                            if (patternIP.test(possdeny)) {
+                                possdeny = '!'+possdeny;
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possdeny = ','+possdeny;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possdeny;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+ENDSCRIPT
+}
+
+sub ipacc_boxes_js  {
+    my $remove = &mt('Remove');
+    return <<"END";
+\$(document).ready(function() {
+    var wrapper         = \$(".LC_string_ipacc_wrap");
+    var add_button      = \$(".LC_add_ipacc_button");
+    var ipaccRegExp     = /^LC_string_ipacc_/;
+
+    \$(add_button).click(function(e){
+        e.preventDefault();
+        var identifier = \$(this).closest("div").attr("id");
+        identifier = identifier.replace(ipaccRegExp,'');
+        \$(this).closest('div').find('.LC_string_ipacc_inner').append('<div><input type="text" name="setip'+identifier+'" /><a href="#" class="LC_remove_ipacc">$remove</a></div>');
+    });
+
+    \$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
+        e.preventDefault(); \$(this).closest("div").remove();
+    })
+});
+
+
+END
+}
+
 sub startpage {
-    my ($r) = @_;
+    my ($r,$psymb,$crstype) = @_;
 
-    my %loaditems = ('onunload' => "pclose()",
-		     'onload'   => "group_or_section('cgroup')",);
+    my %loaditems = (
+                      'onload'   => "group_or_section('cgroup')",
+                    );
+    if (!$psymb) {
+        $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup'); resize_scrollbox('mapmenuscroll','1','1');";
+    }
 
-    my $start_page = 
-	&Apache::loncommon::start_page('Set/Modify Course Parameters',
-				       &page_js(),
-				       {'add_entries' => \%loaditems,});
-    my $breadcrumbs = 
-	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','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"});
+    } else {
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+       text=>"Table Mode",
+       help => 'Course_Setting_Parameters'});
+    }
+    my $js = &page_js().'
+<script type="text/javascript">
+// <![CDATA[
+'.
+            &Apache::lonhtmlcommon::resize_scrollbox_js('params').'
+// ]]>
+</script>
+';
+    my $start_page =
+        &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
+                                       {'add_entries' => \%loaditems,});
+    my $breadcrumbs =
+    &Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
+    my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
+    my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
+    $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDHEAD);
-$start_page
-$breadcrumbs
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
-<input type="hidden" value='' name="pres_value" />
-<input type="hidden" value='' name="pres_type" />
-<input type="hidden" value='' name="pres_marker" />
-<input type="hidden" value='1' name="prevvisit" />
+<input type="hidden" value="" name="pres_value" />
+<input type="hidden" value="" name="pres_type" />
+<input type="hidden" value="" name="pres_marker" />
+<input type="hidden" value="1" name="prevvisit" />
+<input type="hidden" value="$escfilter" name="filter" />
+<input type="hidden" value="$escpart" name="part" />
 ENDHEAD
 }
 
 
 sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
-	$defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups)=@_;
+    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+
 # get the values for the parameter in cascading order
 # empty levels will remain empty
     my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
-	  $rid,$$default{$which},$uname,$udom,$csec,$cgroup,$courseopt);
+      $rid,$$default{$which},$uname,$udom,$csec,$cgroup,$courseopt);
 # get the type for the parameters
 # problem: these may not be set for all levels
     my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.
                                           $$name{$which}.'.type',$rid,
-		 $$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);
+         $$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);
 # cascade down manually
     my $cascadetype=$$defaulttype{$which};
     for (my $i=14;$i>0;$i--) {
-	 if ($typeoutpar[$i]) { 
+     if ($typeoutpar[$i]) {
             $cascadetype=$typeoutpar[$i];
-	} else {
+    } else {
             $typeoutpar[$i]=$cascadetype;
         }
     }
     my $parm=$$display{$which};
 
     if ($parmlev eq 'full') {
-        $r->print('<td bgcolor='.$defbgtwo.' align="center">'
-                  .$$part{$which}.'</td>');
-    } else {    
+        $r->print('<td style="background-color:'.$defbgtwo.';" align="center">'
+                  .($$part{$which} eq '0'?'0 ('.&mt('default').')':$$part{$which}).'</td>');
+    } else {
         $parm=~s|\[.*\]\s||g;
     }
     my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
     if ($automatic) {
-	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
+    $parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
     }
-    $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
-   
+    $r->print('<td>'.$parm.'</td>');
+
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
@@ -718,26 +1182,25 @@ sub print_row {
     my ($othergrp,$grp_parm,$controlgrp);
 
     if ($parmlev eq 'general') {
-
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } else {
         if ($uname) {
@@ -757,43 +1220,42 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	
-	if ($csec) {
-	    &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	    &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	    &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	}
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+
+        if ($csec) {
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         }
-     
-	if ($uname) {
+
+        if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-	    &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	    &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	    &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	}
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        }
 
     } # end of $parmlev if/else
-    $r->print('<td bgcolor="#CCCCFF" align="center">'.$effective_parm.'</td>');
+    $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
 
     if ($parmlev eq 'full') {
         my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                         '.'.$$name{$which},$$symbp{$rid});
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
-        $r->print('<td bgcolor="#999999" align="center"><font color="#FFFFFF">'.
+        $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
                   &valout($sessionval,$sessionvaltype).'&nbsp;'.
                   '</font></td>');
     }
@@ -802,15 +1264,33 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
-    $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
-              ' align="center">');
-    if ($which<11 || $which > 12) {
-	$r->print(&plink($$typeoutpar[$which],
-			 $$display{$value},$$outpar[$which],
-			 $mprefix."$which",'parmform.pres','psub'));
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
+    $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
+              ';" align="center">');
+    my $nolink = 0;
+    if ($which == 11 || $which == 12) {
+        $nolink = 1;
+    } elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
+        $nolink = 1;
+    } elsif ($which == 4 || $which ==  5 || $which == 6) {
+        if ($noeditgrp) {
+            $nolink = 1;
+        }
+    } elsif ($mprefix =~ /availablestudent\&$/) {
+        if ($which > 3) {
+            $nolink = 1;
+        }
+    } elsif ($mprefix =~ /examcode\&$/) {
+        unless ($which == 2) {
+            $nolink = 1;
+        }
+    }
+    if ($nolink) {
+        $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
     } else {
-	$r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+        $r->print(&plink($$typeoutpar[$which],
+                         $$display{$value},$$outpar[$which],
+                         $mprefix."$which",'parmform.pres','psub'));
     }
     $r->print('</td>'."\n");
 }
@@ -828,13 +1308,13 @@ sub print_usergroups {
                                                                    $courseopt);
     my $bgcolor = $defbg;
     my $grp_parm;
-    if (($coursereply) && ($cgroup ne $resultgroup)) { 
+    if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
-            $bgcolor = '"#AAFFAA"';
+            $bgcolor = '#AAFFAA';
             $grp_parm = &valout($coursereply,$resulttype);
         }
         $grp_parm = &valout($coursereply,$resulttype);
-        $output = '<td bgcolor='.$bgcolor.' align="center">';
+        $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
         } else {
@@ -842,7 +1322,7 @@ sub print_usergroups {
         }
         $output .= '</td>';
     } else {
-        $output .= '<td bgcolor='.$bgcolor.'>&nbsp;</td>';
+        $output .= '<td style="background-color:'.$bgcolor.';">&nbsp;</td>';
     }
     return ($coursereply,$output,$grp_parm,$resultgroup);
 }
@@ -871,39 +1351,7 @@ sub parm_control_group {
     return($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
 }
 
-=pod
-
-=item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
-
-Input: See list below:
-
-=over 4
-
-=item B<ids>: An array that will contain all of the ids in the course.
-
-=item B<typep>: hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
 
-=item B<keyp>: hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
-
-=item B<allparms>: hash, name of parameter->display value (what is the display value?)
-
-=item B<allparts>: hash, part identification->text representation of part, where the text representation is "[Part $part]"
-
-=item B<allkeys>: hash, full key to part->display value (what's display value?)
-
-=item B<allmaps>: hash, ???
-
-=item B<fcat>: ???
-
-=item B<defp>: hash, ???
-
-=item B<mapp>: ??
-
-=item B<symbp>: hash, id->full sym?
-
-=back
-
-=cut
 
 sub extractResourceInformation {
     my $ids = shift;
@@ -924,85 +1372,112 @@ sub extractResourceInformation {
     my $navmap = Apache::lonnavmaps::navmap->new();
     my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
     foreach my $resource (@allres) {
-	my $id=$resource->id();
+        my $id=$resource->id();
         my ($mapid,$resid)=split(/\./,$id);
-	if ($mapid eq '0') { next; }
-	$$ids[$#$ids+1]=$id;
-	my $srcf=$resource->src();
-	$srcf=~/\.(\w+)$/;
-	$$typep{$id}=$1;
-	$$keyp{$id}='';
+        if ($mapid eq '0') { next; }
+        $$ids[$#$ids+1]=$id;
+        my $srcf=$resource->src();
+        $srcf=~/\.(\w+)$/;
+        $$typep{$id}=$1;
+        $$keyp{$id}='';
         $$uris{$id}=$srcf;
-	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
-	    if ($_=~/^parameter\_(.*)/) {
-		my $key=$_;
+
+        foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+            next if ($key!~/^parameter_/);
+
 # Hidden parameters
-		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {
-		    next;
-		}
-		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
-		my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
-		my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+            next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');
 #
 # allparms is a hash of parameter names
 #
-		my $parmdis = $display;
-		$parmdis =~ s/\[Part.*$//g;
+            my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+            if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
+                my ($display,$parmdis);
+                $display = &standard_parameter_names($name);
+                if ($display eq '') {
+                    $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+                    $parmdis = $display;
+                    $parmdis =~ s/\s*\[Part.*$//g;
+                } else {
+                    $parmdis = &mt($display);
+                }
                 $$allparms{$name}=$parmdis;
-		$$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');
+                if (ref($defkeytype)) {
+                    $$defkeytype{$name}=
+                    &Apache::lonnet::metadata($srcf,$key.'.type');
+                }
+            }
+
 #
 # allparts is a hash of all parts
 #
-		$$allparts{$part} = "Part: $part";
+            my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+            $$allparts{$part} = &mt('Part: [_1]',$part);
 #
 # Remember all keys going with this resource
 #
-		if ($$keyp{$id}) {
-		    $$keyp{$id}.=','.$key;
-		} else {
-		    $$keyp{$id}=$key;
-		}
+            if ($$keyp{$id}) {
+                $$keyp{$id}.=','.$key;
+            } else {
+                $$keyp{$id}=$key;
+            }   
 #
 # Put in order
-# 
-                unless ($$keyorder{$key}) {
-                    $$keyorder{$key}=$keyordercnt;
-                    $keyordercnt++;
-		}
-
-	    }
-	}
-	$$mapp{$id}=
-	    &Apache::lonnet::declutter($resource->enclosing_map_src());
-	$$mapp{$mapid}=$$mapp{$id};
-	$$allmaps{$mapid}=$$mapp{$id};
-	if ($mapid eq '1') {
-	    $$maptitles{$mapid}='Main Course Documents';
-	} else {
-	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
-	}
-	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
-	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
-	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
+#
+            unless ($$keyorder{$key}) {
+                $$keyorder{$key}=$keyordercnt;
+                $keyordercnt++;
+            }
+        }
+
+
+        if (!exists($$mapp{$mapid})) {
+            $$mapp{$id}=
+            &Apache::lonnet::declutter($resource->enclosing_map_src());
+            $$mapp{$mapid}=$$mapp{$id};
+            $$allmaps{$mapid}=$$mapp{$id};
+            if ($mapid eq '1') {
+                $$maptitles{$mapid}=&mt('Main Content');
+            } else {
+                $$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
+            }
+            $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+            $$symbp{$mapid}=$$mapp{$id}.'___(all)';
+        } else {
+            $$mapp{$id} = $$mapp{$mapid};
+        }
+        $$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
     }
 }
 
 
-##################################################
-##################################################
 
 sub isdateparm {
     my $type=shift;
     return (($type=~/^date/) && (!($type eq 'date_interval')));
 }
 
+#
+# parmmenu displays a list of the selected parameters.
+# It also offers a link to show/hide the complete parameter list
+# from which you can select all desired parameters.
+#
 sub parmmenu {
     my ($r,$allparms,$pscat,$keyorder)=@_;
     my $tempkey;
     $r->print(<<ENDSCRIPT);
 <script type="text/javascript">
+// <![CDATA[
     function checkall(value, checkName) {
-	for (i=0; i<document.forms.parmform.elements.length; i++) {
+
+        var li = "_li";
+        var displayOverview = "";
+        
+        if (value == false) {
+            displayOverview = "none"
+        }
+
+    for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
                 document.forms.parmform.elements[i].checked=value;
@@ -1011,146 +1486,325 @@ sub parmmenu {
     }
 
     function checkthis(thisvalue, checkName) {
-	for (i=0; i<document.forms.parmform.elements.length; i++) {
+
+
+    for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
-		if (ele.value == thisvalue) {
-		    document.forms.parmform.elements[i].checked=true;
-		}
+        if (ele.value == thisvalue) {
+            document.forms.parmform.elements[i].checked=true;
+        }
             }
         }
     }
 
     function checkdates() {
-	checkthis('duedate','pscat');
- 	checkthis('opendate','pscat');
-	checkthis('answerdate','pscat');
+    checkthis('duedate','pscat');
+     checkthis('opendate','pscat');
+    checkthis('answerdate','pscat');
     }
 
     function checkdisset() {
-	checkthis('discussend','pscat');
- 	checkthis('discusshide','pscat');
+     checkthis('discussend','pscat');
+     checkthis('discusshide','pscat');
+     checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
-	checkthis('contentopen','pscat');
- 	checkthis('contentclose','pscat');
+    checkthis('contentopen','pscat');
+     checkthis('contentclose','pscat');
     }
- 
 
     function checkvisi() {
-	checkthis('hiddenresource','pscat');
- 	checkthis('encrypturl','pscat');
-	checkthis('problemstatus','pscat');
-	checkthis('contentopen','pscat');
-	checkthis('opendate','pscat');
+    checkthis('hiddenresource','pscat');
+     checkthis('encrypturl','pscat');
+    checkthis('problemstatus','pscat');
+    checkthis('contentopen','pscat');
+    checkthis('opendate','pscat');
     }
 
     function checkparts() {
-	checkthis('hiddenparts','pscat');
-	checkthis('display','pscat');
-	checkthis('ordered','pscat');
+    checkthis('hiddenparts','pscat');
+    checkthis('display','pscat');
+    checkthis('ordered','pscat');
     }
 
     function checkstandard() {
         checkall(false,'pscat');
-	checkdates();
-	checkthis('weight','pscat');
-	checkthis('maxtries','pscat');
+    checkdates();
+    checkthis('weight','pscat');
+    checkthis('maxtries','pscat');
+    checkthis('type','pscat');
+    checkthis('problemstatus','pscat');
     }
 
+// ]]>
 </script>
 ENDSCRIPT
-    $r->print();
-    $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
-    my $cnt=0;
-    foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-	$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></td>');
- 	$cnt++;
-        if ($cnt==3) {
-	    $r->print("</tr>\n<tr>");
-	    $cnt=0;
-	}
-    }
-    $r->print('
-</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>
-<a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
-<a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
-<a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
-<a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
-<a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
-</td><td>
-<a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
-</td>
-');
-    $r->print('</tr></table>');
+
+    $r->print('<hr />');
+    &shortCuts($r,$allparms,$pscat,$keyorder);
+    $r->print('<hr />');
+}
+# return a hash
+sub categories {
+    return ('time_settings' => 'Time Settings',
+    'grading' => 'Grading',
+    'tries' => 'Tries',
+    'problem_appearance' => 'Problem Appearance',
+    'behaviour_of_input_fields' => 'Behaviour of Input Fields',
+    'hiding' => 'Hiding',
+    'high_level_randomization' => 'High Level Randomization',
+    'slots' => 'Slots',
+    'file_submission' => 'File Submission',
+    'misc' => 'Miscellaneous' ); 
+}
+
+# return a hash. Like a look-up table
+sub lookUpTableParameter {
+ 
+    return ( 
+        'opendate' => 'time_settings',
+        'duedate' => 'time_settings',
+        'answerdate' => 'time_settings',
+        'interval' => 'time_settings',
+        'contentopen' => 'time_settings',
+        'contentclose' => 'time_settings',
+        'discussend' => 'time_settings',
+	'printstartdate' => 'time_settings',
+	'printenddate' => 'time_settings',
+        'weight' => 'grading',
+        'handgrade' => 'grading',
+        'maxtries' => 'tries',
+        'hinttries' => 'tries',
+        'randomizeontries' => 'tries',
+        'type' => 'problem_appearance',
+        'problemstatus' => 'problem_appearance',
+        'display' => 'problem_appearance',
+        'ordered' => 'problem_appearance',
+        'numbubbles' => 'problem_appearance',
+        'tol' => 'behaviour_of_input_fields',
+        'sig' => 'behaviour_of_input_fields',
+        'turnoffunit' => 'behaviour_of_input_fields',
+        'hiddenresource' => 'hiding',
+        'hiddenparts' => 'hiding',
+        'discusshide' => 'hiding',
+        'buttonshide' => 'hiding',
+        'turnoffeditor' => 'hiding',
+        'encrypturl' => 'hiding',
+        'randomorder' => 'high_level_randomization',
+        'randompick' => 'high_level_randomization',
+        'available' => 'slots',
+        'useslots' => 'slots',
+        'availablestudent' => 'slots',
+        'uploadedfiletypes' => 'file_submission',
+        'maxfilesize' => 'file_submission',
+        'cssfile' => 'misc',
+        'mapalias' => 'misc',
+        'acc' => 'misc',
+        'maxcollaborators' => 'misc',
+        'scoreformat' => 'misc',
+        'lenient' => 'grading',
+        'retrypartial' => 'tries',
+        'discussvote'  => 'misc',
+        'examcode' => 'high_level_randomization', 
+    );    
+}
+
+sub whatIsMyCategory {
+    my $name = shift;
+    my $catList = shift;
+    my @list;
+    my %lookUpList = &lookUpTableParameter; #Initilize the lookupList
+    my $cat = $lookUpList{$name};
+    if (defined($cat)) {
+        if (!defined($$catList{$cat})){
+            push @list, ($name);
+            $$catList{$cat} = \@list;
+        } else {
+            push @{${$catList}{$cat}}, ($name);     
+        }
+    } else {
+        if (!defined($$catList{'misc'})){
+            push @list, ($name);
+            $$catList{'misc'} = \@list;
+        } else {
+            push @{${$catList}{'misc'}}, ($name);     
+        }
+    }        
+}
+
+sub keysindisplayorderCategory {
+    my ($name,$keyorder)=@_;
+    return sort {
+        $$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b}; 
+    } ( @{$name});
+}
+
+sub category_order {
+    return (
+        'time_settings' => 1,
+        'grading' => 2,
+        'tries' => 3,
+        'problem_appearance' => 4,
+        'hiding' => 5,
+        'behaviour_of_input_fields' => 6,
+        'high_level_randomization'  => 7,
+        'slots' => 8,
+        'file_submission' => 9,
+        'misc' => 10
+    );
+
+}
+
+sub parmboxes {
+    my ($r,$allparms,$pscat,$keyorder)=@_;
+    my %categories = &categories();
+    my %category_order = &category_order();
+    my %categoryList = (
+        'time_settings' => [],
+        'grading' => [],
+        'tries' => [],
+        'problem_appearance' => [],
+        'behaviour_of_input_fields' => [],
+        'hiding' => [],
+        'high_level_randomization' => [],
+        'slots' => [],
+        'file_submission' => [],
+        'misc' => [],
+    );
+
+    foreach my $tempparameter (keys(%$allparms)) {
+        &whatIsMyCategory($tempparameter, \%categoryList);
+    }
+    #part to print the parm-list
+    foreach my $key (sort { $category_order{$a} <=> $category_order{$b} } keys(%categoryList)) {
+        next if (@{$categoryList{$key}} == 0);
+        next if ($key eq '');
+        $r->print('<div class="LC_Box LC_400Box">'
+                 .'<h4 class="LC_hcell">'.&mt($categories{$key}).'</h4>'."\n");
+        foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            $r->print('<span class="LC_nobreak">'
+                     .'<label><input type="checkbox" name="pscat" '
+                     .'value="'.$tempkey.'" ');
+            if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+                $r->print( ' checked="checked"');
+            }
+            $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                      : $tempkey)
+                     .'</label></span><br />'."\n");
+        }
+        $r->print('</div>');
+    }
+    $r->print("\n");
+}
+#
+# This function offers some links on the parameter section to get with one click a group a parameters
+#
+sub shortCuts {
+    my ($r,$allparms,$pscat,$keyorder)=@_;
+
+    # Parameter Selection
+    $r->print(
+        &Apache::lonhtmlcommon::start_funclist(&mt('Parameter Selection'))
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>')
+       .&Apache::lonhtmlcommon::end_funclist()
+    );
+
+    # Add Selection for...
+    $r->print(
+        &Apache::lonhtmlcommon::start_funclist(&mt('Add Selection for...'))
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>')
+       .&Apache::lonhtmlcommon::end_funclist()
+    );
 }
 
 sub partmenu {
     my ($r,$allparts,$psprt)=@_;
-    $r->print('<select multiple name="psprt" size="8">');
+    my $selsize = 1+scalar(keys(%{$allparts}));
+    if ($selsize > 8) {
+        $selsize = 8;
+    }
+
+    $r->print('<select multiple="multiple" name="psprt" size="'.$selsize.'">');
     $r->print('<option value="all"');
-    $r->print(' selected') unless (@{$psprt});
+    $r->print(' selected="selected"') unless (@{$psprt});
     $r->print('>'.&mt('All Parts').'</option>');
     my %temphash=();
     foreach (@{$psprt}) { $temphash{$_}=1; }
     foreach my $tempkey (sort {
-	if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); }
+    if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); }
     } keys(%{$allparts})) {
-	unless ($tempkey =~ /\./) {
-	    $r->print('<option value="'.$tempkey.'"');
-	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
-		$r->print(' selected');
-	    }
-	    $r->print('>'.$$allparts{$tempkey}.'</option>');
-	}
+    unless ($tempkey =~ /\./) {
+        $r->print('<option value="'.$tempkey.'"');
+        if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
+        $r->print(' selected="selected"');
+        }
+        $r->print('>'.$$allparts{$tempkey}.'</option>');
+    }
     }
     $r->print('</select>');
 }
 
 sub usermenu {
-    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;
+    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
-    my %lt=&Apache::lonlocal::texthash(
-		    'se'    => "Section",
-                    'gr'    => "Group",
-		    'fu'    => "For User",
-		    'oi'    => "or ID",
-		    'ad'    => "at Domain"
-				       );
+
     my $sections='';
     my %sectionhash = &Apache::loncommon::get_sections();
 
     my $groups;
-    my %grouphash = &Apache::longroup::coursegroups();
+    my %grouphash;
+    if (($pssymb) || &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        %grouphash = &Apache::longroup::coursegroups();
+    } elsif ($env{'request.course.groups'} ne '') {
+        map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+    }
 
-    if (%sectionhash) {
-        $sections=$lt{'se'}.': <select name="csec"';
+    my $g_s_header='';
+    my $g_s_footer='';
+
+    my $currsec = $env{'request.course.sec'};
+    if ($currsec) {
+        $sections=&mt('Section:').' '.$currsec;
+        if (%grouphash) {
+            $sections .= ';'.('&nbsp;' x2);
+        }
+    } elsif (%sectionhash && $currsec eq '') {
+        $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
         $sections .= '>';
-	foreach my $section ('',sort keys %sectionhash) {
-	    $sections.='<option value="'.$section.'" '.
-		($section eq $csec?'selected="selected"':'').'>'.$section.
+    foreach my $section ('',sort(keys(%sectionhash))) {
+        $sections.='<option value="'.$section.'" '.
+        ($section eq $csec?'selected="selected"':'').'>'.$section.
                                                               '</option>';
         }
         $sections.='</select>';
     }
-    if (%sectionhash && %grouphash && $parmlev ne 'full') {
-        $sections .= '&nbsp;or&nbsp;';
+
+    if (%sectionhash && %grouphash && $parmlev ne 'full' && $currsec eq '') {
+        $sections .= '&nbsp;'.&mt('or').'&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
+// <![CDATA[
 function group_or_section(caller) {
    if (caller == "cgroup") {
        if (document.parmform.cgroup.selectedIndex != 0) {
@@ -1162,25 +1816,28 @@ function group_or_section(caller) {
        }
    }
 }
+// ]]>
 </script>
 |;
-    } else {
+    } elsif ($currsec eq '') {
         $sections .= qq|
 <script type="text/javascript">
+// <![CDATA[
 function group_or_section(caller) {
     return;
 }
+// ]]>
 </script>
 |;
-    } 
+    }
 
     if (%grouphash) {
-        $groups=$lt{'gr'}.': <select name="cgroup"';
-        if (%sectionhash && $env{'form.action'} eq 'settable') {
+        $groups=&mt('Group:').' <select name="cgroup"';
+        if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
-        foreach my $grp ('',sort keys %grouphash) {
+        foreach my $grp ('',sort(keys(%grouphash))) {
             $groups.='<option value="'.$grp.'" ';
             if ($grp eq $cgroup) {
                 unless ((defined($uname)) && ($grp eq '')) {
@@ -1197,99 +1854,256 @@ function group_or_section(caller) {
         }
         $groups.='</select>';
     }
-    $r->print(<<ENDMENU);
-<b>
-$sections
-$groups
-<br />
-$lt{'fu'} 
-<input type="text" value="$uname" size="12" name="uname" />
-$lt{'oi'}
-<input type="text" value="$id" size="12" name="id" /> 
-$lt{'ad'}
-$chooseopt
-</b>
-ENDMENU
+
+    if (%sectionhash || %grouphash) {
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
+        $r->print($sections.$groups);
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+    }
+
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
+    $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+                 ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+                 ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
+                 ,$chooseopt));
 }
 
+#
+# This function shows on table Mode the available Parameters for the selected Resources
+#
 sub displaymenu {
-    my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
-    $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
-	     &mt('Select Parts to View').'</th></tr><tr><td>');  
+    my ($r,$allparms,$pscat,$psprt,$keyorder,$divid)=@_;
+
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
+
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print('</td><td>');
-    &partmenu($r,$allparts,$psprt);
-    $r->print('</td></tr></table>');
+    $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
+    &parmboxes($r,$allparms,$pscat,$keyorder);
+    $r->print(&Apache::loncommon::end_scrollbox());
+
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ 
 }
 
 sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles)=@_;
-    $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
-    $r->print('<select name="pschp">');
-    $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
-    foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
-	$r->print('<option value="'.$_.'"');
-	if (($pschp eq $_)) { $r->print(' selected'); }
-	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
+    my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
+    my %allmaps_inverted = reverse %$allmaps;
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $tree=[];
+    my $treeinfo={};
+    if (defined($navmap)) {
+        my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
+        my $curRes;
+        my $depth = 0;
+        my %parent = ();
+        my $startcount = 5;
+        my $lastcontainer = $startcount;
+# preparing what is to show ...
+        while ($curRes = $it->next()) {
+            if ($curRes == $it->BEGIN_MAP()) {
+                $depth++;
+                $parent{$depth}= $lastcontainer;
+            }
+            if ($curRes == $it->END_MAP()) {
+                $depth--;
+                $lastcontainer = $parent{$depth};
+            }
+            if (ref($curRes)) {
+                my $symb = $curRes->symb();
+                my $ressymb = $symb;
+                if (($curRes->is_sequence()) || ($curRes->is_page())) {
+                    my $type = 'sequence';
+                    if ($curRes->is_page()) {
+                        $type = 'page';
+                    }
+                    my $id= $curRes->id();
+                    my $srcf = $curRes->src();
+                    my $resource_name = &Apache::lonnet::gettitle($srcf);
+                    if(!exists($treeinfo->{$id})) {
+                        push(@$tree,$id);
+                        my $enclosing_map_folder = &Apache::lonnet::declutter($curRes->enclosing_map_src());        
+                        $treeinfo->{$id} = {
+                                    depth => $depth,
+                                    type  => $type,
+                                    name  => $resource_name,
+                                    enclosing_map_folder => $enclosing_map_folder,
+                                    };
+                    }
+                }
+            }
+        }
+    }
+# Show it ...    
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
+    if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
+        my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
+        my $whitespace =
+            '<img src="'
+           .&Apache::loncommon::lonhttpdurl('/adm/lonIcons/whitespace_21.gif')
+           .'" alt="" />';
+
+        # Info about selectable folders/maps
+        $r->print(
+            '<div class="LC_info">'
+           .&mt('You can only select maps and folders which have modifiable settings.')
+           .' '.&Apache::loncommon::help_open_topic('Parameter_Set_Folder') 
+           .'</div>'
+        );
+
+        $r->print(&Apache::loncommon::start_scrollbox('700px','680px','400px','mapmenuscroll'));
+        $r->print(&Apache::loncommon::start_data_table(undef,'mapmenuinner'));
+
+        # Display row: "All Maps or Folders"
+        $r->print(
+            &Apache::loncommon::start_data_table_row(undef,'picklevel')
+           .'<td>'
+           .'<label>'
+           .'<input type="radio" name="pschp"'
+        );
+        $r->print(' checked="checked"') if ($pschp eq 'all' || !$pschp);
+        $r->print(
+            ' value="all" />&nbsp;'.$icon.'&nbsp;'
+           .&mt('All Maps or Folders')
+           .'</label>'
+           .'<hr /></td>'
+           .&Apache::loncommon::end_data_table_row()
+        );
+
+        # Display row: "Main Content"
+        if (exists($$allmaps{1})) {
+            $r->print(
+                &Apache::loncommon::start_data_table_row()
+               .'<td>'
+               .'<label>'
+               .'<input type="radio" name="pschp" value="1"'
+            );
+            $r->print(' checked="checked"') if ($pschp eq '1');
+            $r->print(
+                '/>&nbsp;'.$icon.'&nbsp;'
+               .$$maptitles{1}
+               .($$allmaps{1} !~/^uploaded/?' ['.$$allmaps{1}.']':'')
+               .'</label>'
+               .'</td>'
+               .&Apache::loncommon::end_data_table_row()
+            );
+        }
+
+        # Display rows for all course maps and folders
+        foreach my $id (@{$tree}) {
+            my ($mapid,$resid)=split(/\./,$id);
+            # Indentation
+            my $depth = $treeinfo->{$id}->{'depth'};
+            my $indent;
+            for (my $i = 0; $i < $depth; $i++) {
+                $indent.= $whitespace;
+            }
+            $icon =  '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
+            if ($treeinfo->{$id}->{'type'} eq 'page') {
+                $icon = '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />';
+            }
+            my $symb_name = $$symbp{$id};
+            my ($front, $tail) = split (/___${resid}___/, $symb_name);
+            $symb_name = $tail;
+            $r->print(
+                &Apache::loncommon::start_data_table_row()
+               .'<td>'
+               .'<label>'
+            );
+            # Only offer radio button for folders/maps which can be parameterized
+            if ($allmaps_inverted{$symb_name}) {
+                $r->print(
+                    '<input type ="radio" name="pschp"'
+                   .' value="'.$allmaps_inverted{$symb_name}.'"'
+                );
+                $r->print(' checked="checked"') if ($allmaps_inverted{$symb_name} eq $pschp);
+                $r->print('/>');
+            } else {
+                $r->print($whitespace);
+            }
+            $r->print(
+                $indent.$icon.'&nbsp;'
+               .$treeinfo->{$id}->{name}
+               .($$allmaps{$mapid}!~/^uploaded/?' ['.$$allmaps{$mapid}.']':'')
+               .'</label>'
+               .'</td>'
+               .&Apache::loncommon::end_data_table_row()
+            );
+        }
+
+        $r->print(&Apache::loncommon::end_data_table().
+                  '<br style="line-height:2px;" />'.
+                  &Apache::loncommon::end_scrollbox());
     }
-    $r->print("</select>");
 }
 
+# Build up the select Box to choose if your parameter specification should work for the resource, map/folder or the course level
+# The value of default selection in the select box is set by the value that is given by the argument in $parmlev.
 sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;
-    $r->print('<b>'.&mt('Select Parameter Level').
-	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
-    $r->print('<select name="parmlev">');
-    foreach (reverse sort keys %{$alllevs}) {
-	$r->print('<option value="'.$$alllevs{$_}.'"');
-	if ($parmlev eq $$alllevs{$_}) {
-	    $r->print(' selected'); 
-	}
-	$r->print('>'.$_.'</option>');
+
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').
+                                                &Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
+    $r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');
+    foreach my $lev (reverse(sort(keys(%{$alllevs})))) {
+        $r->print('<option value="'.$$alllevs{$lev}.'"');
+        if ($parmlev eq $$alllevs{$lev}) {
+            $r->print(' selected="selected"');
+        }
+        $r->print('>'.&mt($lev).'</option>');
     }
     $r->print("</select>");
 }
 
 
 sub sectionmenu {
-    my ($r,$selectedsections)=@_;
+    my ($selectedsections)=@_;
     my %sectionhash = &Apache::loncommon::get_sections();
-    return if (!%sectionhash);
+    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");
+    my (@possibles,$disabled);
+    if ($env{'request.course.sec'} ne '') {
+        @possibles = ($env{'request.course.sec'});
+        $selectedsections = [$env{'request.course.sec'}];
+        $disabled = ' disabled="disabled"';
+    } else {
+        @possibles = ('all',sort(keys(%sectionhash)));
     }
-    $r->print("</select>\n");
+    my $output = '<select name="Section" multiple="multiple" size="8"'.$disabled.'>';
+    foreach my $s (@possibles) {
+        $output .= '    <option value="'.$s.'"';
+        if ((@{$selectedsections}) && (grep(/^\Q$s\E$/,@{$selectedsections}))) {  
+            $output .= ' selected="selected"';
+        }
+        $output .= '>'."$s</option>\n";
+    }
+    $output .= "</select>\n";
+    return $output;
 }
 
 sub groupmenu {
-    my ($r,$selectedgroups)=@_;
-    my %grouphash = &Apache::longroup::coursegroups();
-    return if (!%grouphash);
+    my ($selectedgroups)=@_;
+    my %grouphash;
+    if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        %grouphash = &Apache::longroup::coursegroups();
+    } elsif ($env{'request.course.groups'} ne '') {
+         map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+    }
+    return '' if (!%grouphash);
 
-    $r->print('<select name="Group" multiple="true" size="8" >');
+    my $output = '<select name="Group" multiple="multiple" 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");
+        $output .= '    <option value="'.$group.'"';
+        if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
+            $output .=  ' selected="selected"';
+        }
+        $output .= '>'."$group</option>\n";
     }
-    $r->print("</select>\n");
+    $output .= "</select>\n";
+    return $output;
 }
 
-
 sub keysplit {
     my $keyp=shift;
     return (split(/\,/,$keyp));
@@ -1298,101 +2112,78 @@ sub keysplit {
 sub keysinorder {
     my ($name,$keyorder)=@_;
     return sort {
-	$$keyorder{$a} <=> $$keyorder{$b};
-    } (keys %{$name});
+    $$keyorder{$a} <=> $$keyorder{$b};
+    } (keys(%{$name}));
 }
 
 sub keysinorder_bytype {
     my ($name,$keyorder)=@_;
     return sort {
-	my $ta=(split('_',$a))[-1];
-	my $tb=(split('_',$b))[-1];
-	if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
-	    return ($a cmp $b);
-	}
-	$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
-    } (keys %{$name});
+    my $ta=(split('_',$a))[-1];
+    my $tb=(split('_',$b))[-1];
+    if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
+        return ($a cmp $b);
+    }
+    $$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
+    } (keys(%{$name}));
 }
 
 sub keysindisplayorder {
     my ($name,$keyorder)=@_;
     return sort {
-	$$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
-    } (keys %{$name});
+    $$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
+    } (keys(%{$name}));
 }
 
 sub sortmenu {
     my ($r,$sortorder)=@_;
     $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
     if ($sortorder eq 'realmstudent') {
-       $r->print(' checked="on"');
+       $r->print(' checked="checked"');
     }
     $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
     $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
     if ($sortorder eq 'studentrealm') {
-       $r->print(' checked="on"');
+       $r->print(' checked="checked"');
     }
     $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
-	      '</label>');
+          '</label>');
 }
 
 sub standardkeyorder {
     return ('parameter_0_opendate' => 1,
-	    'parameter_0_duedate' => 2,
-	    'parameter_0_answerdate' => 3,
-	    'parameter_0_interval' => 4,
-	    'parameter_0_weight' => 5,
-	    'parameter_0_maxtries' => 6,
-	    'parameter_0_hinttries' => 7,
-	    'parameter_0_contentopen' => 8,
-	    'parameter_0_contentclose' => 9,
-	    'parameter_0_type' => 10,
-	    'parameter_0_problemstatus' => 11,
-	    'parameter_0_hiddenresource' => 12,
-	    'parameter_0_hiddenparts' => 13,
-	    'parameter_0_display' => 14,
-	    'parameter_0_ordered' => 15,
-	    'parameter_0_tol' => 16,
-	    'parameter_0_sig' => 17,
-	    'parameter_0_turnoffunit' => 18,
-            'parameter_0_discussend' => 19,
-            'parameter_0_discusshide' => 20);
+        'parameter_0_duedate' => 2,
+        'parameter_0_answerdate' => 3,
+        'parameter_0_interval' => 4,
+        'parameter_0_weight' => 5,
+        'parameter_0_maxtries' => 6,
+        'parameter_0_hinttries' => 7,
+        'parameter_0_contentopen' => 8,
+        'parameter_0_contentclose' => 9,
+        'parameter_0_type' => 10,
+        'parameter_0_problemstatus' => 11,
+        'parameter_0_hiddenresource' => 12,
+        'parameter_0_hiddenparts' => 13,
+        'parameter_0_display' => 14,
+        'parameter_0_ordered' => 15,
+        'parameter_0_tol' => 16,
+        'parameter_0_sig' => 17,
+        'parameter_0_turnoffunit' => 18,
+        'parameter_0_discussend' => 19,
+        'parameter_0_discusshide' => 20,
+        'parameter_0_discussvote' => 21,
+	'parameter_0_printstartdate'  =>  22,
+	'parameter_0_printenddate' =>  23);
 }
 
-##################################################
-##################################################
-
-=pod
-
-=item assessparms
-
-Show assessment data and parameters.  This is a large routine that should
-be simplified and shortened... someday.
-
-Inputs: $r
-
-Returns: nothing
-
-Variables used (guessed by Jeremy):
-
-=over 4
-
-=item B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
-
-=item B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
-
-=item B<allmaps>:
-
-=back
 
-=cut
-
-##################################################
-##################################################
 sub assessparms {
 
     my $r=shift;
 
+
+
+# -------------------------------------------------------- Variable declaration
     my @ids=();
     my %symbp=();
     my %mapp=();
@@ -1400,9 +2191,6 @@ sub assessparms {
     my %keyp=();
     my %uris=();
     my %maptitles=();
-
-# -------------------------------------------------------- Variable declaration
-
     my %allmaps=();
     my %alllevs=();
 
@@ -1412,7 +2200,7 @@ sub assessparms {
     my $csec;
     my $cgroup;
     my @usersgroups = ();
- 
+
     my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
 
     $alllevs{'Resource Level'}='full';
@@ -1421,35 +2209,55 @@ sub assessparms {
 
     my %allparms;
     my %allparts;
+# ------------------------------------------------------------------------------
+
 #
 # Order in which these parameters will be displayed
 #
     my %keyorder=&standardkeyorder();
 
-    @ids=();
-    %symbp=();
-    %typep=();
+#    @ids=();
+#    %symbp=();       # These seem defined above already.
+#    %typep=();
 
     my $message='';
 
     $csec=$env{'form.csec'};
+    if ($env{'request.course.sec'} ne '') {
+        $csec = $env{'request.course.sec'};    
+    }
+
+# Check group privs.
     $cgroup=$env{'form.cgroup'};
+    my $noeditgrp; 
+    if ($cgroup ne '') {
+        unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            if (($env{'request.course.groups'} eq '') || 
+                (!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
+                $noeditgrp = 1;
+            }
+        }
+    }
 
     if      ($udom=$env{'form.udom'}) {
     } elsif ($udom=$env{'request.role.domain'}) {
     } elsif ($udom=$env{'user.domain'}) {
     } else {
-	$udom=$r->dir_config('lonDefDomain');
+        $udom=$r->dir_config('lonDefDomain');
     }
+    
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$env{'form.pschp'};
+
+
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
-    if (!@psprt) { $psprt[0]='0'; }
+    if (!@psprt) { $psprt[0]='all'; }
+    if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }
 
     my $pssymb='';
     my $parmlev='';
- 
+
     unless ($env{'form.parmlev'}) {
         $parmlev = 'map';
     } else {
@@ -1459,63 +2267,68 @@ sub assessparms {
 # ----------------------------------------------- Was this started from grades?
 
     if (($env{'form.command'} eq 'set') && ($env{'form.url'})
-	&& (!$env{'form.dis'})) {
-	my $url=$env{'form.url'};
-	$url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-	$pssymb=&Apache::lonnet::symbread($url);
-	if (!@pscat) { @pscat=('all'); }
-	$pschp='';
+    && (!$env{'form.dis'})) {
+        my $url=$env{'form.url'};
+        $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+        $pssymb=&Apache::lonnet::symbread($url);
+        if (!@pscat) { @pscat=('all'); }
+        $pschp='';
         $parmlev = 'full';
     } elsif ($env{'form.symb'}) {
-	$pssymb=$env{'form.symb'};
-	if (!@pscat) { @pscat=('all'); }
-	$pschp='';
+        $pssymb=$env{'form.symb'};
+        if (!@pscat) { @pscat=('all'); }
+        $pschp='';
         $parmlev = 'full';
     } else {
-	$env{'form.url'}='';
+        $env{'form.url'}='';
     }
 
     my $id=$env{'form.id'};
     if (($id) && ($udom)) {
-	$uname=(&Apache::lonnet::idget($udom,$id))[1];
-	if ($uname) {
-	    $id='';
-	} else {
-	    $message=
-		'<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
-		&mt('at domain')." '$udom'</span>";
-	}
+        $uname=(&Apache::lonnet::idget($udom,$id))[1];
+        if ($uname) {
+            $id='';
+        } else {
+            $message=
+                '<p class="LC_warning">'.
+                &mt('Unknown ID [_1] at domain [_2]',
+                    "'".$id."'","'".$udom."'").
+                '</p>';
+        }
     } else {
-	$uname=$env{'form.uname'};
+        $uname=$env{'form.uname'};
     }
     unless ($udom) { $uname=''; }
     $uhome='';
     if ($uname) {
-	$uhome=&Apache::lonnet::homeserver($uname,$udom);
+        $uhome=&Apache::lonnet::homeserver($uname,$udom);
         if ($uhome eq 'no_host') {
-	    $message=
-		'<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
-		&mt("at domain")." '$udom'</span>";
-	    $uname='';
+            $message=
+                '<p class="LC_warning">'.
+                &mt('Unknown user [_1] at domain [_2]',
+                    "'".$uname."'","'".$udom."'").
+                '</p>';
+            $uname='';
         } else {
-	    $csec=&Apache::lonnet::getsection($udom,$uname,
-					      $env{'request.course.id'});
-            
-	    if ($csec eq '-1') {
-		$message='<span class="LC_error">'.
-		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
-		    &mt("not in this course")."</span>";
-		$uname='';
-		$csec=$env{'form.csec'};
+            $csec=&Apache::lonnet::getsection($udom,$uname,
+                          $env{'request.course.id'});
+            if ($csec eq '-1') {
+                $message=
+                    '<p class="LC_warning">'.
+                    &mt('User [_1] at domain [_2] not in this course',
+                        "'".$uname."'","'".$udom."'").
+                    '</p>';
+                $uname='';
+                $csec=$env{'form.csec'};
                 $cgroup=$env{'form.cgroup'};
-	    } else {
-		my %name=&Apache::lonnet::userenvironment($udom,$uname,
-		      ('firstname','middlename','lastname','generation','id'));
-		$message="\n<p>\n".&mt("Full Name").": ".
-		    $name{'firstname'}.' '.$name{'middlename'}.' '
-			.$name{'lastname'}.' '.$name{'generation'}.
-			    "<br>\n".&mt('ID').": ".$name{'id'}.'<p>';
-	    }
+            } else {
+                my %name=&Apache::lonnet::userenvironment($udom,$uname,
+                  ('firstname','middlename','lastname','generation','id'));
+                $message="\n<p>\n".&mt("Full Name").": ".
+                $name{'firstname'}.' '.$name{'middlename'}.' '
+                .$name{'lastname'}.' '.$name{'generation'}.
+                "<br />\n".&mt('Student/Employee ID').": ".$name{'id'}.'<p>';
+            }
             @usersgroups = &Apache::lonnet::get_users_groups(
                                        $udom,$uname,$env{'request.course.id'});
             if (@usersgroups > 0) {
@@ -1530,9 +2343,9 @@ sub assessparms {
     unless ($cgroup) { $cgroup=''; }
 
 # --------------------------------------------------------- Get all assessments
-    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, 
-				\%mapp, \%symbp,\%maptitles,\%uris,
-				\%keyorder);
+    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
+                \%mapp, \%symbp,\%maptitles,\%uris,
+                \%keyorder);
 
     $mapp{'0.0'} = '';
     $symbp{'0.0'} = '';
@@ -1542,52 +2355,230 @@ sub assessparms {
         my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
         my @values=split(/\&\&\&/,$env{'form.pres_value'});
         my @types=split(/\&\&\&/,$env{'form.pres_type'});
-	for (my $i=0;$i<=$#markers;$i++) {
-	    $message.=&storeparm(split(/\&/,$markers[$i]),
-				 $values[$i],
-				 $types[$i],
-				 $uname,$udom,$csec,$cgroup);
-	}
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
+        my ($got_chostname,$chostname,$cmajor,$cminor);
+        my $totalstored = 0;
+        my $now = time;
+        for (my $i=0;$i<=$#markers;$i++) {
+            my ($needsrelease,$needsnewer,$name);
+            if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(7|8|9)$/)) {
+                next if ($csec ne $env{'request.course.sec'});
+            }
+            if ($markers[$i] =~ /\&(6|5|4)$/) {
+                next if ($noeditgrp);
+            } 
+            if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+                my (@ok_slots,@fail_slots,@del_slots);
+                my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+                my ($level,@all) =
+                    &parmval_by_symb('0.availablestudent',$pssymb,'',$uname,$udom,
+                                     $csec,$cgroup,$courseopt);
+                foreach my $slot_name (split(/:/,$values[$i])) {
+                    next if ($slot_name eq '');
+                    if (&update_slots($slot_name,$cdom,$cnum,$pssymb,$uname,$udom) eq 'ok') {
+                        push(@ok_slots,$slot_name);
+
+                    } else {
+                        push(@fail_slots,$slot_name);
+                    }
+                }
+                if (@ok_slots) {
+                    $values[$i] = join(':',@ok_slots);
+                } else {
+                    $values[$i] = '';
+                }
+                if ($all[$level] ne '') {
+                    my @existing = split(/:/,$all[$level]);
+                    foreach my $slot_name (@existing) {
+                        if (!grep(/^\Q$slot_name\E$/,split(/:/,$values[$i]))) {
+                            if (&delete_slots($slot_name,$cdom,$cnum,$uname,$udom,$pssymb) eq 'ok') {
+                                push(@del_slots,$slot_name);
+                            }
+                        }
+                    }
+                }
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate|acc)\&\d+$/) {
+                $name = $1;
+                my $val = $values[$i];
+                my $valmatch = '';
+                if ($name eq 'examcode') {
+                    if (&Apache::lonnet::validCODE($values[$i])) {
+                        $val = 'valid';
+                    }
+                } elsif ($name eq 'printstartdate') {
+                    if ($val =~ /^\d+$/) {
+                        if ($val > $now) {
+                            $val = 'future';
+                        }
+                    } 
+                } elsif ($name eq 'printenddate') {
+                    if ($val =~ /^\d+$/) {
+                        if ($val < $now) {
+                            $val = 'past';
+                        }
+                    }
+                } elsif (($name eq 'lenient') || ($name eq 'acc')) {
+                    my $stringtype = &get_stringtype($name);
+                    my $stringmatch = &standard_string_matches($stringtype);
+                    if (ref($stringmatch) eq 'ARRAY') {
+                        foreach my $item (@{$stringmatch}) {
+                            if (ref($item) eq 'ARRAY') {
+                                my ($regexpname,$pattern) = @{$item};
+                                if ($pattern ne '') {
+                                    if ($val =~ /$pattern/) {
+                                        $valmatch = $regexpname;
+                                        $val = '';
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                $needsrelease =
+                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
+                if ($needsrelease) {
+                    unless ($got_chostname) {
+                        ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                        $got_chostname = 1;
+                    } 
+                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,
+                                                          $needsrelease,
+                                                          $cmajor,$cminor);
+                }
+            }
+            if ($needsnewer) {
+                $message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor,
+                                                $cminor,$needsrelease);
+            } else {
+                $message.=&storeparm(split(/\&/,$markers[$i]),
+                                     $values[$i],
+                                     $types[$i],
+                                     $uname,$udom,$csec,$cgroup);
+                $totalstored ++;
+            }
+        }
 # ---------------------------------------------------------------- Done storing
-	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
+        if ($totalstored) {
+            $message.='<p class="LC_warning">'
+                     .&mt('Changes can take up to 10 minutes before being active for all students.')
+                     .&Apache::loncommon::help_open_topic('Caching')
+                     .'</p>';
+        }
     }
 #----------------------------------------------- if all selected, fill in array
-    if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
-    if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries') }; 
-    if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
+    if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
+    if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
+    if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys(%allparts));}
 # ------------------------------------------------------------------ Start page
 
-    &startpage($r);
+    my $crstype = &Apache::loncommon::course_type();
+    &startpage($r,$pssymb,$crstype);
 
-    foreach ('tolerance','date_default','date_start','date_end',
-	     'date_interval','int','float','string') {
-	$r->print('<input type="hidden" value="'.
-		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+    foreach my $item ('tolerance','date_default','date_start','date_end',
+        'date_interval','int','float','string') {
+        $r->print('<input type="hidden" value="'.
+          &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
+          '" name="recent_'.$item.'" />');
     }
-                        
+
+    # ----- Start Parameter Selection
+
+    # Hide parm selection?
+    $r->print(<<ENDPARMSELSCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+function parmsel_show() {
+  document.getElementById('parmsel').style.display = "";
+  document.getElementById('parmsellink').style.display = "none";
+}
+// ]]>
+</script>
+ENDPARMSELSCRIPT
+    
     if (!$pssymb) {
-        $r->print('<table border="1"><tr><td>');
+        my $parmselhiddenstyle=' style="display:none"';
+        if($env{'form.hideparmsel'} eq 'hidden') {
+           $r->print('<div id="parmsel"'.$parmselhiddenstyle.'>');
+        } else  {
+           $r->print('<div id="parmsel">');
+        }
+
+        # Step 1
+        $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification'),'parmstep1'));
+        $r->print('
+<script type="text/javascript">
+// <![CDATA['.
+                 &showhide_js().'
+// ]]>
+</script>
+');
+        $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
         &levelmenu($r,\%alllevs,$parmlev);
-	if ($parmlev ne 'general') {
-            $r->print('<td>');
-	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
-	    $r->print('</td>');
-	}
-        $r->print('</td></tr></table>');
-	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
-    } else {
-        my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
-	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 />');
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
+        &partmenu($r,\%allparts,\@psprt);
+        $r->print(&Apache::lonhtmlcommon::row_closure(1));
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+
+        # Step 2
+        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
+        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');
+
+        # Step 3
+        $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
+        $r->print(&Apache::lonhtmlcommon::row_closure(1));
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+
+        # Update Display Button
+        $r->print('<p>'
+             .'<input type="submit" name="dis"'
+             .' value="'.&mt('Update Display').'" />'
+             .'<input type="hidden" name="hideparmsel" value="hidden" />'
+             .'</p>');
+        $r->print('</div>');
+
+        # Offer link to display parameter selection again
+        $r->print('<p id="parmsellink"');
+        if ($env{'form.hideparmsel'} ne 'hidden') {
+           $r->print($parmselhiddenstyle);
+        }
+        $r->print('>'
+             .'<a href="javascript:parmsel_show()">'
+             .&mt('Change Parameter Selection')
+             .'</a>'
+             .'</p>');
+    } else {
+        # parameter screen for a single resource. 
+        my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
+        my $title = &Apache::lonnet::gettitle($pssymb);
+        $r->print(&mt('Specific Resource: [_1] ([_2])',
+                         $title,'<span class="LC_filename">'.$resource.'</span>').
+                '<input type="hidden" value="'.$pssymb.'" name="symb" />'.
+                  '<br />');
+        $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
+        $r->print(&Apache::lonhtmlcommon::row_closure(1));
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        $r->print('<p>'
+             .'<input type="submit" name="dis"'
+             .' value="'.&mt('Update Display').'" />'
+             .'<input type="hidden" name="hideparmsel" value="hidden" />'
+             .'</p>');
     }
-    &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);    
+    
+    # ----- End Parameter Selection
 
-    $r->print('<p>'.$message.'</p>');
+    # Display Messages
+    $r->print('<div>'.$message.'</div>');
 
-    $r->print('<br /><input type="submit" name="dis" value="'.&mt("Update Parameter Display").'" />');
 
     my @temp_pscat;
     map {
@@ -1597,6 +2588,7 @@ sub assessparms {
 
     @pscat = @temp_pscat;
 
+
     if (($env{'form.prevvisit'}) || ($pschp) || ($pssymb)) {
 # ----------------------------------------------------------------- Start Table
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
@@ -1604,106 +2596,112 @@ sub assessparms {
         my $csudom=$env{'user.domain'};
 
         if ($parmlev eq 'full') {
-           my $coursespan=$csec?8:5;
-           my $userspan=3;
-           if ($cgroup ne '') {
-              $coursespan += 3;
-           } 
-      
-           $r->print('<p><table border=2>');
-           $r->print('<tr><td colspan=5></td>');
-           $r->print('<th colspan='.($coursespan).'>'.&mt('Any User').'</th>');
-           if ($uname) {
-               if (@usersgroups > 1) {
-                   $userspan ++;
+#
+# This produces the cascading table output of parameters
+#
+               my $coursespan=$csec?8:5;
+               my $userspan=3;
+               if ($cgroup ne '') {
+                  $coursespan += 3;
                }
-               $r->print('<th colspan="'.$userspan.'" rowspan="2">');
-               $r->print(&mt("User")." $uname ".&mt('at Domain')." $udom</th>");
-           }
-	   my %lt=&Apache::lonlocal::texthash(
-				  'pie'    => "Parameter in Effect",
-				  'csv'    => "Current Session Value",
-                                  'at'     => 'at',
-                                  'rl'     => "Resource Level",
-				  'ic'     => 'in Course',
-				  'aut'    => "Assessment URL and Title",
-				  'type'   => 'Type',
-				  'emof'   => "Enclosing Map or Folder",
-				  'part'   => 'Part',
-                                  'pn'     => 'Parameter Name',
-				  'def'    => 'default',
-				  'femof'  => 'from Enclosing Map or Folder',
-				  'gen'    => 'general',
-				  'foremf' => 'for Enclosing Map or Folder',
-				  'fr'     => 'for Resource'
-					      );
-           $r->print(<<ENDTABLETWO);
-<th rowspan=3>$lt{'pie'}</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>
+
+               $r->print(&Apache::loncommon::start_data_table());
+#
+# This produces the headers
+#
+               $r->print('<tr><td colspan="5"></td>');
+               $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
+               if ($uname) {
+                if (@usersgroups > 1) {
+                       $userspan ++;
+                   }
+                   $r->print('<th colspan="'.$userspan.'" rowspan="2">');
+                   $r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
+               }
+               my %lt=&Apache::lonlocal::texthash(
+                'pie'    => "Parameter in Effect",
+                'csv'    => "Current Session Value",
+                'rl'     => "Resource Level",
+                'ic'     => 'in Course',
+                'aut'    => "Assessment URL and Title",
+                'type'   => 'Type',
+                'emof'   => "Enclosing Map or Folder",
+                'part'   => 'Part',
+                'pn'     => 'Parameter Name',
+                'def'    => 'default',
+                'femof'  => 'from Enclosing Map or Folder',
+                'gen'    => 'general',
+                'foremf' => 'for Enclosing Map or Folder',
+                'fr'     => 'for Resource'
+            );
+               $r->print(<<ENDTABLETWO);
+<th rowspan="3">$lt{'pie'}</th>
+<th rowspan="3">$lt{'csv'}<br />($csuname:$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>
 
 ENDTABLETWO
-           if ($csec) {
-                $r->print("<th colspan=3>".
-			  &mt("in Section")." $csec</th>");
-           }
-           if ($cgroup) {
-                $r->print("<th colspan=3>".
-                          &mt("in Group")." $cgroup</th>");
-           }
-           $r->print(<<ENDTABLEHEADFOUR);
+               if ($csec) {
+                   $r->print('<th colspan="3">'.
+                  &mt("in Section")." $csec</th>");
+               }
+               if ($cgroup) {
+                $r->print('<th colspan="3">'.
+                &mt("in Group")." $cgroup</th>");
+               }
+               $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
 <th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
 <th>$lt{'gen'}</th><th>$lt{'foremf'}</th>
 <th>$lt{'def'}</th><th>$lt{'femof'}</th><th>$lt{'fr'}</th>
 ENDTABLEHEADFOUR
 
-           if ($csec) {
-               $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
-           }
-
-           if ($cgroup) {
-               $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
-           }
+               if ($csec) {
+                   $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
+               }
 
-           if ($uname) {
-               if (@usersgroups > 1) {
-                   $r->print('<th>'.&mt('Control by other group?').'</th>');
+               if ($cgroup) {
+                $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
                }
-               $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
-           }
 
-           $r->print('</tr>');
+               if ($uname) {
+                if (@usersgroups > 1) {
+                    $r->print('<th>'.&mt('Control by other group?').'</th>');
+                   }
+                   $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
+               }
 
-           my $defbgone='';
-           my $defbgtwo='';
-           my $defbgthree = '';
+               $r->print('</tr>');
+#
+# Done with the headers
+# 
+               my $defbgone='';
+               my $defbgtwo='';
+               my $defbgthree = '';
 
-           foreach (@ids) {
+               foreach my $rid (@ids) {
 
-                my $rid=$_;
                 my ($inmapid)=($rid=~/\.(\d+)$/);
 
-                if ((!$pssymb && 
-		     (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
-		    ||
-		    ($pssymb && $pssymb eq $symbp{$rid})) {
+                if ((!$pssymb &&
+                 (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
+                ||
+                ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
-                    if ($defbgone eq '"#E0E099"') {
-                        $defbgone='"#E0E0DD"';
+                    if ($defbgone eq '#E0E099') {
+                        $defbgone='#E0E0DD';
                     } else {
-                        $defbgone='"#E0E099"';
+                        $defbgone='#E0E099';
                     }
-                    if ($defbgtwo eq '"#FFFF99"') {
-                        $defbgtwo='"#FFFFDD"';
+                    if ($defbgtwo eq '#FFFF99') {
+                        $defbgtwo='#FFFFDD';
                     } else {
-                        $defbgtwo='"#FFFF99"';
+                        $defbgtwo='#FFFF99';
                     }
-                    if ($defbgthree eq '"#FFBB99"') {
-                        $defbgthree='"#FFBBDD"';
+                    if ($defbgthree eq '#FFBB99') {
+                        $defbgthree='#FFBBDD';
                     } else {
-                        $defbgthree='"#FFBB99"';
+                        $defbgthree='#FFBB99';
                     }
 
                     my $thistitle='';
@@ -1715,80 +2713,94 @@ ENDTABLEHEADFOUR
                     my %default=();
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
-                    foreach (&keysplit($keyp{$rid})) {
-                        my $tempkeyp = $_;
+                    my $filter=$env{'form.filter'};
+                    foreach my $tempkeyp (&keysplit($keyp{$rid})) {
                         if (grep $_ eq $tempkeyp, @catmarker) {
-                          $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
-                          $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
-                          $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
-                          unless ($display{$_}) { $display{$_}=''; }
-                          $display{$_}.=' ('.$name{$_}.')';
-                          $default{$_}=&Apache::lonnet::metadata($uri,$_);
-                          $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
-                          $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+                          my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
+# We may only want certain parameters listed
+                          if ($filter) {
+                             unless ($filter=~/\Q$parmname\E/) { next; }
+                          }
+                          $name{$tempkeyp}=$parmname;
+                          $part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');
+
+                          my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
+                          if ($allparms{$name{$tempkeyp}} ne '') {
+                              my $identifier;
+                              if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                  $identifier = $1;
+                              }
+                              $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                          } else {
+                              $display{$tempkeyp} = $parmdis;
+                          }
+                          unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
+                          $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
+                          $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
+                          $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
+                          $thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
                         }
                     }
-                    my $totalparms=scalar keys %name;
+                    my $totalparms=scalar(keys(%name));
                     if ($totalparms>0) {
-                        my $firstrow=1;
-			my $title=&Apache::lonnet::gettitle($symbp{$rid});
-                        $r->print('<tr><td bgcolor='.$defbgone.
+                           my $firstrow=1;
+                        my $title=&Apache::lonnet::gettitle($symbp{$rid});
+                        $r->print('<tr><td style="background-color:'.$defbgone.';"'.
                              ' rowspan='.$totalparms.
-                             '><tt><font size=-1>'.
+                             '><tt><font size="-1">'.
                              join(' / ',split(/\//,$uri)).
                              '</font></tt><p><b>'.
                              "<a href=\"javascript:openWindow('".
-				  &Apache::lonnet::clutter($uri).'?symb='.
-				  &escape($symbp{$rid}).
-                             "', 'metadatafile', '450', '500', 'no', 'yes')\";".
-                             " TARGET=_self>$title");
+                          &Apache::lonnet::clutter($uri).'?symb='.
+                          &escape($symbp{$rid}).
+                             "', 'metadatafile', '450', '500', 'no', 'yes');\"".
+                             " target=\"_self\">$title");
 
                         if ($thistitle) {
                             $r->print(' ('.$thistitle.')');
                         }
                         $r->print('</a></b></td>');
-                        $r->print('<td bgcolor='.$defbgtwo.
+                        $r->print('<td style="background-color:'.$defbgtwo.';"'.
                                       ' rowspan='.$totalparms.'>'.$typep{$rid}.
                                       '</td>');
 
-                        $r->print('<td bgcolor='.$defbgone.
+                        $r->print('<td style="background-color:'.$defbgone.';"'.
                                       ' rowspan='.$totalparms.
                                       '>'.$maptitles{$mapp{$rid}}.'</td>');
-
-                        foreach (&keysinorder_bytype(\%name,\%keyorder)) {
+                        foreach my $item (&keysinorder_bytype(\%name,\%keyorder)) {
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
                                 undef $firstrow;
                             }
-                            &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
+                            &print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                                            $cgroup,\@usersgroups);
+                                       $cgroup,\@usersgroups,$noeditgrp);
                         }
                     }
                 }
             } # end foreach ids
 # -------------------------------------------------- End entry for one resource
-            $r->print('</table>');
+            $r->print(&Apache::loncommon::end_data_table);
         } # end of  full
 #--------------------------------------------------- Entry for parm level map
         if ($parmlev eq 'map') {
-            my $defbgone = '"E0E099"';
-            my $defbgtwo = '"FFFF99"';
-            my $defbgthree = '"FFBB99"';
+            my $defbgone = '#E0E099';
+            my $defbgtwo = '#FFFF99';
+            my $defbgthree = '#FFBB99';
 
             my %maplist;
 
             if ($pschp eq 'all') {
-                %maplist = %allmaps; 
+                %maplist = %allmaps;
             } else {
                 %maplist = ($pschp => $mapp{$pschp});
             }
 
 #-------------------------------------------- for each map, gather information
             my $mapid;
-	    foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys %maplist) {
+               foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
                 my $maptitle = $maplist{$mapid};
 
 #-----------------------  loop through ids and get all parameter types for map
@@ -1800,16 +2812,16 @@ ENDTABLEHEADFOUR
                 my %default = ();
                 my $map = 0;
 
-#		$r->print("Catmarker: @catmarker<br />\n");
-               
-                foreach (@ids) {
-                  ($map)=(/([\d]*?)\./);
-                  my $rid = $_;
-        
+#        $r->print("Catmarker: @catmarker<br />\n");
+
+                foreach my $id (@ids) {
+                    ($map)=($id =~ /([\d]*?)\./);
+                    my $rid = $id;
+
 #                  $r->print("$mapid:$map:   $rid <br /> \n");
 
-                  if ($map eq $mapid) {
-                    my $uri=&Apache::lonnet::declutter($uris{$rid});
+                     if ($map eq $mapid) {
+                        my $uri=&Apache::lonnet::declutter($uris{$rid});
 #                    $r->print("Keys: $keyp{$rid} <br />\n");
 
 #--------------------------------------------------------------------
@@ -1819,71 +2831,85 @@ ENDTABLEHEADFOUR
 # When storing information, store as part 0
 # When requesting information, request from full part
 #-------------------------------------------------------------------
-                    foreach (&keysplit($keyp{$rid})) {
-                      my $tempkeyp = $_;
-                      my $fullkeyp = $tempkeyp;
-                      $tempkeyp =~ s/_\w+_/_0_/;
-                      
-                      if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
-                        $part{$tempkeyp}="0";
-                        $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                        $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
-                        unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
-                        $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
-                        $display{$tempkeyp} =~ s/_\w+_/_0_/;
-                        $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
-                        $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
+                        foreach my $fullkeyp (&keysplit($keyp{$rid})) {
+                            my $tempkeyp = $fullkeyp;
+                            $tempkeyp =~ s/_\w+_/_0_/;
+
+                            if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
+                                $part{$tempkeyp}="0";
+                                $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
+                                my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                                if ($allparms{$name{$tempkeyp}} ne '') {
+                                    my $identifier;
+                                    if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                        $identifier = $1;
+                                    }
+                                    $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                                } else {
+                                    $display{$tempkeyp} = $parmdis;
+                                }
+                                unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
+                                $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
+                                $display{$tempkeyp} =~ s/_\w+_/_0_/;
+                                $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
+                                $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
+                              }
+                        } # end loop through keys
                       }
-                    } # end loop through keys
-                  }
                 } # end loop through ids
-                                 
+
 #---------------------------------------------------- print header information
                 my $foldermap=&mt($maptitle=~/^uploaded/?'Folder':'Map');
                 my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
-                $r->print(<<ENDMAPONE);
-<center><h4>
-Set Defaults for All Resources in $foldermap<br />
-<font color="red"><i>$showtitle</i></font><br />
-Specifically for
-ENDMAPONE
+                my $tmp="";
                 if ($uname) {
-		    my $person=&Apache::loncommon::plainname($uname,$udom);
-                    $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
-                        &mt('in')." \n");
+                    my $person=&Apache::loncommon::plainname($uname,$udom);
+                    $tmp.=&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
+                        &mt('in')." \n";
                 } else {
-                    $r->print("<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n");
+                    $tmp.="<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n";
                 }
                 if ($cgroup) {
-                    $r->print(&mt("Group")." <font color=\"red\"><i>$cgroup".
-                              "</i></font> ".&mt('of')." \n");
+                    $tmp.=&mt("Group")." <font color=\"red\"><i>$cgroup".
+                              "</i></font> ".&mt('of')." \n";
                     $csec = '';
                 } elsif ($csec) {
-                    $r->print(&mt("Section")." <font color=\"red\"><i>$csec".
-                              "</i></font> ".&mt('of')." \n");
+                    $tmp.=&mt("Section")." <font color=\"red\"><i>$csec".
+                              "</i></font> ".&mt('of')." \n";
                 }
-                $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
-                $r->print("</h4>\n");
+                $r->print('<div align="center"><h4>'
+                         .&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
+                             ,$foldermap.'<br /><font color="red"><i>'.$showtitle.'</i></font><br />'
+                             ,$tmp
+                             ,'<font color="red"><i>'.$coursename.'</i></font>'
+                             )
+                         ."<br /></h4>\n"
+                );
 #---------------------------------------------------------------- print table
-                $r->print('<p><table border="2">');
-                $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
-                $r->print('<th>'.&mt('Default Value').'</th>');
-                $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
-
-	        foreach (&keysinorder(\%name,\%keyorder)) {
-                    $r->print('<tr>');
-                    &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+                $r->print('<p>'.&Apache::loncommon::start_data_table()
+                         .&Apache::loncommon::start_data_table_header_row()
+                         .'<th>'.&mt('Parameter Name').'</th>'
+                         .'<th>'.&mt('Default Value').'</th>'
+                         .'<th>'.&mt('Parameter in Effect').'</th>'
+                         .&Apache::loncommon::end_data_table_header_row()
+                );
+
+                foreach my $item (&keysinorder(\%name,\%keyorder)) {
+                    $r->print(&Apache::loncommon::start_data_table_row());
+                    &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup);
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
                 }
-                $r->print("</table></center>");
+                $r->print(&Apache::loncommon::end_data_table().'</p>'
+                         .'</div>'
+                );
             } # end each map
         } # end of $parmlev eq map
 #--------------------------------- Entry for parm level general (Course level)
         if ($parmlev eq 'general') {
-            my $defbgone = '"E0E099"';
-            my $defbgtwo = '"FFFF99"';
-            my $defbgthree = '"FFBB99"';
+            my $defbgone = '#E0E099';
+            my $defbgtwo = '#FFFF99';
+            my $defbgthree = '#FFBB99';
 
 #-------------------------------------------- for each map, gather information
             my $mapid="0.0";
@@ -1894,10 +2920,10 @@ ENDMAPONE
             my %display = ();
             my %type = ();
             my %default = ();
-               
-            foreach (@ids) {
-                my $rid = $_;
-        
+
+            foreach $id (@ids) {
+                my $rid = $id;
+
                 my $uri=&Apache::lonnet::declutter($uris{$rid});
 
 #--------------------------------------------------------------------
@@ -1907,451 +2933,102 @@ ENDMAPONE
 # When storing information, store as part 0
 # When requesting information, request from full part
 #-------------------------------------------------------------------
-                foreach (&keysplit($keyp{$rid})) {
-                  my $tempkeyp = $_;
-                  my $fullkeyp = $tempkeyp;
-                  $tempkeyp =~ s/_\w+_/_0_/;
-                  if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
-                    $part{$tempkeyp}="0";
-                    $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                    $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
-                    unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
-                    $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
-                    $display{$tempkeyp} =~ s/_\w+_/_0_/;
-                    $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
-                    $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
-                  }
+                foreach my $fullkeyp (&keysplit($keyp{$rid})) {
+                    my $tempkeyp = $fullkeyp;
+                    $tempkeyp =~ s/_\w+_/_0_/;
+                    if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
+                        $part{$tempkeyp}="0";
+                        $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
+                        my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                        if ($allparms{$name{$tempkeyp}} ne '') {
+                            my $identifier;
+                            if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                $identifier = $1;
+                            }
+                            $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                        } else {
+                            $display{$tempkeyp} = $parmdis;
+                        }
+                        unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
+                        $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
+                        $display{$tempkeyp} =~ s/_\w+_/_0_/;
+                        $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
+                        $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
+                      }
                 } # end loop through keys
             } # end loop through ids
-                                 
+
 #---------------------------------------------------- print header information
-	    my $setdef=&mt("Set Defaults for All Resources in Course");
+            my $setdef=&mt("Set Defaults for All Resources in Course");
             $r->print(<<ENDMAPONE);
-<center><h4>$setdef
+<center>
+<h4>$setdef
 <font color="red"><i>$coursename</i></font><br />
 ENDMAPONE
             if ($uname) {
-		my $person=&Apache::loncommon::plainname($uname,$udom);
+                my $person=&Apache::loncommon::plainname($uname,$udom);
                 $r->print(" ".&mt("User")."<font color=\"red\"> <i>$uname \($person\) </i></font> \n");
             } else {
                 $r->print("<i><font color=\"red\"> ".&mt("ALL")."</i> ".&mt("USERS")."</font> \n");
             }
-            
+
             if ($csec) {$r->print(&mt("Section")."<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">');
-            $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
-            $r->print('<th>'.&mt('Default Value').'</th>');
-            $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
-
-	    foreach (&keysinorder(\%name,\%keyorder)) {
-                $r->print('<tr>');
-                &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+            $r->print('<p>'.&Apache::loncommon::start_data_table()
+                     .&Apache::loncommon::start_data_table_header_row()
+                     .'<th>'.&mt('Parameter Name').'</th>'
+                     .'<th>'.&mt('Default Value').'</th>'
+                     .'<th>'.&mt('Parameter in Effect').'</th>'
+                     .&Apache::loncommon::end_data_table_header_row()
+            );
+
+            foreach my $item (&keysinorder(\%name,\%keyorder)) {
+                $r->print(&Apache::loncommon::start_data_table_row());
+                &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                        \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                                   $parmlev,$uname,$udom,$csec,$cgroup);
+                                   $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
             }
-            $r->print("</table></center>");
+            $r->print(&Apache::loncommon::end_data_table()
+                     .'</p>'
+                     .'</center>'
+            );
         } # end of $parmlev eq general
     }
-    $r->print('</form>'.&Apache::loncommon::end_page());
+    $r->print('</form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
-
-##################################################
-##################################################
-
-=pod
-
-=item crsenv
-
-Show and set course data and parameters.  This is a large routine that should
-be simplified and shortened... someday.
-
-Inputs: $r
-
-Returns: nothing
-
-=cut
-
-##################################################
-##################################################
-sub crsenv {
-    my $r=shift;
-    my $setoutput='';
-
-    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'};
-
-    #
-    # Go through list of changes
-    foreach (keys %env) {
-        next if ($_!~/^form\.(.+)\_setparmval$/);
-        my $name  = $1;
-        my $value = $env{'form.'.$name.'_value'};
-        if ($name eq 'newp') {
-            $name = $env{'form.newp_name'};
-        }
-        if ($name eq 'url') {
-            $value=~s/^\/res\///;
-            my $bkuptime=time;
-            my @tmp = &Apache::lonnet::get
-                ('environment',['url'],$dom,$crs);
-            $setoutput.=&mt('Backing up previous URL').': '.
-                &Apache::lonnet::put
-                ('environment',
-                 {'top level map backup '.$bkuptime => $tmp[1] },
-                 $dom,$crs).
-                     '<br>';
-        }
-        #
-        # Deal with modified default spreadsheets
-        if ($name =~ /^spreadsheet_default_(classcalc|
-                                            studentcalc|
-                                            assesscalc)$/x) {
-            my $sheettype = $1; 
-            if ($sheettype eq 'classcalc') {
-                # no need to do anything since viewing the sheet will
-                # cause it to be updated. 
-            } elsif ($sheettype eq 'studentcalc') {
-                # expire all the student spreadsheets
-                &Apache::lonnet::expirespread('','','studentcalc');
-            } else {
-                # expire all the assessment spreadsheets 
-                #    this includes non-default spreadsheets, but better to
-                #    be safe than sorry.
-                &Apache::lonnet::expirespread('','','assesscalc');
-                # expire all the student spreadsheets
-                &Apache::lonnet::expirespread('','','studentcalc');
-            }
-        }
-        #
-        # Deal with the enrollment dates
-        if ($name =~ /^default_enrollment_(start|end)_date$/) {
-            $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
-        }
-        # Get existing cloners
-        my @oldcloner = ();
-        if ($name eq 'cloners') {
-            my %clonenames=&Apache::lonnet::dump('environment',$dom,$crs,'cloners');
-            if ($clonenames{'cloners'} =~ /,/) {
-                @oldcloner = split/,/,$clonenames{'cloners'};
-            } else {
-                $oldcloner[0] = $clonenames{'cloners'};
-            }
-        }
-        #
-        # Let the user know we made the changes
-        if ($name && defined($value)) {
-            my $failed_cloners;
-            if ($name eq 'cloners') {
-                $value =~ s/\s//g;
-                $value =~ s/^,//;
-                $value =~ s/,$//;
-                # check requested clones are valid users.
-                $failed_cloners = &check_cloners(\$value,\@oldcloner);
-            }
-            my $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
-            if ($put_result eq 'ok') {
-                $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
-                if ($name eq 'cloners') {
-                    &change_clone($value,\@oldcloner);
-                }
-                # Flush the course logs so course description is immediately updated
-                if ($name eq 'description' && defined($value)) {
-                    &Apache::lonnet::flushcourselogs();
-                }
-            } else {
-                $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
-		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
-            }
-            if (($name eq 'cloners') && ($failed_cloners)) {
-                $setoutput.= &mt('Unable to include').' - <b>'.$failed_cloners.'</b>, '.
-                 &mt('reason').' - '.&mt('LON-CAPA user(s) do(es) not exist').
-                 '.<br />'.&mt('Please ').
-                 ' <a href="/adm/createuser">'.
-                 &mt('add the user(s)').'</a>, '.
-                 &mt('and then return to the ').
-                 '<a href="/admparmset?action=crsenv">'.
-                 &mt('Course Parameters page').'</a> '.
-                 &mt('to add the new user(s) to the list of possible cloners').
-                 '.<br />';
-            }
-        }
-    }
-
-    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'},
-				       {'freshen_cache' => 1});
-
-# -------------------------------------------------------- Get parameters again
-
-    my %values=&Apache::lonnet::dump('environment',$dom,$crs);
-    my $SelectStyleFile=&mt('Select Style File');
-    my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
-    my $output='';
-    if (! exists($values{'con_lost'})) {
-        my %descriptions=
-	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
-                                 '<a href="javascript:openbrowser'.
-                                 "('envform','url','sequence')\">".
-                                 &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                                 &mt('Modification may make assessment data inaccessible').
-                                 '</span>',
-             'description'    => '<b>'.&mt('Course Description').'</b>',
-             'courseid'       => '<b>'.&mt('Course ID or number').
-                                 '</b><br />'.
-                                 '('.&mt('internal').', '.&mt('optional').')',
-             'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain)</tt><br />'.&mt('Users with active Course Coordinator role in the course automatically have the right to clone it, and can be omitted from list.'),
-             'grading'        => '<b>'.&mt('Grading').'</b><br />'.
-                                 '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
-             'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
-                    '<a href="javascript:openbrowser'.
-                    "('envform','default_xml_style'".
-                    ",'sty')\">$SelectStyleFile</a><br>",
-             'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
-                                 '</b><br />(<tt>user:domain,'.
-                                 'user:domain(section;section;...;*;...),...</tt>)',
-             'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
-                                 '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
-             'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
-                                 '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
-             '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 />'.
-                                 '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
-                                 &mt('changes will not show until next login').')',
-             'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b>'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.'),
-
-             'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
-                                  '</b><br />"<tt>st</tt>": '.
-                                  &mt('student').', "<tt>ta</tt>": '.
-                                  'TA, "<tt>in</tt>": '.
-                                  &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
-	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-             'plc.users.denied' => 
-                          '<b>'.&mt('Disallow live chatroom use for Users').'</b><br />'.
-                                 '(<tt>user:domain,user:domain,...</tt>)',
-
-             'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
-                                  '</b><br />"<tt>st</tt>": '.
-                                  'student, "<tt>ta</tt>": '.
-                                  'TA, "<tt>in</tt>": '.
-                                  'instructor;<br /><tt>role,role,...</tt>) '.
-	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-             'pch.users.denied' => 
-                          '<b>'.&mt('Disallow Resource Discussion for Users').'</b><br />'.
-                                 '(<tt>user:domain,user:domain,...</tt>)',
-             'spreadsheet_default_classcalc' 
-                 => '<b>'.&mt('Default Course Spreadsheet').'</b> '.
-                    '<a href="javascript:openbrowser'.
-                    "('envform','spreadsheet_default_classcalc'".
-                    ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
-             'spreadsheet_default_studentcalc' 
-                 => '<b>'.&mt('Default Student Spreadsheet').'</b> '.
-                    '<a href="javascript:openbrowser'.
-                    "('envform','spreadsheet_default_calc'".
-                    ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
-             'spreadsheet_default_assesscalc' 
-                 => '<b>'.&mt('Default Assessment Spreadsheet').'</b> '.
-                    '<a href="javascript:openbrowser'.
-                    "('envform','spreadsheet_default_assesscalc'".
-                    ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
-	     'allow_limited_html_in_feedback'
-	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
-	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
-             'allow_discussion_post_editing'
-                 => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />"<tt>st</tt>": '.
-                                  &mt('student').', "<tt>ta</tt>": '.
-                                  'TA, "<tt>in</tt>": '.
-                                  &mt('instructor').';&nbsp;(<tt>'.&mt('role:section,role:section,..., e.g., st:001,st:002,in,cc would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').'</tt>)<br />'.
-                    '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
-	     'rndseed'
-	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
-                    '<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.'),
-             'suppress_tries'
-                 => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
-                    ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
-             'problem_stream_switch'
-                 => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
-                    ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
-             'default_paper_size' 
-                 => '<b>'.&mt('Default paper type').'</b><br />'.
-                    ' ('.&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>)',
-             'default_enrollment_start_date' => '<b>'.&mt('Default beginning date for student access.').'</b>',
-             'default_enrollment_end_date'   => '<b>'.&mt('Default ending date for student access.').'</b>',
-             'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b>'.
-                                 '<br />(<tt>user:domain,user:domain,...</tt>)',
-             'languages' => '<b>'.&mt('Languages used').'</b>',
-             '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. [_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>').'</b>',
-	     'disablesigfigs'
-	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
-                    ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
-	     'disableexampointprint'
-	         => '<b>'.&mt('Disable automatically printing point values onto exams.').'</b><br />'.
-                    ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
-             'externalsyllabus'
-                 => '<b>'.&mt('URL of Syllabus (not using internal handler)').'</b>',
-	     'tthoptions'
-	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
-             ); 
-        my @Display_Order = ('url','description','courseid','cloners','grading',
-                             'externalsyllabus',
-                             'default_xml_style','pageseparators',
-                             'question.email','comment.email','policy.email',
-                             'student_classlist_view',
-                             'plc.roles.denied','plc.users.denied',
-                             'pch.roles.denied','pch.users.denied',
-                             'allow_limited_html_in_feedback',
-                             'allow_discussion_post_editing',
-                             'languages',
-			     'nothideprivileged',
-                             'rndseed',
-                             'receiptalg',
-                             'problem_stream_switch',
-			     'suppress_tries',
-                             'default_paper_size',
-			     'print_header_format',
-                             'disable_receipt_display',
-                             'spreadsheet_default_classcalc',
-                             'spreadsheet_default_studentcalc',
-                             'spreadsheet_default_assesscalc', 
-                             'hideemptyrows',
-                             'default_enrollment_start_date',
-                             'default_enrollment_end_date',
-			     'tthoptions',
-			     'disablesigfigs',
-			     'disableexampointprint',
-			     'task_messages'
-                             );
-	foreach my $parameter (sort(keys(%values))) {
-            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
-                if (! $descriptions{$parameter}) {
-                    $descriptions{$parameter}=$parameter;
-                    push(@Display_Order,$parameter);
-                }
-            }
-	}
-	
-        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 .= &Apache::loncommon::start_data_table_row().
-		'<td>'.$description.'</td>';
-            if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
-                $output .= '<td>'.
-                    &Apache::lonhtmlcommon::date_setter('envform',
-                                                        $parameter.'_value',
-                                                        $values{$parameter},
-                                                        $onchange).
-                                                        '</td>';
-            } else {
-                $output .= '<td>'.
-                    &Apache::lonhtmlcommon::textbox($parameter.'_value',
-                                                    $values{$parameter},
-                                                    40,$onchange).'</td>';
-            }
-            $output .= '<td>'.
-                &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
-                '</td>';
-            $output .= &Apache::loncommon::end_data_table_row()."\n";
-	}
-        my $onchange = 'onFocus="javascript:window.document.forms'.
-            '[\'envform\'].elements[\'newp_setparmval\']'.
-            '.checked=true;"';
-	$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>'.
-	    &Apache::loncommon::end_data_table_row()."\n";
-    }
-    my %lt=&Apache::lonlocal::texthash(
-		    'par'   => 'Parameter',
-		    'val'   => 'Value',
-		    'set'   => 'Set',
-		    'sce'   => 'Set Course Environment'
-				       );
-
-    my $Parameter=&mt('Parameter');
-    my $Value=&mt('Value');
-    my $Set=&mt('Set');
-    my $browse_js=
-	'<script type="text/javascript" language="Javascript">'.
-	&Apache::loncommon::browser_and_searcher_javascript('parmset').
-	'</script>';
-    
-    my $start_page = 
-	&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
-$start_table
-$start_header_row
-<th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th>
-$end_header_row
-$output
-$end_table
-<input type="submit" name="crsenv" value="$lt{'sce'}">
-</form>
-$end_page
-ENDENV
-}
 ##################################################
 # Overview mode
 ##################################################
 my $tableopen;
 
 sub tablestart {
+    my ($readonly) = @_;
     if ($tableopen) {
-	return '';
+        return '';
     } else {
-	$tableopen=1;
-	return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
-	    &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
+        $tableopen=1;
+        my $output = &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th>';
+        if ($readonly) {
+            $output .= '<th>'.&mt('Current value').'</th>';
+        } else {
+            $output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
+        }
+        $output .= '</tr>';
+        return $output;
     }
 }
 
 sub tableend {
     if ($tableopen) {
-	$tableopen=0;
-	return &Apache::loncommon::end_data_table();
+    $tableopen=0;
+    return &Apache::loncommon::end_data_table();
     } else {
-	return'';
+    return'';
     }
 }
 
@@ -2362,21 +3039,24 @@ sub readdata {
 # Read userdata
 
     my $classlist=&Apache::loncoursedata::get_classlist();
-    foreach (keys %$classlist) {
-        # the following undefs are for 'domain', and 'username' respectively.
-        if ($_=~/^(\w+)\:(\w+)$/) {
-	    my ($tuname,$tudom)=($1,$2);
-	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
-            foreach my $userkey (keys %{$useropt}) {
-		if ($userkey=~/^$env{'request.course.id'}/) {
+    foreach my $user (keys(%$classlist)) {
+        if ($user=~/^($match_username)\:($match_domain)$/) {
+            my ($tuname,$tudom)=($1,$2);
+            my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys(%{$useropt})) {
+                if ($userkey=~/^\Q$env{'request.course.id'}\E/) {
                     my $newkey=$userkey;
-		    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
-		    $$resourcedata{$newkey}=$$useropt{$userkey};
-		}
-	    }
-	}
+                    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+                    $$resourcedata{$newkey}=$$useropt{$userkey};
+                }
+            }
+        }
+    }
+    if (wantarray) {
+        return ($resourcedata,$classlist);
+    } else {
+        return $resourcedata;
     }
-    return $resourcedata;
 }
 
 
@@ -2391,106 +3071,189 @@ sub storedata {
     undef %newdata;
     my @deldata=();
     undef @deldata;
-    foreach (keys %env) {
-	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
-	    my $cmd=$1;
-	    my $thiskey=$2;
-	    my ($tuname,$tudom)=&extractuser($thiskey);
-	    my $tkey=$thiskey;
+    my ($got_chostname,$chostname,$cmajor,$cminor);
+    my $now = time;
+    foreach my $key (keys(%env)) { 
+    if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
+        my $cmd=$1;
+        my $thiskey=$2;
+        next if ($cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
+        my ($tuname,$tudom)=&extractuser($thiskey);
+        my $tkey=$thiskey;
             if ($tuname) {
-		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
-	    }
-	    if ($cmd eq 'set') {
-		my $data=$env{$_};
-                my $typeof=$env{'form.typeof_'.$thiskey};
- 		if ($$olddata{$thiskey} ne $data) { 
-		    if ($tuname) {
-			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('<div class="LC_error">'.
-				      &mt('Error storing parameters').'</div>');
-			}
-			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
-		    } else {
-			$newdata{$thiskey}=$data;
- 			$newdata{$thiskey.'.type'}=$typeof; 
-                   } 
-		}
-	    } 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('<div class="LC_error">'.
-				  &mt('Error deleting parameters').'</div>');
-		    }
-		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
-		} else {
-		    push (@deldata,$thiskey,$thiskey.'.type');
-		}
-	    } elsif ($cmd eq 'datepointer') {
-		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-                my $typeof=$env{'form.typeof_'.$thiskey};
-		if (defined($data) and $$olddata{$thiskey} ne $data) { 
-		    if ($tuname) {
-			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('<div class="LC_error">'.
-				      &mt('Error storing parameters').'</div>');
-			}
-			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
-		    } else {
-			$newdata{$thiskey}=$data;
-			$newdata{$thiskey.'.type'}=$typeof; 
-		    }
-		}
-	    }
-	}
+        $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+        }
+        if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
+        my ($data, $typeof, $text, $name, $valchk, $valmatch);
+        if ($cmd eq 'set') {
+            $data=$env{$key};
+            $valmatch = '';
+            $valchk = $data;
+            $typeof=$env{'form.typeof_'.$thiskey};
+            $text = &mt('Saved modified parameter for');
+            if ($typeof eq 'string_questiontype') {
+                $name = 'type';
+            } elsif ($typeof eq 'string_lenient') {
+                $name = 'lenient';
+                my $stringmatch = &standard_string_matches($typeof);
+                if (ref($stringmatch) eq 'ARRAY') {
+                    foreach my $item (@{$stringmatch}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($pattern ne '') {
+                                if ($data =~ /$pattern/) {
+                                    $valmatch = $regexpname;
+                                    $valchk = '';
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
+            } elsif ($typeof eq 'string_discussvote') {
+                $name = 'discussvote';
+            } elsif ($typeof eq 'string_examcode') {
+                $name = 'examcode';
+                if (&Apache::lonnet::validCODE($data)) {
+                    $valchk = 'valid';
+                }
+            } elsif ($typeof eq 'string_yesno') {
+                if ($thiskey =~ /\.retrypartial$/) {
+                    $name = 'retrypartial';
+                }
+            }
+        } elsif ($cmd eq 'datepointer') {
+            $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
+            $typeof=$env{'form.typeof_'.$thiskey};
+            $text = &mt('Saved modified date for');
+            if ($typeof eq 'date_start') {
+                if ($thiskey =~ /\.printstartdate$/) {
+                    $name = 'printstartdate';
+                    if (($data) && ($data > $now)) {
+                        $valchk = 'future';
+                    }
+                }
+            } elsif ($typeof eq 'date_end') {
+                if ($thiskey =~ /\.printenddate$/) {
+                    $name = 'printenddate';
+                    if (($data) && ($data < $now)) {
+                        $valchk = 'past';
+                    }
+                }
+            }
+        } elsif ($cmd eq 'dateinterval') {
+            $data=&get_date_interval_from_form($thiskey);
+            $typeof=$env{'form.typeof_'.$thiskey};
+            $text = &mt('Saved modified date for');
+        }
+        if ($name ne '') {
+            my ($needsrelease,$needsnewer);
+            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
+                                                      $needsrelease,
+                                                      $cmajor,$cminor);
+                if ($needsnewer) {
+                    $r->print('<br />'.&oldversion_warning($name,$data,
+                                                           $chostname,$cmajor,
+                                                           $cminor,$needsrelease));
+                    next;
+                }
+            }
+        }
+        if (defined($data) and $$olddata{$thiskey} ne $data) {
+            if ($tuname) {
+            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 />'.$text.' '.
+                      &Apache::loncommon::plainname($tuname,$tudom));
+            } else {
+                $r->print('<div class="LC_error">'.
+                      &mt('Error saving parameters').'</div>');
+            }
+            &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+            } else {
+            $newdata{$thiskey}=$data;
+             $newdata{$thiskey.'.type'}=$typeof;
+                   }
+        }
+        } 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('<div class="LC_error">'.
+                  &mt('Error deleting parameters').'</div>');
+            }
+            &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+        } else {
+            push (@deldata,$thiskey,$thiskey.'.type');
+        }
+        }
+    }
     }
 # Store all course level
     my $delentries=$#deldata+1;
-    my @newdatakeys=keys %newdata;
+    my @newdatakeys=keys(%newdata);
     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('<div class="LC_error">'.
-		      &mt('Error deleting parameters').'</div>');
-	}
-	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
+    if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+        my %loghash=map { $_ => '' } @deldata;
+        &log_parmset(\%loghash,1);
+        $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
+    } else {
+        $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('<div class="LC_error">'.
-		      &mt('Error storing parameters').'</div>');
-	}
-	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
+    if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
+                &log_parmset(\%newdata,0);
+        $r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
+    } else {
+        $r->print('<div class="LC_error">'.
+              &mt('Error saving parameters').'</div>');
+    }
+    &Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
 }
 
 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 parse_listdata_key {
+    my ($key,$listdata) = @_;
+    # split into student/section affected, and
+    # the realm (folder/resource part and parameter
+    my ($student,$realm) =
+    ($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
+    # if course wide student would be undefined
+    if (!defined($student)) {
+    ($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+    }
+    # strip off the .type if it's not the Question type parameter
+    if ($realm=~/\.type$/ && !exists($listdata->{$key.'.type'})) {
+    $realm=~s/\.type//;
+    }
+    # split into resource+part and parameter name
+    my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
+       ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
+    return ($student,$res,$part,$parm);
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist)=@_;
+    
 # Start list output
 
     my $oldsection='';
@@ -2500,158 +3263,642 @@ sub listdata {
     $tableopen=0;
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
+
+    my ($secidx,%grouphash);
+    if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+        $secidx = &Apache::loncoursedata::CL_SECTION();
+        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            %grouphash = &Apache::longroup::coursegroups();
+        } elsif ($env{'request.course.groups'} ne '') {
+            map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+        }
+    }
+
     foreach my $thiskey (sort {
-	if ($sortorder eq 'realmstudent') {
-	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
-	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
-	    if (!defined($astudent)) {
-		($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
-	    }
-	    if (!defined($bstudent)) {
-		($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
-	    }
-	    $arealm=~s/\.type//;
-	    my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/);
-	    $aparm=$keyorder{'parameter_0_'.$aparm};
-	    $brealm=~s/\.type//;
-	    my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/);
-	    $bparm=$keyorder{'parameter_0_'.$bparm};	   
-	    if ($ares eq $bres) {
-		if (defined($aparm) && defined($bparm)) {
-		    ($aparm <=> $bparm);
-		} elsif (defined($aparm)) {
-		    -1;
-		} elsif (defined($bparm)) {
-		    1;
-		} else {
-		    ($arealm cmp $brealm) || ($astudent cmp $bstudent);
-		}
-	    } else {
-		($arealm cmp $brealm) || ($astudent cmp $bstudent);
-	    }
-	} else {
-	    $a cmp $b;
-	}
-    } keys %{$listdata}) {
-	 
-	if ($$listdata{$thiskey.'.type'}) {
-            my $thistype=$$listdata{$thiskey.'.type'};
-            if ($$resourcedata{$thiskey.'.type'}) {
-		$thistype=$$resourcedata{$thiskey.'.type'};
-	    }
-	    my ($middle,$part,$name)=
-		($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
-	    my $section=&mt('All Students');
-	    if ($middle=~/^\[(.*)\]/) {
-		my $issection=$1;
-		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
-		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
-		} else {
-		    $section=&mt('Group/Section').': '.$issection;
-		}
-		$middle=~s/^\[(.*)\]//;
-	    }
-	    $middle=~s/\.+$//;
-	    $middle=~s/^\.+//;
-	    my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
-	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		$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='<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) {
-		    $r->print(&tableend()."\n<hr /><h1>$realm</h1>");
-		    $oldrealm=$realm;
-		    $oldsection='';
-		}
-		if ($section ne $oldsection) {
-		    $r->print(&tableend()."\n<h2>$section</h2>");
-		    $oldsection=$section;
-		    $oldpart='';
-		}
-	    } else {
-		if ($section ne $oldsection) {
-		    $r->print(&tableend()."\n<hr /><h1>$section</h1>");
-		    $oldsection=$section;
-		    $oldrealm='';
-		}
-		if ($realm ne $oldrealm) {
-		    $r->print(&tableend()."\n<h2>$realm</h2>");
-		    $oldrealm=$realm;
-		    $oldpart='';
-		}
-	    }
-	    if ($part ne $oldpart) {
-		$r->print(&tableend().
-			  "\n<span class=\"LC_parm_part\">".&mt('Part').": $part</span>");
-		$oldpart=$part;
-	    }
+    my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
+    my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+
+    # get the numerical order for the param
+    $aparm=$keyorder{'parameter_0_'.$aparm};
+    $bparm=$keyorder{'parameter_0_'.$bparm};
+
+    my $result=0;
+
+    if ($sortorder eq 'realmstudent') {
+            if ($ares     ne $bres    ) {
+        $result = ($ares     cmp $bres);
+            } elsif ($astudent ne $bstudent) {
+        $result = ($astudent cmp $bstudent);
+        } elsif ($apart    ne $bpart   ) {
+        $result = ($apart    cmp $bpart);
+        }
+    } else {
+        if      ($astudent ne $bstudent) {
+        $result = ($astudent cmp $bstudent);
+        } elsif ($ares     ne $bres    ) {
+        $result = ($ares     cmp $bres);
+        } elsif ($apart    ne $bpart   ) {
+        $result = ($apart    cmp $bpart);
+        }
+    }
+
+    if (!$result) {
+            if (defined($aparm) && defined($bparm)) {
+        $result = ($aparm <=> $bparm);
+            } elsif (defined($aparm)) {
+        $result = -1;
+            } elsif (defined($bparm)) {
+        $result = 1;
+        }
+    }
+
+    $result;
+    } keys(%{$listdata})) {
+
+    my $readonly;
+    if ($$listdata{$thiskey.'.type'}) {
+        my $thistype=$$listdata{$thiskey.'.type'};
+        if ($$resourcedata{$thiskey.'.type'}) {
+            $thistype=$$resourcedata{$thiskey.'.type'};
+        }
+        my ($middle,$part,$name)=
+        ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+        my $section=&mt('All Students');
+        if ($middle=~/^\[(.*)\]/) {
+            my $issection=$1;
+            if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
+                my ($stuname,$studom) = ($1,$2);
+                if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+                    if (ref($classlist) eq 'HASH') {
+                        if (ref($classlist->{$stuname.':'.$studom}) eq 'ARRAY') {
+                            next unless ($classlist->{$stuname.':'.$studom}->[$secidx] eq $env{'request.course.sec'}); 
+                        }
+                    }
+                }
+                $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
+            } else {
+                if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+                    if (exists($grouphash{$issection})) {
+                        $section=&mt('Group').': '.$issection;
+                    } elsif ($issection eq $env{'request.course.sec'}) {
+                        $section = &mt('Section').': '.$issection;
+                    } else {
+                        next; 
+                    }
+                } else {
+                    $section=&mt('Group/Section').': '.$issection;
+                }
+            }
+            $middle=~s/^\[(.*)\]//;
+        } elsif (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+            $readonly = 1;
+        }
+        $middle=~s/\.+$//;
+        $middle=~s/^\.+//;
+        my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+        if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+        $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='<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) {
+            $r->print(&tableend()."\n<hr /><h1>$realm</h1>");
+            $oldrealm=$realm;
+            $oldsection='';
+        }
+        if ($section ne $oldsection) {
+            $r->print(&tableend()."\n<h2>$section</h2>");
+            $oldsection=$section;
+            $oldpart='';
+        }
+        } else {
+        if ($section ne $oldsection) {
+            $r->print(&tableend()."\n<hr /><h1>$section</h1>");
+            $oldsection=$section;
+            $oldrealm='';
+        }
+        if ($realm ne $oldrealm) {
+            $r->print(&tableend()."\n<h2>$realm</h2>");
+            $oldrealm=$realm;
+            $oldpart='';
+        }
+        }
+        if ($part ne $oldpart) {
+        $r->print(&tableend().
+              "\n".'<span class="LC_parm_part">'.&mt('Part').": $part</span>");
+        $oldpart=$part;
+        }
 #
 # Ready to print
 #
-	    $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)) {
-		my $jskey='key_'.$pointer;
-		$pointer++;
-		$r->print(
-			  &Apache::lonhtmlcommon::date_setter('parmform',
-							      $jskey,
-						      $$resourcedata{$thiskey},
-							      '',1,'','').
+            my $parmitem = &standard_parameter_names($name);
+        $r->print(&tablestart($readonly).
+              &Apache::loncommon::start_data_table_row().
+              '<td><b>'.&mt($parmitem).
+              '</b></td>');
+        unless ($readonly) {
+            $r->print('<td><input type="checkbox" name="del_'.
+                      $thiskey.'" /></td>');
+        }
+        $r->print('<td>');
+        $foundkeys++;
+        if (&isdateparm($thistype)) {
+            my $jskey='key_'.$pointer;
+            my $state;
+            $pointer++;
+            if ($readonly) {
+                $state = 'disabled';
+            }
+            $r->print(
+                &Apache::lonhtmlcommon::date_setter('parmform',
+                                                    $jskey,
+                                                    $$resourcedata{$thiskey},
+                                                    '',1,$state));
+            unless  ($readonly) {
+                $r->print(
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
+(($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+&mt('Shift all dates based on this date').'</a></span>':'').
 &date_sanity_info($$resourcedata{$thiskey})
-			  );
-	    } elsif ($thistype eq 'string_yesno') {
-		my $showval;
-		if (defined($$resourcedata{$thiskey})) {
-		    $showval=$$resourcedata{$thiskey};
-		}
-		$r->print('<label><input type="radio" name="set_'.$thiskey.
-			  '" value="yes"');
-		if ($showval eq 'yes') {
-		    $r->print(' checked="checked"');
-		}
-                $r->print(' />'.&mt('Yes').'</label> ');
-		$r->print('<label><input type="radio" name="set_'.$thiskey.
-			  '" value="no"');
-		if ($showval eq 'no') {
-		    $r->print(' checked="checked"');
-		}
-                $r->print(' />'.&mt('No').'</label>');
-	    } else {
-		my $showval;
-		if (defined($$resourcedata{$thiskey})) {
-		    $showval=$$resourcedata{$thiskey};
-		}
-		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
-			  $showval.'">');
-	    }
-	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
-		      $thistype.'">');
-	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
-	}
+                );
+            }
+        } elsif ($thistype eq 'date_interval') {
+            $r->print(&date_interval_selector($thiskey,
+                      $$resourcedata{$thiskey},$readonly));
+        } elsif ($thistype =~ m/^string/) {
+            $r->print(&string_selector($thistype,$thiskey,
+                      $$resourcedata{$thiskey},$name,$readonly));
+        } else {
+            $r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
+        }
+        unless ($readonly) {
+            $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
+                      $thistype.'" />');
+        }
+        $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+    }
     }
     return $foundkeys;
 }
 
+
+sub date_interval_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my $result;
+    foreach my $which (['days', 86400, 31],
+               ['hours', 3600, 23],
+               ['minutes', 60, 59],
+               ['seconds',  1, 59]) {
+    my ($name, $factor, $max) = @{ $which };
+    my $amount = int($showval/$factor);
+    $showval  %= $factor;
+    my %select = ((map {$_ => $_} (0..$max)),
+              'select_form_order' => [0..$max]);
+    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+                           \%select,'',$readonly);
+    $result .= ' '.&mt($name);
+    }
+    unless ($readonly) {
+        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    }
+    return $result;
+
+}
+
+sub get_date_interval_from_form {
+    my ($key) = @_;
+    my $seconds = 0;
+    foreach my $which (['days', 86400],
+               ['hours', 3600],
+               ['minutes', 60],
+               ['seconds',  1]) {
+    my ($name, $factor) = @{ $which };
+    if (defined($env{'form.'.$name.'_'.$key})) {
+        $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+    }
+    }
+    return $seconds;
+}
+
+
+sub default_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my $disabled;
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
+    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
+}
+
+sub string_ip_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my %access = (
+                   allow => [],
+                   deny  => [],
+                 );
+    if ($showval ne '') {
+        my @current;
+        if ($showval =~ /,/) {
+            @current = split(/,/,$showval);
+        } else {
+            @current = ($showval);
+        }
+        foreach my $item (@current) {
+            if ($item =~ /^\!([\[\]a-zA-Z\.\d\*\-]+)$/) {
+                push(@{$access{'deny'}},$1);
+            } elsif ($item =~ /^([\[\]a-zA-Z\.\d\*\-]+)$/) {
+                push(@{$access{'allow'}},$item);
+            }
+        }
+    }
+    if (!@{$access{'allow'}}) {
+        @{$access{'allow'}} = ('');
+    }
+    if (!@{$access{'deny'}}) {
+        @{$access{'deny'}} = ('');
+    }
+    my ($disabled,$addmore);
+    if ($disabled) {
+        $disabled=' disabled="disabled"';
+    } else {
+        $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
+    }
+    my $output = '<input type="hidden" name="set_'.$thiskey.'" />
+<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
+    foreach my $acctype ('allow','deny') {
+        $output .= '
+<td valign="top">
+<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'.$acctype.'_'.$thiskey.'">
+  <div class="LC_string_ipacc_inner">'."\n";
+        my $num = 0;
+        foreach my $curr (@{$access{$acctype}}) {
+            $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
+            if ($num > 0) {
+                $output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>'; 
+            }
+            $output .= '</div>'."\n";
+            $num ++;
+        }
+        $output .= '
+  </div>'.$addmore.'
+</div>
+</td>';
+   }
+   $output .= '
+</tr>
+</table>'."\n";
+    return $output;
+}
+
+{
+my %strings =
+    (
+     'string_yesno'
+             => [[ 'yes', 'Yes' ],
+         [ 'no', 'No' ]],
+     'string_problemstatus'
+             => [[ 'yes', 'Yes' ],
+         [ 'answer', 'Yes, and show correct answer if they exceed the maximum number of tries.' ],
+         [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
+         [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
+     'string_questiontype'
+             => [[ 'problem', 'Standard Problem'],
+                 [ 'survey', 'Survey'],
+                 [ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],
+                 [ 'exam', 'Bubblesheet Exam'],
+                 [ 'anonsurvey', 'Anonymous Survey'],
+                 [ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
+                 [ 'practice', 'Practice'],
+                 [ 'surveycred', 'Survey (credit for submission)']],
+     'string_lenient'
+             => [['yes', 'Yes' ],
+                 [ 'no', 'No' ],
+                 [ 'default', 'Default - only bubblesheet grading is lenient' ],
+                 [ 'weighted', 'Yes, weighted (optionresponse in checkbox mode)' ]],
+     'string_discussvote'
+             => [['yes','Yes'],
+                 ['notended','Yes, unless discussion ended'],
+                 ['no','No']],
+     'string_ip'
+             => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
+                 ['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'], 
+     );
+
+my %stringmatches = (
+         'string_lenient'
+              => [['weighted','^\-?[.\d]+,\-?[.\d]+,\-?[.\d]+,\-?[.\d]+$'],],
+         'string_ip'
+              => [['_allowfrom_','[^\!]+'],
+                  ['_denyfrom_','\!']],
+    );
+
+my %stringtypes = (
+                    type         => 'string_questiontype',
+                    lenient      => 'string_lenient',
+                    retrypartial => 'string_yesno',
+                    discussvote  => 'string_discussvote',
+                    examcode     => 'string_examcode',
+                    acc          => 'string_ip',
+                  );
+
+sub standard_string_options {
+    my ($string_type) = @_;
+    if (ref($strings{$string_type}) eq 'ARRAY') {
+        return $strings{$string_type};
+    }
+    return;
+}
+
+sub standard_string_matches {
+    my ($string_type) = @_;
+    if (ref($stringmatches{$string_type}) eq 'ARRAY') {
+        return $stringmatches{$string_type};
+    }
+    return;
+}
+
+sub get_stringtype {
+    my ($name) = @_;
+    if (exists($stringtypes{$name})) {
+        return $stringtypes{$name};
+    }
+    return;
+}
+
+sub string_selector {
+    my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
+
+    if (!exists($strings{$thistype})) {
+        return &default_selector($thiskey,$showval,$readonly);
+    }
+
+    my %skiptype;
+    if (($thistype eq 'string_questiontype') || 
+        ($thistype eq 'string_lenient') ||
+        ($thistype eq 'string_discussvote') ||
+        ($thistype eq 'string_ip') ||
+        ($name eq 'retrypartial')) {
+        my ($got_chostname,$chostname,$cmajor,$cminor); 
+        foreach my $possibilities (@{ $strings{$thistype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($parmval, $description) = @{ $possibilities };
+            my $parmmatch;
+            if (ref($stringmatches{$thistype}) eq 'ARRAY') {
+                foreach my $item (@{$stringmatches{$thistype}}) {
+                    if (ref($item) eq 'ARRAY') {
+                        if ($parmval eq $item->[0]) {
+                            $parmmatch = $parmval;
+                            $parmval = '';
+                            last;
+                        }
+                    }
+                }
+            }
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"}; 
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                                                       $needsrelease,$cmajor,$cminor);
+                if ($needsnewer) {
+                    if ($parmmatch ne '') {
+                        $skiptype{$parmmatch} = 1;
+                    } elsif ($parmval ne '') {
+                        $skiptype{$parmval} = 1;
+                    }
+                }
+            }
+        }
+    }
+
+    if ($thistype eq 'string_ip') {
+        return &string_ip_selector($thiskey,$showval,$readonly); 
+    }
+
+    my ($result,$disabled);
+
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $numinrow = 3;
+    if ($thistype eq 'string_problemstatus') {
+        $numinrow = 2;
+    } elsif ($thistype eq 'string_questiontype') {
+        if (keys(%skiptype) > 0) {
+             $numinrow = 4;
+        }
+    }
+    my $rem;
+    if (ref($strings{$thistype}) eq 'ARRAY') {
+        my $i=0;
+        foreach my $possibilities (@{ $strings{$thistype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($name, $description) = @{ $possibilities };
+            next if ($skiptype{$name});
+            $rem = $i%($numinrow);
+            if ($rem == 0) {
+                if ($i > 0) {
+                    $result .= '</tr>';
+                }
+                $result .= '<tr>';
+            }
+            my $colspan;
+            if ($i == @{ $strings{$thistype} }-1) {
+                $rem = @{ $strings{$thistype} }%($numinrow);
+                if ($rem) {
+                    my $colsleft = $numinrow - $rem;
+                    if ($colsleft) {
+                        $colspan = $colsleft+1;
+                        $colspan = ' colspan="'.$colspan.'"';
+                    }
+                }
+            }
+            my ($add,$onchange,$css_class);
+            if ($thistype eq 'string_lenient') {
+                if ($name eq 'weighted') {
+                    my $display;
+                    my %relatives = &Apache::lonlocal::texthash(
+                                        corrchkd     => 'Correct (checked)',
+                                        corrunchkd   => 'Correct (unchecked)',
+                                        incorrchkd   => 'Incorrect (checked)',
+                                        incorrunchkd => 'Incorrect (unchecked)',
+                    );
+                    my %textval = (
+                                    corrchkd     => '1.0',
+                                    corrunchkd   => '1.0',
+                                    incorrchkd   => '0.0',
+                                    incorrunchkd => '0.0',
+                    );
+                    if ($showval =~ /^([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)$/) {
+                        $textval{'corrchkd'} = $1;
+                        $textval{'corrunchkd'} = $2;
+                        $textval{'incorrchkd'} = $3;
+                        $textval{'incorrunchkd'} = $4;
+                        $display = 'inline';
+                        $showval = $name;
+                    } else {
+                        $display = 'none';
+                    }
+                    $add = ' <div id="LC_parmtext_'.$thiskey.'" style="display:'.$display.'"><table>'.
+                           '<tr><th colspan="2">'.&mt("Foil's submission status").'</th><th>'.&mt('Points').'</th></tr>';  
+                    foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {
+                        $add .= '<tr><td>&nbsp;</td><td>'.$relatives{$reltype}.'</td>'."\n".
+                                '<td><input type="text" name="settext_'.$thiskey.'"'.
+                                ' value="'.$textval{$reltype}.'" size="3"'.$disabled.' />'.
+                                '</td></tr>';
+                    }
+                    $add .= '</table></div>'."\n";
+                }
+                $onchange = ' onclick="javascript:toggleParmTextbox(this.form,'."'$thiskey'".');"';
+                $css_class = ' class="LC_lenient_radio"';
+            }
+            $result .= '<td class="LC_left_item"'.$colspan.'>'.
+                       '<span class="LC_nobreak"><label>'.
+                       '<input type="radio" name="set_'.$thiskey.
+                       '" value="'.$name.'"'.$onchange.$css_class.$disabled;
+            if ($showval eq $name) {
+                $result .= ' checked="checked"';
+            }
+            $result .= ' />'.&mt($description).'</label>'.$add.'</span></td>';
+            $i++;
+        }
+        $result .= '</tr>';
+    }
+    if ($result) {
+        $result = '<table border="0">'.$result.'</table>';
+    }
+    return $result;
+}
+
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my $stringtype = &get_stringtype($name);
+    if ($stringtype ne '') {
+        if ($name eq 'examcode') {
+            $desc = $value;
+        } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                my $parmmatch;
+                if (ref($stringmatches{$stringtypes{$name}}) eq 'ARRAY') {
+                    foreach my $item (@{$stringmatches{$stringtypes{$name}}}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($parmval eq $regexpname) {
+                                if ($value =~ /$pattern/) {
+                                    $desc = $description; 
+                                    $parmmatch = 1;
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                    last if ($parmmatch);
+                } elsif ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
+            }
+        }
+    } elsif (($name eq 'printstartdate') || ($name eq 'printenddate')) {
+        my $now = time;
+        if ($value =~ /^\d+$/) {
+            if ($name eq 'printstartdate') {
+                if ($value > $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            } elsif ($name eq 'printenddate') {
+                if ($value < $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            }
+        }
+    }
+    my $standard_name = &standard_parameter_names($name);
+    return '<p class="LC_warning">'.
+           &mt('[_1] was [_2]not[_3] set to [_4].',
+               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+           $cmajor.'.'.$cminor,$chostname,
+           $needsrelease).
+           '</p>';
+}
+
+}
+
+#
+# Shift all start and end dates by $shift
+#
+
+sub dateshift {
+    my ($shift)=@_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# ugly retro fix for broken version of types
+    foreach my $key (keys(%data)) {
+        if ($key=~/\wtype$/) {
+            my $newkey=$key;
+            $newkey=~s/type$/\.type/;
+            $data{$newkey}=$data{$key};
+            delete $data{$key};
+        }
+    }
+    my %storecontent=();
+# go through all parameters and look for dates
+    foreach my $key (keys(%data)) {
+       if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+          my $newdate=$data{$key}+$shift;
+          $storecontent{$key}=$newdate;
+       }
+    }
+    my $reply=&Apache::lonnet::cput
+                ('resourcedata',\%storecontent,$dom,$crs);
+    if ($reply eq 'ok') {
+       &log_parmset(\%storecontent);
+    }
+    &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+    return $reply;
+}
+
 sub newoverview {
     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('Set Parameters');
+    my $crstype =  $env{'course.'.$env{'request.course.id'}.'.type'};
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+        text=>"Overview Mode"});
+
+    my %loaditems = (
+                      'onload'   => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1'); showHideLenient();",
+                    );
+    my $js = '
+<script type="text/javascript">
+// <![CDATA[
+'.
+            &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
+            &showhide_js()."\n".
+            &toggleparmtextbox_js()."\n".
+            &validateparms_js()."\n".
+            &ipacc_boxes_js()."\n".
+'// ]]>
+</script>
+';
+
+    my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,
+                                                    {'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
+    $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDOVER);
-$start_page
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=newoverview" name="parmform">
+<form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();">
 ENDOVER
     my @ids=();
     my %typep=();
@@ -2676,63 +3923,90 @@ ENDOVER
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$env{'form.pschp'};
+
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
-    if (!@psprt) { $psprt[0]='0'; }
+    if (!@psprt) { $psprt[0]='all'; }
 
-    my @selected_sections = 
-	&Apache::loncommon::get_env_multiple('form.Section');
+    my @selected_sections =
+    &Apache::loncommon::get_env_multiple('form.Section');
     @selected_sections = ('all') if (! @selected_sections);
-    foreach (@selected_sections) {
-        if ($_ eq 'all') {
+    foreach my $sec (@selected_sections) {
+        if ($sec eq 'all') {
             @selected_sections = ('all');
         }
     }
+    if ($env{'request.course.sec'} ne '') {
+        @selected_sections = ($env{'request.course.sec'});
+    }
     my @selected_groups =
         &Apache::loncommon::get_env_multiple('form.Group');
 
     my $pssymb='';
     my $parmlev='';
- 
+
     unless ($env{'form.parmlev'}) {
         $parmlev = 'map';
     } else {
         $parmlev = $env{'form.parmlev'};
     }
 
-    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, 
-				\%mapp, \%symbp,\%maptitles,\%uris,
-				\%keyorder,\%defkeytype);
+    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
+                \%mapp, \%symbp,\%maptitles,\%uris,
+                \%keyorder,\%defkeytype);
 
+    if (grep {$_ eq 'all'} (@psprt)) {
+        @psprt = keys(%allparts);
+    }
 # Menu to select levels, etc
 
-    $r->print('<table id="LC_parm_overview_scope">
-               <tr><td class="LC_parm_overview_level_menu">');
+    $r->print('<div class="LC_Box">');
+    #$r->print('<h2 class="LC_hcell">Step 1</h2>');
+    $r->print('<div>');
+    $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
-	$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 id="LC_parm_overview_controls">
-               <tr><td class="LC_parm_overview_parm_selectors">');  
-    &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $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>');
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp);
+    }
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print('</div></div>');
+
+    $r->print('<div class="LC_Box">');
+    $r->print('<div>');
+    &displaymenu($r,\%allparms,\@pscat,\%keyorder);
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
+    my $sectionselector = &sectionmenu(\@selected_sections);
+    my $groupselector = &groupmenu(\@selected_groups);
+    $r->print('<table>'.
+              '<tr><th>'.&mt('Parts').'</th>');
+    if ($sectionselector) {
+        $r->print('<th>'.&mt('Section(s)').'</th>');
+    }
+    if ($groupselector) {
+        $r->print('<th>'.&mt('Group(s)').'</th>');
+    }
+    $r->print('</tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
-    $r->print('</td><td>');
-    &sectionmenu($r,\@selected_sections);
-    $r->print('</td><td>');
-    &groupmenu($r,\@selected_groups);
-    $r->print('</td></tr></table>');
-    $r->print('</td></tr></table>');
- 
+    $r->print('</td>');
+    if ($sectionselector) { 
+        $r->print('<td>'.$sectionselector.'</td>');
+    }
+    if ($groupselector) {
+        $r->print('<td>'.$groupselector.'</td>');
+    }
+    $r->print('</tr></table>');
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print('</div></div>');
+
+    $r->print('<div class="LC_Box">');
+    $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
+    $r->print('</div></div>');
 
     $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
 
@@ -2748,19 +4022,21 @@ ENDOVER
 
     if (($env{'form.store'}) || ($env{'form.dis'})) {
 
-	if ($env{'form.store'}) { &storedata($r,$crs,$dom); }
+        if ($env{'form.store'}) { &storedata($r,$crs,$dom); }
 
 # Read modified data
 
-	my $resourcedata=&readdata($crs,$dom);
+        my $resourcedata=&readdata($crs,$dom);
 
 # List data
 
-	&listdata($r,$resourcedata,$listdata,$sortorder);
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview');
     }
     $r->print(&tableend().
-	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Store').'" /></p>':'').
-	      '</form>'.&Apache::loncommon::end_page());
+         ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
+          '</form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub secgroup_lister {
@@ -2778,7 +4054,7 @@ sub secgroup_lister {
                 $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
             } elsif ($parmlev eq 'map') {
 # map-level parameter
-                foreach my $mapid (keys %{$allmaps}) {
+                foreach my $mapid (keys(%{$allmaps})) {
                     if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
                     my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
                     $$listdata{$newparmkey}=1;
@@ -2802,21 +4078,33 @@ sub overview {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &toggleparmtextbox_js()."\n".
+             &validateparms_js()."\n".
+             &ipacc_boxes_js()."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+    text=>"Overview Mode"});
+    my %loaditems = (
+                      'onload'   => "showHideLenient();",
+                    );
 
-    my $start_page=&Apache::loncommon::start_page('Modify Parameters');
+    my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js,{'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
-    $r->print(<<ENDOVER);
-$start_page
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="parmform">
-ENDOVER
+    $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
+    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform" onsubmit="return validateParms();">');
+
 # Store modified
 
     &storedata($r,$crs,$dom);
 
 # Read modified data
 
-    my $resourcedata=&readdata($crs,$dom);
+    my ($resourcedata,$classlist)=&readdata($crs,$dom);
 
 
     my $sortorder=$env{'form.sortorder'};
@@ -2825,11 +4113,10 @@ ENDOVER
 
 # List data
 
-    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
-
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist);
     $r->print(&tableend().'<p>'.
-	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form>'.
-	      &Apache::loncommon::end_page());
+    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.
+          &Apache::loncommon::end_page());
 }
 
 sub clean_parameters {
@@ -2837,6 +4124,8 @@ sub clean_parameters {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
+        text=>"Clean Parameters"});
     my $start_page=&Apache::loncommon::start_page('Clean Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
     $r->print(<<ENDOVER);
@@ -2855,254 +4144,179 @@ ENDOVER
 # 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 />');
+          &mt('These parameters refer to resources that do not exist.').
+          '</h3>'.
+          '<input type="submit" value="'.&mt('Delete Selected').'" />'.'<br />'.
+          '<br />');
     $r->print(&Apache::loncommon::start_data_table().
-	      '<tr>'.
-	      '<th>'.&mt('Delete').'</th>'.
-	      '<th>'.&mt('Parameter').'</th>'.
-	      '</tr>');
+          '<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>');
-	
-	}
+    next if (!exists($resourcedata->{$thiskey.'.type'})
+         && $thiskey=~/\.type$/);
+    my %data = &parse_key($thiskey);
+    if (1) { #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);
+        }
+            my $parmitem = &standard_parameter_names($data{'parameter_name'});
+            $parmitem = &mt($parmitem);
+        $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
+              $parmitem,$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]with ID: [_2]in folder [_3]',
+                      $url.' <br />&nbsp;&nbsp;&nbsp;',
+                      $resid.' <br />&nbsp;&nbsp;&nbsp;',$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());
+          '<input type="submit" value="'.&mt('Delete Selected').'" />'.
+          '</p></form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub date_shift_one {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+        text=>"Shifting Dates"});
+    my $start_page=&Apache::loncommon::start_page('Shift Dates');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+    $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
+    $r->print('<form name="shiftform" method="post" action="">'.
+              '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
+              &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
+              '<tr><td>'.&mt('Shifted date:').'</td><td>'.
+                    &Apache::lonhtmlcommon::date_setter('shiftform',
+                                                        'timeshifted',
+                                                        $env{'form.timebase'},,
+                                                        '').
+              '</td></tr></table>'.
+              '<input type="hidden" name="action" value="dateshift2" />'.
+              '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
+              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub date_shift_two {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+        text=>"Shifting Dates"});
+    my $start_page=&Apache::loncommon::start_page('Shift Dates');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+    $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
+    my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
+    $r->print('<h2>'.&mt('Shift Dates').'</h2>'.
+              '<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
+              &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
+    my $delta=$timeshifted-$env{'form.timebase'};
+    &dateshift($delta);
+    $r->print(
+        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
+        '<br /><br />'.
+        &Apache::lonhtmlcommon::actionbox(
+            ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub parse_key {
     my ($key) = @_;
     my %data;
     my ($middle,$part,$name)=
-	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    ($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/^\[(.*)\]//;
+           $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'} );
+    $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'});
     } 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{'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
-
-Checks if new users included in list of allowed cloners
-are valid users.  Replaces supplied list with 
-cleaned list containing only users with valid usernames
-and domains.
-
-Inputs: $clonelist, $oldcloner 
-where $clonelist is ref to array of requested cloners,
-and $oldcloner is ref to array of currently allowed
-cloners.
-
-Returns: string - comma separated list of requested
-cloners (username:domain) who do not exist in system.
-
-=item change_clone
-
-Modifies the list of courses a user can clone (stored
-in the user's environment.db file), called when a
-change is made to the list of users allowed to clone
-a course.
-
-Inputs: $action,$cloner
-where $action is add or drop, and $cloner is identity of 
-user for whom cloning ability is to be changed in course. 
-
-=cut
-                                                                                            
-##################################################
-##################################################
-
-sub extract_cloners {
-    my ($clonelist,$allowclone) = @_;
-    if ($clonelist =~ /,/) {
-        @{$allowclone} = split/,/,$clonelist;
-    } else {
-        $$allowclone[0] = $clonelist;
-    }
-}
-
-
-sub check_cloners {
-    my ($clonelist,$oldcloner) = @_;
-    my ($clean_clonelist,$disallowed);
-    my @allowclone = ();
-    &extract_cloners($$clonelist,\@allowclone);
-    foreach my $currclone (@allowclone) {
-        if (!grep/^$currclone$/,@$oldcloner) {
-            my ($uname,$udom) = split/:/,$currclone;
-            if ($uname && $udom) {
-                if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
-                    $disallowed .= $currclone.',';   
-                } else {
-                    $clean_clonelist .= $currclone.',';
-                }
-            }
-        } else {
-            $clean_clonelist .= $currclone.',';
-        }
-    }
-    if ($disallowed) {
-        $disallowed =~ s/,$//;
-    }
-    if ($clean_clonelist) {
-        $clean_clonelist =~ s/,$//;
-    }
-    $$clonelist = $clean_clonelist;
-    return $disallowed;
-}  
 
-sub change_clone {
-    my ($clonelist,$oldcloner) = @_;
-    my ($uname,$udom);
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $clone_crs = $cnum.':'.$cdom;
-    
-    if ($cnum && $cdom) {
-        my @allowclone;
-        &extract_cloners($clonelist,\@allowclone);
-        foreach my $currclone (@allowclone) {
-            if (!grep/^$currclone$/,@$oldcloner) {
-                ($uname,$udom) = split/:/,$currclone;
-                if ($uname && $udom) {
-                    unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
-                        my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                        if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
-                            if ($currclonecrs{'cloneable'} eq '') {
-                                $currclonecrs{'cloneable'} = $clone_crs;
-                            } else {
-                                $currclonecrs{'cloneable'} .= ','.$clone_crs;
-                            }
-                            &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
-                        }
-                    }
-                }
-            }
-        }
-        foreach my $oldclone (@$oldcloner) {
-            if (!grep/^$oldclone$/,@allowclone) {
-                ($uname,$udom) = split/:/,$oldclone;
-                if ($uname && $udom) {
-                    unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
-                        my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                        my %newclonecrs = ();
-                        if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
-                            if ($currclonecrs{'cloneable'} =~ /,/) {
-                                my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
-                                foreach (@currclonecrs) {
-                                    unless ($_ eq $clone_crs) {
-                                        $newclonecrs{'cloneable'} .= $_.',';
-                                    }
-                                }
-                                $newclonecrs{'cloneable'} =~ s/,$//;
-                            } else {
-                                $newclonecrs{'cloneable'} = '';
-                            }
-                            &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
-                        }
-                    }
-                }
-            }
-        }
-    }
+sub header {
+    return &Apache::loncommon::start_page('Settings');
 }
 
 
-##################################################
-##################################################
-
-=pod
-
-=item * header
-
-Output html header for page
-
-=cut
 
-##################################################
-##################################################
-sub header {
-    return &Apache::loncommon::start_page('Parameter Manager');
-}
-##################################################
-##################################################
 sub print_main_menu {
     my ($r,$parm_permission)=@_;
     #
+    $r->print(&header());
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
+    my $crstype = &Apache::loncommon::course_type();
+    my $lc_crstype = lc($crstype);
+
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3111,137 +4325,311 @@ ENDMAINFORMHEAD
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+    my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    my $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});
+    if ((!$dcm) && ($env{'request.course.sec'} ne '')) {
+        $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
+                                        '/'.$env{'request.course.sec'});
+    }
 
     my @menu =
-        ( { divider=>'Settings for Your Course',
-	  },
-          { text => 'Set Course Environment',
-	    action => 'crsenv',
+        ( { categorytitle=>"Content Settings for this $crstype",
+        items => [
+          { linktext => 'Portfolio Metadata',
+            url => '/adm/parmset?action=setrestrictmeta',
             permission => $parm_permission,
-            help => 'Course_Environment',
+            linktitle => "Restrict metadata for this $lc_crstype." ,
+            icon =>'contact-new.png'   ,
             },
-          { text => 'Set Portfolio Metadata',
-	    action => 'setrestrictmeta',
-            permission => $parm_permission,
+          { linktext => 'Reset Student Access Times',
+            url => '/adm/helper/resettimes.helper',
+            permission => $mgr,
+            linktitle => "Reset access times for folders/maps, resources or the $lc_crstype."  ,
+            icon => 'start-here.png'  ,
             },
-	  { text => 'Manage Course Slots',
-	    url => '/adm/slotrequest?command=showslots',
-	    permission => $vgr,
+          { linktext => 'Blocking Communication/Resource Access',
+            url => '/adm/setblock',
+            permission => $dcm,
+            linktitle => 'Configure blocking of communication/collaboration and access to resources during an exam',
+            icon => 'comblock.png',
             },
-          { text => 'Set Parameter Setting Default Actions',
-            action => 'setdefaults',
+          { linktext => 'Set Parameter Setting Default Actions',
+            url => '/adm/parmset?action=setdefaults',
             permission => $parm_permission,
-            },          
-	  { divider => 'New and Existing Parameter Settings for Your Resources',
-	    },
-          { text => 'Set/Modify Resource Parameters - Helper Mode',
+            linktitle =>'Set default actions for parameters.'  ,
+            icon => 'folder-new.png'  ,
+            }]},
+      { categorytitle => 'New and Existing Parameter Settings for Resources',
+        items => [
+          { linktext => 'Edit Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
             permission => $parm_permission,
-            help => 'Parameter_Helper',
+            linktitle =>'Set/Modify resource parameters in helper mode.'  ,
+            icon => 'dialog-information.png'  ,
+            #help => 'Parameter_Helper',
             },
- 	  { text => 'Set/Modify Resource Parameters - Overview Mode',
-            action => 'newoverview',
+          { linktext => 'Edit Resource Parameters - Overview Mode',
+            url => '/adm/parmset?action=newoverview',
             permission => $parm_permission,
-            help => 'Parameter_Overview',
+            linktitle =>'Set/Modify resource parameters in overview mode.'  ,
+            icon => 'edit-find.png'  ,
+            #help => 'Parameter_Overview',
             },
-          { text => 'Set/Modify Resource Parameters - Table Mode',
-            action => 'settable',
+          { linktext => 'Edit Resource Parameters - Table Mode',
+            url => '/adm/parmset?action=settable',
             permission => $parm_permission,
-            help => 'Table_Mode',
-            },
-           { 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',
+            linktitle =>'Set/Modify resource parameters in table mode.'  ,
+            icon => 'edit-copy.png'  ,
+            #help => 'Table_Mode',
+            }]},
+           { categorytitle => 'Existing Parameter Settings for Resources',
+         items => [
+          { linktext => 'Modify Resource Parameters - Overview Mode',
+            url => '/adm/parmset?action=setoverview',
             permission => $parm_permission,
+            linktitle =>'Set/Modify existing resource parameters in overview mode.'  ,
+            icon => 'preferences-desktop-wallpaper.png'  ,
+            #help => 'Parameter_Overview',
             },
+          { linktext => 'Change Log',
+            url => '/adm/parmset?action=parameterchangelog',
+            permission => $parm_permission,
+            linktitle =>"View parameter and $lc_crstype blog posting/user notification change log."  ,
+            icon => 'document-properties.png',
+            }]}
           );
-    my $menu_html = '';
-    foreach my $menu_item (@menu) {
-	if ($menu_item->{'divider'}) {
-	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
-	    next;
-	}
-        next if (! $menu_item->{'permission'});
-        $menu_html.='<p>';
-        $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></span>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
-        $menu_html.='</p>'.$/;
-    }
-    $r->print($menu_html);
+    $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+    $r->print('</form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
-### Set portfolio metadata
+
+
+
 sub output_row {
-    my ($r, $field_name, $field_text) = @_;
+    my ($r, $field_name, $field_text, $added_flag) = @_;
     my $output;
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
-    unless (defined($options)) {
+    if (!defined($options)) {
         $options = 'active,stuadd';
         $values = '';
     }
-    $output.='<strong>'.$field_text.':</strong>';
-    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+    if (!($options =~ /deleted/)) {
+        my @options= ( ['active', 'Show to student'],
+                    ['stuadd', 'Provide text area for students to type metadata'],
+                    ['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><strong>'.$field_text.':</strong></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).'<label>
+                   <input type="checkbox" name="'.
+                   $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+                   &mt($opt->[1]).'</label></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
+    }
+        $output .= &Apache::loncommon::continue_data_table_row();
+        $output .= '<td>'.('&nbsp;' x 10).'<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
+        my $multiple_checked;
+        my $single_checked;
+        if ($options =~ m/onlyone/) {
+            $multiple_checked = '';
+            $single_checked = ' checked="checked"';
+        } else {
+            $multiple_checked = ' checked="checked"';
+            $single_checked = '';
+        }
+    $output .= &Apache::loncommon::continue_data_table_row();
+    $output .= '<td>'.('&nbsp;' x 10).'
+                <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
+                '.&mt('Student may select multiple choices from list').'</td>';
+    $output .= &Apache::loncommon::end_data_table_row();
+    $output .= &Apache::loncommon::continue_data_table_row();
+    $output .= '<td>'.('&nbsp;' x 10).'
+                <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
+                '.&mt('Student may select only one choice from list').'</td>';
+    $output .= &Apache::loncommon::end_data_table_row();
+    }
+    return ($output);
+}
+
+
 
-    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 />';
+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'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};;
+    $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+        text=>"Add Metadata Field"});
+    &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/parmset?action=setrestrictmeta",
+              text=>"Restrict Metadata"},
+             {text=>"Order Metadata"});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+    &startSettingsScreen($r,'parmset',$crstype);
+    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>');
+    &endSettingsScreen($r);
+    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)=@_;
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+        text=>"Add Metadata Field"});
     $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.fieldname'})) {
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &startSettingsScreen($r,'parmset',$crstype);
+    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 '.$env{'form.fieldname'}." with result ".$put_result);
+        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+        $r->print(&continue());
     } else {
-        $r->print('<form method="post" action="/adm/parmset?action=addmetadata"');
+        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>');
     }
+    $r->print('</form>');
+    &endSettingsScreen($r);
 }
+
+
+
 sub setrestrictmeta {
     my ($r)=@_;
     my $next_meta;
     my $output;
     my $item_num;
     my $put_result;
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+        text=>"Restrict 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'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &startSettingsScreen($r,'parmset',$crstype);
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
     if ($env{'form.restrictmeta'}) {
@@ -3252,15 +4640,21 @@ sub setrestrictmeta {
                 my $meta_key = $2;
                 if ($save_field ne $meta_field) {
                     $save_field = $meta_field;
-            	    if ($env{'form.'.$meta_field.'_stuadd'}) {
-            	        $options.='stuadd,';
-            	    } 
-            	    if ($env{'form.'.$meta_field.'_onlyone'}) {
-            	        $options.='onlyone,';
-            	    } 
-            	    if ($env{'form.'.$meta_field.'_active'}) {
-            	        $options.='active,';
-            	    }
+                    if ($env{'form.'.$meta_field.'_stuadd'}) {
+                        $options.='stuadd,';
+                    }
+                    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,
@@ -3271,38 +4665,53 @@ sub setrestrictmeta {
         }
     }
     &Apache::lonnet::coursedescription($env{'request.course.id'},
-				       {'freshen_cache' => 1});
+                       {'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(\%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))) {
         if ($field ne 'courserestricted') {
-	    $output.= &output_row($r, $field, $metadata_fields{$field});
-	}
+            $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))) {
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field});
+        $row_alt = $row_alt ? 0 : 1;
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
     }
-    $r->print(<<ENDenv);       
+    $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">
-        </form><br />
-        <form method="post" action="/adm/parmset?action=addmetadata" name="form">
-        <input type="submit" name="restrictmeta" value="Add a Metadata Field">
+        $buttons
         </form>
 ENDenv
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
-##################################################
+
+
+
 sub get_added_meta_fieldnames {
+    my ($cid) = @_;
     my %fields;
-    my ($default_fields) = @_;
     foreach my $key(%env) {
-        if ($key =~ m/\.metadata\.(.+)\.added$/) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;
             my ($display_field_name) = $env{$key};
             $fields{$field_name} = $display_field_name;
@@ -3310,20 +4719,38 @@ sub get_added_meta_fieldnames {
     }
     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');
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
+        text=>"Set Defaults"});
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    my $start_page =
+        &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
-    $r->print(<<ENDDEFHEAD);
-$start_page
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">
-ENDDEFHEAD
+    $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
+    $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my @ids=();
     my %typep=();
     my %keyp=();
@@ -3337,136 +4764,137 @@ ENDDEFHEAD
     my %keyorder=&standardkeyorder();
     my %defkeytype=();
 
-    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, 
-				\%mapp, \%symbp,\%maptitles,\%uris,
-				\%keyorder,\%defkeytype);
+    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
+                \%mapp, \%symbp,\%maptitles,\%uris,
+                \%keyorder,\%defkeytype);
     if ($env{'form.storerules'}) {
-	my %newrules=();
-	my @delrules=();
-	my %triggers=();
-	foreach my $key (keys(%env)) {
+    my %newrules=();
+    my @delrules=();
+    my %triggers=();
+    foreach my $key (keys(%env)) {
             if ($key=~/^form\.(\w+)\_action$/) {
-		my $tempkey=$1;
-		my $action=$env{$key};
+        my $tempkey=$1;
+        my $action=$env{$key};
                 if ($action) {
-		    $newrules{$tempkey.'_action'}=$action;
-		    if ($action ne 'default') {
-			my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
-			$triggers{$whichparm}.=$tempkey.':';
-		    }
-		    $newrules{$tempkey.'_type'}=$defkeytype{$tempkey};
-		    if (&isdateparm($defkeytype{$tempkey})) {
-			$newrules{$tempkey.'_days'}=$env{'form.'.$tempkey.'_days'};
-			$newrules{$tempkey.'_hours'}=$env{'form.'.$tempkey.'_hours'};
-			$newrules{$tempkey.'_min'}=$env{'form.'.$tempkey.'_min'};
-			$newrules{$tempkey.'_sec'}=$env{'form.'.$tempkey.'_sec'};
-		    } else {
-			$newrules{$tempkey.'_value'}=$env{'form.'.$tempkey.'_value'};
-			$newrules{$tempkey.'_triggervalue'}=$env{'form.'.$tempkey.'_triggervalue'};
-		    }
-		} else {
-		    push(@delrules,$tempkey.'_action');
-		    push(@delrules,$tempkey.'_type');
-		    push(@delrules,$tempkey.'_hours');
-		    push(@delrules,$tempkey.'_min');
-		    push(@delrules,$tempkey.'_sec');
-		    push(@delrules,$tempkey.'_value');
-		}
-	    }
-	}
-	foreach my $key (keys %allparms) {
-	    $newrules{$key.'_triggers'}=$triggers{$key};
-	}
-	&Apache::lonnet::put('parmdefactions',\%newrules,$dom,$crs);
-	&Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);
-	&resetrulescache();
+            $newrules{$tempkey.'_action'}=$action;
+            if ($action ne 'default') {
+            my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+            $triggers{$whichparm}.=$tempkey.':';
+            }
+            $newrules{$tempkey.'_type'}=$defkeytype{$tempkey};
+            if (&isdateparm($defkeytype{$tempkey})) {
+            $newrules{$tempkey.'_days'}=$env{'form.'.$tempkey.'_days'};
+            $newrules{$tempkey.'_hours'}=$env{'form.'.$tempkey.'_hours'};
+            $newrules{$tempkey.'_min'}=$env{'form.'.$tempkey.'_min'};
+            $newrules{$tempkey.'_sec'}=$env{'form.'.$tempkey.'_sec'};
+            } else {
+            $newrules{$tempkey.'_value'}=$env{'form.'.$tempkey.'_value'};
+            $newrules{$tempkey.'_triggervalue'}=$env{'form.'.$tempkey.'_triggervalue'};
+            }
+        } else {
+            push(@delrules,$tempkey.'_action');
+            push(@delrules,$tempkey.'_type');
+            push(@delrules,$tempkey.'_hours');
+            push(@delrules,$tempkey.'_min');
+            push(@delrules,$tempkey.'_sec');
+            push(@delrules,$tempkey.'_value');
+        }
+        }
+    }
+    foreach my $key (keys(%allparms)) {
+        $newrules{$key.'_triggers'}=$triggers{$key};
+    }
+    &Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
+    &Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
+    &resetrulescache();
     }
     my %lt=&Apache::lonlocal::texthash('days' => 'Days',
-				       'hours' => 'Hours',
-				       'min' => 'Minutes',
-				       'sec' => 'Seconds',
-				       'yes' => 'Yes',
-				       'no' => 'No');
+                       'hours' => 'Hours',
+                       'min' => 'Minutes',
+                       'sec' => 'Seconds',
+                       'yes' => 'Yes',
+                       'no' => 'No');
     my @standardoptions=('','default');
     my @standarddisplay=('',&mt('Default value when manually setting'));
     my @dateoptions=('','default');
     my @datedisplay=('',&mt('Default value when manually setting'));
     foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
-	unless ($tempkey) { next; }
-	push @standardoptions,'when_setting_'.$tempkey;
-	push @standarddisplay,&mt('Automatically set when setting ').$tempkey;
-	if (&isdateparm($defkeytype{$tempkey})) {
-	    push @dateoptions,'later_than_'.$tempkey;
-	    push @datedisplay,&mt('Automatically set later than ').$tempkey;
-	    push @dateoptions,'earlier_than_'.$tempkey;
-	    push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
-	} 
+    unless ($tempkey) { next; }
+    push @standardoptions,'when_setting_'.$tempkey;
+    push @standarddisplay,&mt('Automatically set when setting ').$tempkey;
+    if (&isdateparm($defkeytype{$tempkey})) {
+        push @dateoptions,'later_than_'.$tempkey;
+        push @datedisplay,&mt('Automatically set later than ').$tempkey;
+        push @dateoptions,'earlier_than_'.$tempkey;
+        push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
+    }
     }
 $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
-	  &mt('Automatic setting rules apply to table mode interfaces only.'));
+      &mt('Automatic setting rules apply to table mode interfaces only.'));
     $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());
+          &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".&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})) {
-	    for (my $i=0;$i<=$#dateoptions;$i++) {
-		if ($dateoptions[$i]=~/\_$tempkey$/) { next; }
-		$r->print("\n<option value='$dateoptions[$i]'".
-			  ($dateoptions[$i] eq $action?' selected="selected"':'').
-			  ">$datedisplay[$i]</option>");
-	    }
-	} else {
-	    for (my $i=0;$i<=$#standardoptions;$i++) {
-		if ($standardoptions[$i]=~/\_$tempkey$/) { next; }
-		$r->print("\n<option value='$standardoptions[$i]'".
-			  ($standardoptions[$i] eq $action?' selected="selected"':'').
-			  ">$standarddisplay[$i]</option>");
-	    }
-	}
-	$r->print('</select>');
-	unless (&isdateparm($defkeytype{$tempkey})) {
-	    $r->print("\n<br />".&mt('Triggering value(s) of other parameter (optional, comma-separated):').
-		      '<input type="text" size="20" name="'.$tempkey.'_triggervalue" value="'.&rulescache($tempkey.'_triggervalue').'" />');
-	}
-	$r->print("\n</td><td>\n");
+    unless ($tempkey) { next; }
+    $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})) {
+        for (my $i=0;$i<=$#dateoptions;$i++) {
+        if ($dateoptions[$i]=~/\_$tempkey$/) { next; }
+        $r->print("\n<option value='$dateoptions[$i]'".
+              ($dateoptions[$i] eq $action?' selected="selected"':'').
+              ">$datedisplay[$i]</option>");
+        }
+    } else {
+        for (my $i=0;$i<=$#standardoptions;$i++) {
+        if ($standardoptions[$i]=~/\_$tempkey$/) { next; }
+        $r->print("\n<option value='$standardoptions[$i]'".
+              ($standardoptions[$i] eq $action?' selected="selected"':'').
+              ">$standarddisplay[$i]</option>");
+        }
+    }
+    $r->print('</select>');
+    unless (&isdateparm($defkeytype{$tempkey})) {
+        $r->print("\n<br />".&mt('Triggering value(s) of other parameter (optional, comma-separated):').
+              '<input type="text" size="20" name="'.$tempkey.'_triggervalue" value="'.&rulescache($tempkey.'_triggervalue').'" />');
+    }
+    $r->print("\n</td><td>\n");
 
         if (&isdateparm($defkeytype{$tempkey})) {
-	    my $days=&rulescache($tempkey.'_days');
-	    my $hours=&rulescache($tempkey.'_hours');
-	    my $min=&rulescache($tempkey.'_min');
-	    my $sec=&rulescache($tempkey.'_sec');
-	    $r->print(<<ENDINPUTDATE);
+        my $days=&rulescache($tempkey.'_days');
+        my $hours=&rulescache($tempkey.'_hours');
+        my $min=&rulescache($tempkey.'_min');
+        my $sec=&rulescache($tempkey.'_sec');
+        $r->print(<<ENDINPUTDATE);
 <input name="$tempkey\_days" type="text" size="4" value="$days" />$lt{'days'}<br />
 <input name="$tempkey\_hours" type="text" size="4" value="$hours" />$lt{'hours'}<br />
 <input name="$tempkey\_min" type="text" size="4" value="$min" />$lt{'min'}<br />
 <input name="$tempkey\_sec" type="text" size="4" value="$sec" />$lt{'sec'}
 ENDINPUTDATE
-	} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
+    } elsif ($defkeytype{$tempkey} eq 'string_yesno') {
             my $yeschecked='';
             my $nochecked='';
-            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
-            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
 
-	    $r->print(<<ENDYESNO);
-<label><input type="radio" name="$tempkey\_value" value="yes" $yeschecked /> $lt{'yes'}</label><br />
-<label><input type="radio" name="$tempkey\_value" value="no" $nochecked /> $lt{'no'}</label>
+        $r->print(<<ENDYESNO);
+<label><input type="radio" name="$tempkey\_value" value="yes"$yeschecked /> $lt{'yes'}</label><br />
+<label><input type="radio" name="$tempkey\_value" value="no"$nochecked /> $lt{'no'}</label>
 ENDYESNO
         } else {
-	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
-	}
+        $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
+    }
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
-	      "\n<input type='submit' name='storerules' value='".
-	      &mt('Store Rules')."' /></form>\n".
-	      &Apache::loncommon::end_page());
+          "\n".'<input type="submit" name="storerules" value="'.
+          &mt('Save').'" /></form>'."\n");
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -3474,333 +4902,477 @@ sub components {
     my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
 
     if ($typeflag) {
-	$key=~s/\.type$//;
+    $key=~s/\.type$//;
     }
 
     my ($middle,$part,$name)=
-	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
     my $issection;
 
     my $section=&mt('All Students');
     if ($middle=~/^\[(.*)\]/) {
-	$issection=$1;
-	$section=&mt('Group/Section').': '.$issection;
-	$middle=~s/^\[(.*)\]//;
+    $issection=$1;
+    $section=&mt('Group/Section').': '.$issection;
+    $middle=~s/^\[(.*)\]//;
     }
     $middle=~s/\.+$//;
     $middle=~s/^\.+//;
     if ($uname) {
-	$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
-	$issection='';
+    $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'); 
+    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);
+    $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 ($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);
+        $what,$middle,$uname,$udom,$issection,$realmdescription);
 }
 
 my %standard_parms;
+my %standard_parms_types;
+
 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;
-	}
+    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;
+        } elsif ($type eq 'type') {
+            $standard_parms_types{$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)=@_;
     if (!%standard_parms) {
-	&load_parameter_names();
+    &load_parameter_names();
     }
     if ($standard_parms{$name}) {
-	return $standard_parms{$name}; 
-    } else { 
-	return $name; 
+    return $standard_parms{$name};
+    } else {
+    return $name;
     }
 }
 
-#
-# Parameter Change Log
-#
-
+sub standard_parameter_types {
+    my ($name)=@_;
+    if (!%standard_parms_types) {
+        &load_parameter_names();
+    }
+    if ($standard_parms_types{$name}) {
+        return $standard_parms_types{$name};
+    }
+    return;
+}
 
 sub parm_change_log {
     my ($r)=@_;
-    $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+    text=>"Parameter Change Log"});
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &Apache::loncommon::display_filter_js('parmslog')."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
+    $r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
     $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'});
+    &startSettingsScreen($r,'parmset',$crstype);
+    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',$cdom,$cnum);
 
     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
 
-    $r->print('<form action="/adm/parmset?action=parameterchangelog"
+    $r->print('<div class="LC_left_float">'.
+              '<fieldset><legend>'.&mt('Display of Changes').'</legend>'.
+              '<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);
-    if (!$env{'form.show'}) { $env{'form.show'}=10; }
-
-    my $countselect =
-	&Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
-				    (&mt('all'),10,20,50,100,1000,10000));
-
-    $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
-              '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
-	      ' '.&mt('Include parameter types').'</label>'.
-	      '<input type="submit" value="'.&mt('Display').'" /></form>');
+    $r->print(&Apache::loncommon::display_filter('parmslog').'&nbsp;'."\n".
+              '<input type="submit" value="'.&mt('Display').'" />'.
+              '</form></fieldset></div><br clear="all" />');
 
-    my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
-						     $env{'course.'.$env{'request.course.id'}.'.domain'});
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
     $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());
+          '<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;
-    foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
+    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();
-	$r->print($row_start);
-	my $makenewrow=0;
-	my %istype=();
-	my $output;
-	foreach my $changed (reverse(sort(@changes))) {
+    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 $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>';
-	    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();
-	}
-	$r->print('<td rowspan="'.$count.'">'.$time.'</td>
+        &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+        if ($env{'request.course.sec'} ne '') {
+            next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
+            if ($uname ne '') {
+                my $stusection = &Apache::lonnet::getsection($uname,$udom,$env{'request.course.id'});
+                next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'})); 
+            }
+        }
+        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;
+        }
+            my $parmitem = &standard_parameter_names($parmname);
+        $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+              &mt($parmitem).'</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) {
+                    my $parmitem = &standard_parameter_names($value); 
+                    $parmitem = &mt($parmitem);
+            $output .= &mt('Type: [_1]',$parmitem);
+        } else {
+            my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
+                              $uname,$udom,$issection,$issection,$courseopt);
+                    my $showvalue = $value;
+                    if ($istype{$parmname} eq '') {
+                        my $type = &standard_parameter_types($parmname);
+                        if ($type ne '') {
+                            if (&isdateparm($type)) {
+                                $showvalue =
+                                    &Apache::lonlocal::locallocaltime($value);
+                            }
+                        }
+                    } else {
+                if (&isdateparm($istype{$parmname})) {
+                $showvalue = 
+                                &Apache::lonlocal::locallocaltime($value);
+                }
+                    }
+                    $output .= $showvalue;
+            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 $parmitem = &standard_parameter_names($parmname);
+                $parmitem = &mt($parmitem);
+        my $title=&mt('Changed [_1]',$parmitem);
+                my $description=&mt('Changed [_1] for [_2] to [_3]',
+                                    $parmitem,$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; }
+          '<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());
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
-##################################################
-##################################################
-
-=pod
+sub update_slots {
+    my ($slot_name,$cdom,$cnum,$symb,$uname,$udom) = @_;
+    my %slot=&Apache::lonnet::get_slot($slot_name);
+    if (!keys(%slot)) {
+        return 'error: slot does not exist';
+    }
+    my $max=$slot{'maxspace'};
+    if (!defined($max)) { $max=99999; }
+
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+                                       "^$slot_name\0");
+    my ($tmp)=%consumed;
+    if ($tmp=~/^error: 2 / ) {
+        return 'error: unable to determine current slot status';
+    }
+    my $last=0;
+    foreach my $key (keys(%consumed)) {
+        my $num=(split('\0',$key))[1];
+        if ($num > $last) { $last=$num; }
+        if ($consumed{$key}->{'name'} eq $uname.':'.$udom) {
+            return 'ok';
+        }
+    }
 
-=item * handler
+    if (scalar(keys(%consumed)) >= $max) {
+        return 'error: no space left in slot';
+    }
+    my $wanted=$last+1;
 
-Main handler.  Calls &assessparms and &crsenv subroutines.
+    my %reservation=('name'      => $uname.':'.$udom,
+                     'timestamp' => time,
+                     'symb'      => $symb);
+
+    my $success=&Apache::lonnet::newput('slot_reservations',
+                                        {"$slot_name\0$wanted" =>
+                                             \%reservation},
+                                        $cdom, $cnum);
+    if ($success eq 'ok') {
+        my %storehash = (
+                          symb    => $symb,
+                          slot    => $slot_name,
+                          action  => 'reserve',
+                          context => 'parameter',
+                        );
+        &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+                                   '',$uname,$udom,$cnum,$cdom);
+
+        &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                   '',$uname,$udom,$uname,$udom);
+    }
+    return $success;
+}
+
+sub delete_slots {
+    my ($slot_name,$cdom,$cnum,$uname,$udom,$symb) = @_;
+    my $delresult;
+    my %consumed = &Apache::lonnet::dump('slot_reservations',$cdom,
+                                         $cnum, "^$slot_name\0");
+    if (&Apache::lonnet::error(%consumed)) {
+        return 'error: unable to determine current slot status';
+    }
+    my ($tmp)=%consumed;
+    if ($tmp=~/^error: 2 /) {
+        return 'error: unable to determine current slot status';
+    }
+    foreach my $key (keys(%consumed)) {
+        if ($consumed{$key}->{'name'} eq $uname.':'.$udom) {
+            my $num=(split('\0',$key))[1];
+            my $entry = $slot_name.'\0'.$num;
+            $delresult = &Apache::lonnet::del('slot_reservations',[$entry],
+                                              $cdom,$cnum);
+            if ($delresult eq 'ok') {
+                my %storehash = (
+                                  symb    => $symb,
+                                  slot    => $slot_name,
+                                  action  => 'release',
+                                  context => 'parameter',
+                                );
+                &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+                                           1,$uname,$udom,$cnum,$cdom);
+                &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                           1,$uname,$udom,$uname,$udom);
+            }
+        }
+    }
+    return $delresult;
+}
 
-=cut
-##################################################
-##################################################
-#    use Data::Dumper;
+sub check_for_course_info {
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    return 1 if ($navmap);
+    return 0;
+}
 
+sub parameter_release_vars { 
+   my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+   my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
+   my $chostname = &Apache::lonnet::hostname($chome);
+   my ($cmajor,$cminor) = 
+       split(/\./,&Apache::lonnet::get_server_loncaparev($cdom,$chome));
+   return ($chostname,$cmajor,$cminor);
+}
+
+sub parameter_releasecheck {
+    my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;
+    my $needsnewer;
+    my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
+    if (($cmajor < $needsmajor) || 
+        ($cmajor == $needsmajor && $cminor < $needsminor)) {
+        $needsnewer = 1;
+    } elsif ($valmatch) {
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
+    } elsif ($value) { 
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
+    }
+    return $needsnewer;
+}
 
 sub handler {
     my $r=shift;
 
-    if ($r->header_only) {
-	&Apache::loncommon::content_type($r,'text/html');
-	$r->send_http_header;
-	return OK;
-    }
+    &reset_caches();
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    return OK if $r->header_only;
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['action','state',
+                        ['action','state',
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb','serial']);
+                                             'filter','part',
+                                             'udom','uname','symb','serial','timebase']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
-					    text=>"Parameter Manager",
-					    faq=>10,
-					    bug=>'Instructor Interface',
-                                            help => 'Parameter_Manager'});
+                        text=>"Content and Problem Settings",
+                        faq=>10,
+                        bug=>'Instructor Interface',
+                                            help =>
+                                            'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});
 
 # ----------------------------------------------------- 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) {
-
-        # Start Page
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
-
-
-        # id numbers can change on re-ordering of folders
-
-        &resetsymbcache();
+    (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
+     &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
+                  $env{'request.course.sec'}));
+    my $exists = &check_for_course_info();
 
+    if ($env{'request.course.id'} &&  $parm_permission && $exists) {
         #
         # Main switch on form.action and form.state, as appropriate
         #
         # Check first if coming from someone else headed directly for
         #  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);
-
+         && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+        &assessparms($r);
         } elsif (! exists($env{'form.action'})) {
-            $r->print(&header());
-            $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',
-						    text=>"Course Environment"});
-            &crsenv($r); 
-        } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
-            &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"});
-	    &setrestrictmeta($r);
-        } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
-						    text=>"Overview Mode"});
-	    &newoverview($r);
-        }  elsif ($env{'form.action'} eq 'setdefaults' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
-						    text=>"Set Defaults"});
-	    &defaultsetter($r);
-	} elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Table Mode",
-						    help => 'Course_Setting_Parameters'});
-	    &assessparms($r);
-        } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
-            &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);
-	}       
+        } elsif ($env{'form.action'} eq 'setoverview') {
+        &overview($r);
+    } elsif ($env{'form.action'} eq 'addmetadata') {
+        &addmetafield($r);
+    } elsif ($env{'form.action'} eq 'ordermetadata') {
+        &order_meta_fields($r);
+        } elsif ($env{'form.action'} eq 'setrestrictmeta') {
+        &setrestrictmeta($r);
+        } elsif ($env{'form.action'} eq 'newoverview') {
+        &newoverview($r);
+        } elsif ($env{'form.action'} eq 'setdefaults') {
+        &defaultsetter($r);
+    } elsif ($env{'form.action'} eq 'settable') {
+        &assessparms($r);
+        } elsif ($env{'form.action'} eq 'parameterchangelog') {
+        &parm_change_log($r);
+        } elsif ($env{'form.action'} eq 'cleanparameters') {
+        &clean_parameters($r);
+        } elsif ($env{'form.action'} eq 'dateshift1') {
+            &date_shift_one($r);
+        } elsif ($env{'form.action'} eq 'dateshift2') {
+            &date_shift_two($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";
-	return HTTP_NOT_ACCEPTABLE;
+    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;
+    }
+    &reset_caches();
+
     return OK;
 }
 
 1;
 __END__
 
-=pod
-
-=back
-
-=cut
-
-