loncom/interface/lonparmset.pm - diff

Return to lonparmset.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.287 and 1.471

-version 1.287, 2006/04/14 16:38:43
+version 1.471, 2009/09/03 16:58:17
  Line 44  This module sets coursewide and assessme
  =head1 INTERNAL SUBROUTINES
- =over 4
+ =over
- =cut
- ###################################################################
- ###################################################################
- package Apache::lonparmset;
- use strict;
- use Apache::lonnet;
- use Apache::Constants qw(:common :http REDIRECT);
- use Apache::lonhtmlcommon();
- use Apache::loncommon;
- use GDBM_File;
- use Apache::lonhomework;
- use Apache::lonxml;
- use Apache::lonlocal;
- use Apache::lonnavmaps;
- # --- Caches local to lonparmset
- my $parmhashid;
- my %parmhash;
- my $symbsid;
- my %symbs;
- my $rulesid;
- my %rules;
- # --- end local caches
- ##################################################
- ##################################################
  =pod
- =item parmval
+ =item parmval()
  Figure out a cascading parameter.
- Line 90  Inputs:  $what - a parameter spec (inclu
+ Line 58  Inputs:  $what - a parameter spec (inclu
  Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 14 possible levels
 - General Course
 - Map or Folder level in course
 - resource default
 - map default
 - resource level in course
 - General for section
 - Map or Folder level for section
 - resource level in section
- Line 105  Returns:  A list, the first item is the
+ Line 73  Returns:  A list, the first item is the
 - Map or Folder level for specific student
 - 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() :
+ Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
+ Input: See list below:
+ =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?
+ =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
+ Returns: nothing
+ Variables used (guessed by Jeremy):
+ =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
+ =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 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.
+ =item check_cloners()
+ =item change_clone()
+ =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
- ##################################################
+ ###################################################################
+ ###################################################################
+ package Apache::lonparmset;
+ use strict;
+ use Apache::lonnet;
+ use Apache::Constants qw(:common :http REDIRECT);
+ use Apache::lonhtmlcommon();
+ use Apache::loncommon;
+ use GDBM_File;
+ use Apache::lonhomework;
+ use Apache::lonxml;
+ use Apache::lonlocal;
+ use Apache::lonnavmaps;
+ use Apache::longroup;
+ use Apache::lonrss;
+ use LONCAPA qw(:DEFAULT :match);
  sub parmval {
      my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
      return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
- Line 116  sub parmval {
+ Line 344  sub parmval {
  sub parmval_by_symb {
      my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
- # load caches
-     &cacheparmhash();
+     my $useropt;
+     if ($uname ne '' && $udom ne '') {
-     my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+ 	$useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+     }
      my $result='';
      my @outpar=();
  # ----------------------------------------------------- Cascading lookup scheme
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
+     $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$what;
      my $mapparm=$map.'___(all).'.$what;
- Line 161  sub parmval_by_symb {
+ Line 390  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})) {
- Line 170  sub parmval_by_symb {
+ Line 399  sub parmval_by_symb {
      }
  # ------------------------------------------------------ fourth, back to course
-     if (defined($csec)) {
+     if ($csec ne '') {
          if (defined($$courseopt{$seclevel})) {
  	    $outpar[9]=$$courseopt{$seclevel};
  	    $result=9;
- Line 186  sub parmval_by_symb {
+ Line 415  sub parmval_by_symb {
  	}
      }
  # ------------------------------------------------------ fifth, check course group
-     if (defined($cgroup)) {
+     if ($cgroup ne '') {
          if (defined($$courseopt{$grplevel})) {
              $outpar[6]=$$courseopt{$grplevel};
              $result=6;
- Line 203  sub parmval_by_symb {
+ Line 432  sub parmval_by_symb {
  # ---------------------------------------------------------- fifth, check user
-     if (defined($uname)) {
+     if ($uname ne '') {
  	if (defined($$useropt{$courselevel})) {
  	    $outpar[3]=$$useropt{$courselevel};
  	    $result=3;
- Line 222  sub parmval_by_symb {
+ Line 451  sub parmval_by_symb {
      return ($result,@outpar);
  }
- sub resetparmhash {
-     $parmhashid='';
- }
- 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'};
-     }
- }
- sub resetsymbcache {
+ # --- Caches local to lonparmset
-     $symbsid='';
+ sub reset_caches {
+     &resetparmhash();
+     &resetsymbcache();
+     &resetrulescache();
  }
- sub symbcache {
+ {
-     my $id=shift;
+     my $parmhashid;
-     if ($symbsid ne $env{'request.course.id'}) {
+     my %parmhash;
- 	%symbs=();
+     sub resetparmhash {
+ 	undef($parmhashid);
+ 	undef(%parmhash);
      }
-     unless ($symbs{$id}) {
- 	my $navmap = Apache::lonnavmaps::navmap->new();
+     sub cacheparmhash {
- 	if ($id=~/\./) {
+ 	if ($parmhashid eq  $env{'request.course.fn'}) { return; }
- 	    my $resource=$navmap->getById($id);
+ 	my %parmhashfile;
- 	    $symbs{$id}=$resource->symb();
+ 	if (tie(%parmhashfile,'GDBM_File',
- 	} else {
+ 		$env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
- 	    my $resource=$navmap->getByMapPc($id);
+ 	    %parmhash=%parmhashfile;
- 	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+ 	    untie(%parmhashfile);
+ 	    $parmhashid=$env{'request.course.fn'};
  	}
- 	$symbsid=$env{'request.course.id'};
      }
-     return $symbs{$id};
- }
- sub resetrulescache {
+     sub parmhash {
-     $rulesid='';
+ 	my ($id) = @_;
- }
+ 	&cacheparmhash();
+ 	return $parmhash{$id};
+     }
+  }
+ {
+     my $symbsid;
+     my %symbs;
+     sub resetsymbcache {
+ 	undef($symbsid);
+ 	undef(%symbs);
+     }
+     sub symbcache {
+ 	my $id=shift;
+ 	if ($symbsid ne $env{'request.course.id'}) {
+ 	    undef(%symbs);
+ 	}
+ 	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 rulescache {
+ {
-     my $id=shift;
+     my $rulesid;
-     if ($rulesid ne $env{'request.course.id'}) {
+     my %rules;
- 	%rules=();
+     sub resetrulescache {
+ 	undef($rulesid);
+ 	undef(%rules);
      }
-     unless (defined($rules{$id})) {
- 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     sub rulescache {
- 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 	my $id=shift;
- 	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+ 	if ($rulesid ne $env{'request.course.id'}
- 	$rulesid=$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};
      }
-     return $rules{$id};
  }
  sub preset_defaults {
      my $type=shift;
      if (&rulescache($type.'_action') eq 'default') {
- Line 292  sub preset_defaults {
+ Line 553  sub preset_defaults {
      }
  }
- ##################################################
  sub date_sanity_info {
     my $checkdate=shift;
- Line 301  sub date_sanity_info {
+ Line 563  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;
  }
  ##################################################
- Line 330  sub storeparm {
+ Line 609  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)=@_;
- Line 394  sub storeparm_by_symb {
+ Line 661  sub storeparm_by_symb {
      return '';
  }
- {
+ sub log_parmset {
-     my $logid;
+     return &Apache::lonnet::instructor_log('parameterlog',@_);
-     sub log_parmset {
- 	my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
- 	$logid++;
- 	my $id=time().'00000'.$$.'00000'.$logid;
- 	&Apache::lonnet::put('nohist_parameterlog',
- 			     {
- 				 $id.'_exe_uname' => $env{'user.name'},
- 				 $id.'_exe_udom'  => $env{'user.domain'},
- 				 $id.'_exe_time'  => time(),
- 				 $id.'_exe_ip'    => $ENV{'REMOTE_ADDR'},
- 				 $id.'_symb'      => $symb,
- 				 $id.'_spnam'     => $spnam,
- 				 $id.'_snum'      => $snum,
- 				 $id.'_nval'      => $nval,
- 				 $id.'_ntype'     => $ntype,
- 				 $id.'_uname'     => $uname,
- 				 $id.'_udom'      => $udom,
- 				 $id.'_csec'      => $csec,
- 				 $id.'_cgroup'    => $cgroup
- 			     },
- 			     $env{'course.'.$env{'request.course.id'}.'.domain'},
- 			     $env{'course.'.$env{'request.course.id'}.'.num'}
- 			     );
-     }
  }
  sub storeparm_by_symb_inner {
  # ---------------------------------------------------------- Get symb, map, etc
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
-     &log_parmset(@_);
  # ---------------------------------------------------------- Construct prefixes
      $spnam=~s/\_([^\_]+)$/\.$1/;
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
+     $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$spnam;
      my $mapparm=$map.'___(all).'.$spnam;
- Line 439  sub storeparm_by_symb_inner {
+ Line 683  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; }
- Line 455  sub storeparm_by_symb_inner {
+ Line 699  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,
- Line 479  sub storeparm_by_symb_inner {
+ Line 723  sub storeparm_by_symb_inner {
  	if ($delete) {
  	    $reply=&Apache::lonnet::del
  		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+             &log_parmset(\%storecontent,1);
  	} else {
  	    $reply=&Apache::lonnet::cput
  		('resourcedata',\%storecontent,$cdom,$cnum);
+ 	    &log_parmset(\%storecontent);
  	}
  	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
      } else {
- Line 502  sub storeparm_by_symb_inner {
+ Line 748  sub storeparm_by_symb_inner {
  	if ($delete) {
  	    $reply=&Apache::lonnet::del
  		('resourcedata',[keys(%storecontent)],$udom,$uname);
+ 	    &log_parmset(\%storecontent,1,$uname,$udom);
  	} else {
  	    $reply=&Apache::lonnet::cput
  		('resourcedata',\%storecontent,$udom,$uname);
+ 	    &log_parmset(\%storecontent,0,$uname,$udom);
  	}
  	&Apache::lonnet::devalidateuserresdata($uname,$udom);
      }
      if ($reply=~/^error\:(.*)/) {
- 	return "<font color=red>Write Error: $1</font>";
+ 	return "<span class=\"LC_error\">Write Error: $1</span>";
      }
      return '';
  }
- ##################################################
- ##################################################
- =pod
- =item valout
- Format a value for output.
- Inputs:  $value, $type
- Returns: $value, formatted for output.  If $type indicates it is a date,
- localtime($value) is returned.
- =cut
- ##################################################
- ##################################################
  sub valout {
-     my ($value,$type)=@_;
+     my ($value,$type,$editable)=@_;
      my $result = '';
      # Values of zero are valid.
      if (! $value && $value ne '0') {
- 	$result = '&nbsp;&nbsp;';
+ 	if ($editable) {
+ 	    $result = '<span class="LC_clickhere">*</span>';
+ 	} else {
+ 	    $result='&nbsp;';
+ 	}
      } else {
          if ($type eq 'date_interval') {
              my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+             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 = &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;
- Line 603  sub plink {
+ Line 834  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">'.
+     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($value,$type).'</a></td></tr></table>';
+ 	    $valout.'</a></td></tr></table>';
  }
  sub page_js {
- Line 616  sub page_js {
+ Line 854  sub page_js {
      return(<<ENDJS);
  <script type="text/javascript">
+ // <![CDATA[
      function pclose() {
          parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
                   "height=350,width=350,scrollbars=no,menubar=no");
- Line 655  sub page_js {
+ Line 893  sub page_js {
          var newWin = window.open(url, wdwName, options);
          newWin.focus();
      }
+ // ]]>
  </script>
  $selscript
  ENDJS
- Line 666  sub startpage {
+ Line 905  sub startpage {
      my %loaditems = ('onunload' => "pclose()",
  		     'onload'   => "group_or_section('cgroup')",);
-     my $start_page =
+     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 $start_page =
  	&Apache::loncommon::start_page('Set/Modify Course Parameters',
  				       &page_js(),
  				       {'add_entries' => \%loaditems,});
      my $breadcrumbs =
- 	&Apache::lonhtmlcommon::breadcrumbs(undef,
+ 	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
- 					    'Table Mode Parameter Setting');
      $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_value" />
- <input type="hidden" value='' name="pres_type" />
+ <input type="hidden" value="" name="pres_type" />
- <input type="hidden" value='' name="pres_marker" />
+ <input type="hidden" value="" name="pres_marker" />
- <input type="hidden" value='1' name="prevvisit" />
+ <input type="hidden" value="1" name="prevvisit" />
  ENDHEAD
  }
- Line 703  sub print_row {
+ Line 950  sub print_row {
  # cascade down manually
      my $cascadetype=$$defaulttype{$which};
      for (my $i=14;$i>0;$i--) {
  	 if ($typeoutpar[$i]) {
              $cascadetype=$typeoutpar[$i];
  	} else {
              $typeoutpar[$i]=$cascadetype;
- Line 712  sub print_row {
+ Line 959  sub print_row {
      my $parm=$$display{$which};
      if ($parmlev eq 'full') {
-         $r->print('<td bgcolor='.$defbgtwo.' align="center">'
+         $r->print('<td style="background-color:'.$defbgtwo.';" align="center">'
                    .$$part{$which}.'</td>');
      } else {
          $parm=~s|\[.*\]\s||g;
      }
      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
      if ($automatic) {
- 	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+ 	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
      }
-     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
+     $r->print('<td>'.$parm.'</td>');
      my $thismarker=$which;
      $thismarker=~s/^parameter\_//;
      my $mprefix=$rid.'&'.$thismarker.'&';
- Line 736  sub print_row {
+ Line 983  sub print_row {
          } elsif ($cgroup) {
              &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } elsif ($csec) {
              &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } else {
              &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          }
      } elsif ($parmlev eq 'map') {
- Line 775  sub print_row {
+ Line 1022  sub print_row {
  	&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);
- Line 787  sub print_row {
+ Line 1034  sub print_row {
              &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
              &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          }
  	if ($uname) {
              if ($othergrp) {
                  $r->print($othergrp);
- Line 798  sub print_row {
+ Line 1045  sub print_row {
  	}
      } # 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>');
      }
- Line 815  sub print_row {
+ Line 1062  sub print_row {
  sub print_td {
      my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
-     $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
+     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
-               ' align="center">');
+               ';" align="center">');
-     if ($which<11 || $which > 12) {
+     my $nolink = 0;
- 	$r->print(&plink($$typeoutpar[$which],
+     if ($which == 11 || $which == 12) {
- 			 $$display{$value},$$outpar[$which],
+         $nolink = 1;
- 			 $mprefix."$which",'parmform.pres','psub'));
+     } elsif ($mprefix =~ /availablestudent\&$/) {
+         if ($which > 3) {
+             $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");
  }
- Line 840  sub print_usergroups {
+ Line 1095  sub print_usergroups {
                                                                     $courseopt);
      my $bgcolor = $defbg;
      my $grp_parm;
      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 {
- Line 854  sub print_usergroups {
+ Line 1109  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);
  }
- Line 883  sub parm_control_group {
+ Line 1138  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;
- Line 945  sub extractResourceInformation {
+ Line 1168  sub extractResourceInformation {
  	$$typep{$id}=$1;
  	$$keyp{$id}='';
          $$uris{$id}=$srcf;
- 	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+ 	foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
- 	    if ($_=~/^parameter\_(.*)/) {
+ 	    next if ($key!~/^parameter_/);
- 		my $key=$_;
  # Hidden parameters
- 		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {
+ 	    next 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');
  #
  # allparms is a hash of parameter names
  #
- 		my $parmdis = $display;
+ 	    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
- 		$parmdis =~ s/\[Part.*$//g;
+ 	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
-                 $$allparms{$name}=$parmdis;
+ 		my ($display,$parmdis);
- 		$$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		$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;
+ 		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}) {
+ 	    if ($$keyp{$id}) {
- 		    $$keyp{$id}.=','.$key;
+ 		$$keyp{$id}.=','.$key;
- 		} else {
+ 	    } else {
- 		    $$keyp{$id}=$key;
+ 		$$keyp{$id}=$key;
- 		}
+ 	    }
  #
  # Put in order
  #
-                 unless ($$keyorder{$key}) {
+ 	    unless ($$keyorder{$key}) {
-                     $$keyorder{$key}=$keyordercnt;
+ 		$$keyorder{$key}=$keyordercnt;
-                     $keyordercnt++;
+ 		$keyordercnt++;
- 		}
  	    }
  	}
- 	$$mapp{$id}=
- 	    &Apache::lonnet::declutter($resource->enclosing_map_src());
- 	$$mapp{$mapid}=$$mapp{$id};
+ 	if (!exists($$mapp{$mapid})) {
- 	$$allmaps{$mapid}=$$mapp{$id};
+ 	    $$mapp{$id}=
- 	if ($mapid eq '1') {
+ 		&Apache::lonnet::declutter($resource->enclosing_map_src());
- 	    $$maptitles{$mapid}='Main Course Documents';
+ 	    $$mapp{$mapid}=$$mapp{$id};
+ 	    $$allmaps{$mapid}=$$mapp{$id};
+ 	    if ($mapid eq '1') {
+ 		$$maptitles{$mapid}=&mt('Main Course Documents');
+ 	    } else {
+ 		$$maptitles{$mapid}=
+ 		    &Apache::lonnet::gettitle($$mapp{$id});
+ 	    }
+ 	    $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+ 	    $$symbp{$mapid}=$$mapp{$id}.'___(all)';
  	} else {
- 	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+ 	    $$mapp{$id} = $$mapp{$mapid};
  	}
- 	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
  	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
- 	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
      }
  }
- ##################################################
- ##################################################
  sub isdateparm {
      my $type=shift;
      return (($type=~/^date/) && (!($type eq 'date_interval')));
  }
+ #
+ # This function prints a list of parameters, which were selected. It also display a link from which you can
+ # hide or show the complete parameter list, from which you can choose your parameters.
+ #
  sub parmmenu {
      my ($r,$allparms,$pscat,$keyorder)=@_;
      my $tempkey;
      $r->print(<<ENDSCRIPT);
  <script type="text/javascript">
+ // <![CDATA[
      function checkall(value, checkName) {
+         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;
+                 document.getElementById(document.forms.parmform.elements[i].value.concat(li)).style.display = displayOverview;
              }
          }
      }
      function checkthis(thisvalue, checkName) {
+         document.getElementById(thisvalue.concat("_li")).style.display = "";
  	for (i=0; i<document.forms.parmform.elements.length; i++) {
              ele = document.forms.parmform.elements[i];
              if (ele.name == checkName) {
- Line 1048  sub parmmenu {
+ Line 1301  sub parmmenu {
  	checkthis('contentopen','pscat');
   	checkthis('contentclose','pscat');
      }
      function checkvisi() {
  	checkthis('hiddenresource','pscat');
- Line 1071  sub parmmenu {
+ Line 1323  sub parmmenu {
  	checkthis('maxtries','pscat');
      }
+     function hideParms() {
+         document.getElementById('LC_parm_overview_parm_menu').style.display = "none";
+     }
+     function showParms() {
+         document.getElementById('LC_parm_overview_parm_menu').style.display = "";
+     }
+     function checkboxChecked(id) {
+         var li = "_li";
+         var id_li = id.concat(li);
+         if (document.getElementById(id_li).style.display == "none") {
+             document.getElementById(id_li).style.display = "";
+         }
+         else {
+             document.getElementById(id_li).style.display = "none";
+         }
+     }
+ // ]]>
  </script>
  ENDSCRIPT
-     $r->print();
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
-     $r->print("\n<table><tr>");
-     my $cnt=0;
+     #part to print selected parms overview
+     $r->print(&mt('Selected Parameters:').'<br />');
+     #print out all possible parms and hide them by default
+     $r->print('<ul>');
      foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
- 	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
+         $r->print('<li id="'.$tempkey.'_li" value="'.$tempkey.'_li" name="pscat_li"');
- 	$r->print('value="'.$tempkey.'"');
+         if (!($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat})) {
- 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+             $r->print(' style="display:none"');
- 	    $r->print(' checked');
+         }
- 	}
+         $r->print('>'
- 	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
+                  .($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey} : $tempkey)
-  	$cnt++;
+                  .'</li>'
-         if ($cnt==3) {
+         );
- 	    $r->print("</tr>\n<tr>");
+     }
- 	    $cnt=0;
+     $r->print('</ul>'
- 	}
+              .'<p><a href="javascript:showParms()">'
-     }
+              .&mt('Show detailed Parameter Selection')
-     $r->print('
+              .'</a></p>'
- </tr><tr><td>
+     );
- <a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
- <a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
+     &shortCuts($r,$allparms,$pscat,$keyorder);
- </td><td>
- <a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
- <a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
+ }
- <a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
+ # return a hash
- <a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
+ sub categories {
- <a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
+     return ('time_settings' => 'Time Settings',
- </td><td>
+     'grading' => 'Grading',
- <a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
+     'tries' => 'Tries',
- </td>
+     'problem_appearance' => 'Problem Appearance',
- ');
+     'behaviour_of_input_fields' => 'Behaviour of Input Fields',
-     $r->print('</tr></table>');
+     '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',
+         'weight' => 'grading',
+         'handgrade' => 'grading',
+         'maxtries' => 'tries',
+         'hinttries' => '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',
+     );
+ }
+ 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 $tempkey;
+     my $tempparameter;
+     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 $tempparameter (keys %$allparms) {
+         &whatIsMyCategory($tempparameter, \%categoryList);
+     }
+     #part to print the parm-list
+     $r->print('<fieldset id="LC_parm_overview_parm_menu" style="display:none">'
+              .'<legend>'.&mt('Parameter').'</legend>'."\n"
+     );
+     #Print parameters
+     for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
+         if(@{$categoryList{$key}} == 0) {
+             next;
+         } else {
+             $r->print('<fieldset>'
+                      .'<legend>'
+                      .&mt($categories{$key})
+                      .'</legend>'."\n");
+             foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+                     $r->print('<span class="LC_nobreak">'
+                              .'<label><input type="checkbox" name="pscat" ');
+ 	            $r->print('value="'.$tempkey.'" ');
+                 $r->print('onclick="checkboxChecked(\''.$tempkey.'\')"');
+ 	            if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+ 	                $r->print(' checked="checked"');
+ 	            }
+                 $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                       : $tempkey)
+                         .'</label></span> ');
+             }
+             $r->print('</fieldset>');
+         }
+     }
+     $r->print('<hr />'
+              .'<a href="javascript:hideParms()">'
+              .&mt('Hide')
+              .'</a>'
+     );
+     #&shortCuts($r,$allparms,$pscat,$keyorder);
+     $r->print('</fieldset>');
+ }
+ #
+ # 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)=@_;
+     #part to print out the shortcuts for parmselection
+     $r->print('<table><tr id="LC_parm_overview_parm_menu_selectors">'
+              .'<td valign="top">'
+              .'<fieldset><legend>'.&mt('Parameter Selection').'</legend>'
+              .'<span class="LC_nobreak">'
+              .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
+              .'</span>'
+              .'<br />'
+              .'<span class="LC_nobreak">'
+              .'&bull; <a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>'
+              .'</span>'
+              .'<br />'
+              .'<span class="LC_nobreak">'
+              .'&bull; <a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>'
+              .'</span>'
+              .'</fieldset>'
+              .'</td>'
+              .'<td colspan="2" valign="top">'
+              .'<fieldset><legend>'.&mt('Add Selection for...').'</legend>'
+              .'<span class="LC_nobreak">'
+              .'&bull; <a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>'
+              .'</span>'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>'
+              .'</span>'
+ #            .'<br />'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>'
+              .'</span>'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>'
+              .'</span>'
+ #            .'<br />'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>'
+              .'</span>'
+              .'</fieldset>'
+              .'</td>'
+              .'</tr></table>');
  }
  sub partmenu {
      my ($r,$allparts,$psprt)=@_;
-     $r->print('<select multiple name="psprt" size="8">');
+     $r->print('<select multiple="multiple" name="psprt" size="8">');
      $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; }
- Line 1120  sub partmenu {
+ Line 1597  sub partmenu {
  	unless ($tempkey =~ /\./) {
  	    $r->print('<option value="'.$tempkey.'"');
  	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
- 		$r->print(' selected');
+ 		$r->print(' selected="selected"');
  	    }
  	    $r->print('>'.$$allparts{$tempkey}.'</option>');
  	}
- Line 1133  sub usermenu {
+ Line 1610  sub usermenu {
      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 %sectionhash=();
      my $sections='';
-     my $numsec = &Apache::loncommon::get_sections(
+     my %sectionhash = &Apache::loncommon::get_sections();
-                  $env{'course.'.$env{'request.course.id'}.'.domain'},
-                  $env{'course.'.$env{'request.course.id'}.'.num'},
- 					 \%sectionhash);
      my $groups;
-     my %grouphash;
+     my %grouphash = &Apache::longroup::coursegroups();
-     my $numgrp = &Apache::loncommon::coursegroups(
-                  \%grouphash,
+     my $g_s_header='';
-                  $env{'course.'.$env{'request.course.id'}.'.domain'},
+     my $g_s_footer='';
-                  $env{'course.'.$env{'request.course.id'}.'.num'});
-     if ($numsec > 0) {
+     if (%sectionhash) {
-         $sections=$lt{'se'}.': <select name="csec"';
+         $sections=&mt('Section:').' <select name="csec"';
-         if ($numsec && $numgrp && $parmlev ne 'full') {
+         if (%grouphash && $parmlev ne 'full') {
              $sections .= qq| onchange="group_or_section('csec')" |;
          }
          $sections .= '>';
- Line 1165  sub usermenu {
+ Line 1633  sub usermenu {
          }
          $sections.='</select>';
      }
-     if ($numsec && $numgrp && $parmlev ne 'full') {
-         $sections .= '&nbsp;or&nbsp;';
+     if (%sectionhash && %grouphash && $parmlev ne 'full') {
+         $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) {
- Line 1180  function group_or_section(caller) {
+ Line 1650  function group_or_section(caller) {
         }
     }
  }
+ // ]]>
  </script>
  |;
      } else {
          $sections .= qq|
  <script type="text/javascript">
+ // <![CDATA[
  function group_or_section(caller) {
      return;
  }
+ // ]]>
  </script>
  |;
      }
-     if ($numgrp > 0) {
-         $groups=$lt{'gr'}.': <select name="cgroup"';
+     if (%grouphash) {
-         if ($numsec && $numgrp && $env{'form.action'} eq 'settable') {
+         $groups=&mt('Group:').' <select name="cgroup"';
+         if (%sectionhash && $env{'form.action'} eq 'settable') {
              $groups .= qq| onchange="group_or_section('cgroup')" |;
          }
          $groups .= '>';
- Line 1214  function group_or_section(caller) {
+ Line 1688  function group_or_section(caller) {
          }
          $groups.='</select>';
      }
-     $r->print(<<ENDMENU);
- <b>
+     if (%sectionhash || %grouphash) {
- $sections
+         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
- $groups
+         $r->print($sections.$groups);
- <br />
+         $r->print(&Apache::lonhtmlcommon::row_closure());
- $lt{'fu'}
+     }
- <input type="text" value="$uname" size="12" name="uname" />
- $lt{'oi'}
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
- <input type="text" value="$id" size="12" name="id" />
+     $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
- $lt{'ad'}
+                  ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
- $chooseopt
+                  ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
- </b>
+                  ,$chooseopt));
- ENDMENU
  }
+ #
+ # 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>'.
+     $r->print(&Apache::lonhtmlcommon::topic_bar (2,&mt('Select Parameters')));
- 	     &mt('Select Parts to View').'</th></tr><tr><td>');
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
      &parmmenu($r,$allparms,$pscat,$keyorder);
-     $r->print('</td><td>');
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
+     &parmboxes($r,$allparms,$pscat,$keyorder);
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
      &partmenu($r,$allparts,$psprt);
-     $r->print('</td></tr></table>');
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
  }
  sub mapmenu {
-     my ($r,$allmaps,$pschp,$maptitles)=@_;
+     my ($r,$allmaps,$pschp,$maptitles, $symbp)=@_;
-     $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
+     my %allmaps_inverted = reverse %$allmaps;
-     $r->print('<select name="pschp">');
+     my $navmap = Apache::lonnavmaps::navmap->new();
-     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
+     my $tree=[];
-     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
+     my $treeinfo={};
- 	$r->print('<option value="'.$_.'"');
+     if (defined($navmap)) {
- 	if (($pschp eq $_)) { $r->print(' selected'); }
+         my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
- 	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
+         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')));
+     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
+         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
+         $r->print(&Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_row()
+                  .'<td>'.$icon
+                  .'<label>&nbsp;'
+                  .'<input type="radio" name="pschp" checked="checked" value="all" />'
+                  .&mt('All Maps or Folders')
+                  .'</label></td>'
+                  .&Apache::loncommon::end_data_table_row()
+         );
+         my $whitespace = '<img src="'
+                         .&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif")
+                         .'" alt="" />';
+         if (exists($$allmaps{1})) {
+             $r->print(&Apache::loncommon::start_data_table_row()
+                 .'<td>'.$icon
+                 .'<label>&nbsp;'
+                 .'<input type="radio" name="pschp" value="1"'
+             );
+             if ($pschp eq 1) {
+                 $r->print(' checked="checked"');
+             }
+             $r->print('/>'
+                 .$$maptitles{1}
+                 .($$allmaps{1} !~/^uploaded/?' ['.$$allmaps{1}.']':'')
+                 .'</label>'
+                 .'</td>'
+                 .&Apache::loncommon::end_data_table_row()
+             );
+         }
+         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>'.$indent.$icon
+                      .'<label>&nbsp;'
+                      .'<input type ="radio" name="pschp" value="'.$allmaps_inverted{$symb_name}.'"'
+             );
+             if ($pschp eq $allmaps_inverted{$symb_name}) {
+                 $r->print(' checked="checked"');
+             }
+             $r->print('/>'
+                      .$treeinfo->{$id}->{name}
+                      .($$allmaps{$mapid}!~/^uploaded/?' ['.$$allmaps{$mapid}.']':'')
+                      .'</label>'
+                      .'</td>'
+                      .&Apache::loncommon::end_data_table_row()
+             );
+         }
+         $r->print(&Apache::loncommon::end_data_table());
      }
-     $r->print("</select>");
  }
  sub levelmenu {
      my ($r,$alllevs,$parmlev)=@_;
-     $r->print('<b>'.&mt('Select Parameter Level').
- 	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
      $r->print('<select name="parmlev">');
      foreach (reverse sort keys %{$alllevs}) {
  	$r->print('<option value="'.$$alllevs{$_}.'"');
  	if ($parmlev eq $$alllevs{$_}) {
- 	    $r->print(' selected');
+ 	    $r->print(' selected="selected"');
  	}
- 	$r->print('>'.$_.'</option>');
+ 	$r->print('>'.&mt($_).'</option>');
      }
      $r->print("</select>");
  }
- Line 1270  sub levelmenu {
+ Line 1853  sub levelmenu {
  sub sectionmenu {
      my ($r,$selectedsections)=@_;
-     my %sectionhash=();
+     my %sectionhash = &Apache::loncommon::get_sections();
-     my $sections='';
+     return if (!%sectionhash);
-     my $numsec = &Apache::loncommon::get_sections(
-                  $env{'course.'.$env{'request.course.id'}.'.domain'},
+     $r->print('<select name="Section" multiple="multiple" size="8">');
-                  $env{'course.'.$env{'request.course.id'}.'.num'},
+     foreach my $s ('all',sort keys %sectionhash) {
- 					 \%sectionhash);
+ 	$r->print('    <option value="'.$s.'"');
-     if ($numsec) {
+ 	foreach (@{$selectedsections}) {
- 	$r->print('<select name="Section" multiple="true" size="8" >');
+ 	    if ($s eq $_) {
- 	foreach my $s ('all',sort keys %sectionhash) {
+ 		$r->print(' selected="selected"');
- 	    $r->print('    <option value="'.$s.'"');
+ 		last;
- 	    foreach (@{$selectedsections}) {
- 		if ($s eq $_) {
- 		    $r->print(' selected');
- 		    last;
- 		}
  	    }
- 	    $r->print('>'.$s."</option>\n");
  	}
-         $r->print("</select>\n");
+ 	$r->print('>'.$s."</option>\n");
-    }
+     }
+     $r->print("</select>\n");
  }
  sub groupmenu {
      my ($r,$selectedgroups)=@_;
-     my %grouphash;
+     my %grouphash = &Apache::longroup::coursegroups();
-     my $numgrp = &Apache::loncommon::coursegroups(
+     return if (!%grouphash);
-                  \%grouphash,
-                  $env{'course.'.$env{'request.course.id'}.'.domain'},
+     $r->print('<select name="Group" multiple="multiple" size="8">');
-                  $env{'course.'.$env{'request.course.id'}.'.num'});
+     foreach my $group (sort(keys(%grouphash))) {
-     if ($numgrp) {
+ 	$r->print('    <option value="'.$group.'"');
-         $r->print('<select name="Group" multiple="true" size="8" >');
+ 	foreach (@{$selectedgroups}) {
-         foreach my $group (sort(keys(%grouphash))) {
+ 	    if ($group eq $_) {
-             $r->print('    <option value="'.$group.'"');
+ 		$r->print(' selected="selected"');
-             foreach (@{$selectedgroups}) {
+ 		last;
-                 if ($group eq $_) {
+ 	    }
-                     $r->print(' selected');
+ 	}
-                     last;
+ 	$r->print('>'.$group."</option>\n");
-                 }
-             }
-             $r->print('>'.$group."</option>\n");
-         }
-         $r->print("</select>\n");
      }
+     $r->print("</select>\n");
  }
- Line 1351  sub sortmenu {
+ Line 1925  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>');
- Line 1385  sub standardkeyorder {
+ Line 1959  sub standardkeyorder {
              'parameter_0_discusshide' => 20);
  }
- ##################################################
- ##################################################
- =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;
- Line 1437  sub assessparms {
+ Line 1982  sub assessparms {
      my $uhome;
      my $csec;
      my $cgroup;
-     my $grouplist;
      my @usersgroups = ();
      my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
      $alllevs{'Resource Level'}='full';
- Line 1468  sub assessparms {
+ Line 2012  sub assessparms {
      } else {
  	$udom=$r->dir_config('lonDefDomain');
      }
      my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
      my $pschp=$env{'form.pschp'};
- Line 1476  sub assessparms {
+ Line 2021  sub assessparms {
      my $pssymb='';
      my $parmlev='';
      unless ($env{'form.parmlev'}) {
          $parmlev = 'map';
      } else {
- Line 1509  sub assessparms {
+ Line 2054  sub assessparms {
  	    $id='';
  	} else {
  	    $message=
- 		"<font color=red>".&mt("Unknown ID")." '$id' ".
+ 		'<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
- 		&mt('at domain')." '$udom'</font>";
+ 		&mt('at domain')." '$udom'</span>";
  	}
      } else {
  	$uname=$env{'form.uname'};
- Line 1521  sub assessparms {
+ Line 2066  sub assessparms {
  	$uhome=&Apache::lonnet::homeserver($uname,$udom);
          if ($uhome eq 'no_host') {
  	    $message=
- 		"<font color=red>".&mt("Unknown user")." '$uname' ".
+ 		'<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
- 		&mt("at domain")." '$udom'</font>";
+ 		&mt("at domain")." '$udom'</span>";
  	    $uname='';
          } else {
  	    $csec=&Apache::lonnet::getsection($udom,$uname,
  					      $env{'request.course.id'});
  	    if ($csec eq '-1') {
- 		$message="<font color=red>".
+ 		$message='<span class="LC_error">'.
  		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
- 		    &mt("not in this course")."</font>";
+ 		    &mt("not in this course")."</span>";
  		$uname='';
  		$csec=$env{'form.csec'};
                  $cgroup=$env{'form.cgroup'};
- Line 1541  sub assessparms {
+ Line 2086  sub assessparms {
  		$message="\n<p>\n".&mt("Full Name").": ".
  		    $name{'firstname'}.' '.$name{'middlename'}.' '
  			.$name{'lastname'}.' '.$name{'generation'}.
- 			    "<br>\n".&mt('ID').": ".$name{'id'}.'<p>';
+ 			    "<br />\n".&mt('ID').": ".$name{'id'}.'<p>';
  	    }
-             $grouplist = &Apache::lonnet::get_users_groups(
+             @usersgroups = &Apache::lonnet::get_users_groups(
                                         $udom,$uname,$env{'request.course.id'});
-             if ($grouplist) {
+             if (@usersgroups > 0) {
-                 @usersgroups = &Apache::lonnet::sort_course_groups($grouplist,
+                 unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
-                                                     $env{'request.course.id'});
-                 unless (grep/^\Q$cgroup\E$/,@usersgroups) {
                      $cgroup = $usersgroups[0];
                  }
-             } else {
-                 $cgroup = '';
              }
          }
      }
- Line 1561  sub assessparms {
+ Line 2102  sub assessparms {
      unless ($cgroup) { $cgroup=''; }
  # --------------------------------------------------------- Get all assessments
      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
  				\%mapp, \%symbp,\%maptitles,\%uris,
  				\%keyorder);
- Line 1574  sub assessparms {
+ Line 2115  sub assessparms {
          my @values=split(/\&\&\&/,$env{'form.pres_value'});
          my @types=split(/\&\&\&/,$env{'form.pres_type'});
  	for (my $i=0;$i<=$#markers;$i++) {
+             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+                 my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 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);
+                             }
+                         }
+                     }
+                 }
+             }
  	    $message.=&storeparm(split(/\&/,$markers[$i]),
  				 $values[$i],
  				 $types[$i],
  				 $uname,$udom,$csec,$cgroup);
  	}
  # ---------------------------------------------------------------- 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>';
+         $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);}
  # ------------------------------------------------------------------ Start page
- Line 1593  sub assessparms {
+ Line 2170  sub assessparms {
      foreach ('tolerance','date_default','date_start','date_end',
  	     'date_interval','int','float','string') {
  	$r->print('<input type="hidden" value="'.
- 		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+ 		  &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
+ 		  '" name="recent_'.$_.'" />');
      }
+     # ----- 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
+     my $parmselhiddenstyle=' style="display:none"';
+     if($env{'form.hideparmsel'} eq 'hidden') {
+         $r->print('<div id="parmsel"'.$parmselhiddenstyle.'>');
+     } else  {
+         $r->print('<div id="parmsel">');
+     }
+     # Display Unit 1 "General Parameters"
      if (!$pssymb) {
-         $r->print('<table border="1"><tr><td>');
+         $r->print(&Apache::lonhtmlcommon::topic_bar (1,&mt('General Parameters')));
+         $r->print(&Apache::lonhtmlcommon::start_pick_box());
          &levelmenu($r,\%alllevs,$parmlev);
  	if ($parmlev ne 'general') {
-             $r->print('<td>');
+             $r->print(&Apache::lonhtmlcommon::row_closure());
- 	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
+ 	    &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
- 	    $r->print('</td>');
  	}
-         $r->print('</td></tr></table>');
+         $r->print(&Apache::lonhtmlcommon::row_closure(1));
+         $r->print(&Apache::lonhtmlcommon::end_pick_box());
+     #Display Unit 2 "Select Parameter"
  	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
      } else {
          my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
-         $r->print(&mt('Specific Resource').": ".$resource.
+ 	my $title = &Apache::lonnet::gettitle($pssymb);
-                   '<input type="hidden" value="'.$pssymb.'" name="symb">'.
+         $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 />');
      }
-     &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+     $r->print(&Apache::lonhtmlcommon::topic_bar (3,&mt('User Selection')));
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
+     &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
+     # parm selection is shown: display parm update button
+     $r->print('<p>'
+              .'<input type="submit" name="dis"'
+              .' value="'.&mt('Update Parameter Display').'" />'
+              .'<input type="hidden" name="hideparmsel" value="hidden" />'
+              .'</p>'
+     );
+     $r->print('</div>');
+     # ----- End Parameter Selection
+     # 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>');
-     $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 {
- Line 1638  sub assessparms {
+ Line 2269  sub assessparms {
             my $userspan=3;
             if ($cgroup ne '') {
                $coursespan += 3;
             }
-            $r->print('<p><table border=2>');
+            $r->print('<p><table border="2">');
-            $r->print('<tr><td colspan=5></td>');
+            $r->print('<tr><td colspan="5"></td>');
-            $r->print('<th colspan='.($coursespan).'>'.&mt('Any User').'</th>');
+            $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
             if ($uname) {
                 if (@usersgroups > 1) {
                     $userspan ++;
- Line 1668  sub assessparms {
+ Line 2299  sub assessparms {
  				  'fr'     => 'for Resource'
  					      );
             $r->print(<<ENDTABLETWO);
- <th rowspan=3>$lt{'pie'}</th>
+ <th rowspan="3">$lt{'pie'}</th>
- <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
+ <th rowspan="3">$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
- </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
+ </tr><tr><td colspan="5"></td><th colspan="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
- <th colspan=1>$lt{'ic'}</th>
+ <th colspan="1">$lt{'ic'}</th>
  ENDTABLETWO
             if ($csec) {
-                 $r->print("<th colspan=3>".
+                 $r->print('<th colspan="3">'.
  			  &mt("in Section")." $csec</th>");
             }
             if ($cgroup) {
-                 $r->print("<th colspan=3>".
+                 $r->print('<th colspan="3">'.
                            &mt("in Group")." $cgroup</th>");
             }
             $r->print(<<ENDTABLEHEADFOUR);
- Line 1715  ENDTABLEHEADFOUR
+ Line 2346  ENDTABLEHEADFOUR
                  my $rid=$_;
                  my ($inmapid)=($rid=~/\.(\d+)$/);
                  if ((!$pssymb &&
  		     (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
  		    ||
  		    ($pssymb && $pssymb eq $symbp{$rid})) {
  # ------------------------------------------------------ Entry for one resource
-                     if ($defbgone eq '"#E0E099"') {
+                     if ($defbgone eq '#E0E099') {
-                         $defbgone='"#E0E0DD"';
+                         $defbgone='#E0E0DD';
                      } else {
-                         $defbgone='"#E0E099"';
+                         $defbgone='#E0E099';
                      }
-                     if ($defbgtwo eq '"#FFFF99"') {
+                     if ($defbgtwo eq '#FFFF99') {
-                         $defbgtwo='"#FFFFDD"';
+                         $defbgtwo='#FFFFDD';
                      } else {
-                         $defbgtwo='"#FFFF99"';
+                         $defbgtwo='#FFFF99';
                      }
-                     if ($defbgthree eq '"#FFBB99"') {
+                     if ($defbgthree eq '#FFBB99') {
-                         $defbgthree='"#FFBBDD"';
+                         $defbgthree='#FFBBDD';
                      } else {
-                         $defbgthree='"#FFBB99"';
+                         $defbgthree='#FFBB99';
                      }
                      my $thistitle='';
- Line 1750  ENDTABLEHEADFOUR
+ Line 2381  ENDTABLEHEADFOUR
                          if (grep $_ eq $tempkeyp, @catmarker) {
                            $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
                            $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
-                           $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
+                           my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
+                           if ($allparms{$name{$_}} ne '') {
+                               my $identifier;
+                               if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                   $identifier = $1;
+                               }
+                               $display{$_} = $allparms{$name{$_}}.$identifier;
+                           } else {
+                               $display{$_} = $parmdis;
+                           }
                            unless ($display{$_}) { $display{$_}=''; }
                            $display{$_}.=' ('.$name{$_}.')';
                            $default{$_}=&Apache::lonnet::metadata($uri,$_);
- Line 1762  ENDTABLEHEADFOUR
+ Line 2402  ENDTABLEHEADFOUR
                      if ($totalparms>0) {
                          my $firstrow=1;
  			my $title=&Apache::lonnet::gettitle($symbp{$rid});
-                         $r->print('<tr><td bgcolor='.$defbgone.
+                         $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='.
- 				  &Apache::lonnet::escape($symbp{$rid}).
+ 				  &escape($symbp{$rid}).
-                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
+                              "', 'metadatafile', '450', '500', 'no', 'yes');\"".
-                              " TARGET=_self>$title");
+                              " 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>');
- Line 1804  ENDTABLEHEADFOUR
+ Line 2444  ENDTABLEHEADFOUR
          } # end of  full
  #--------------------------------------------------- Entry for parm level map
          if ($parmlev eq 'map') {
-             my $defbgone = '"E0E099"';
+             my $defbgone = '#E0E099';
-             my $defbgtwo = '"FFFF99"';
+             my $defbgtwo = '#FFFF99';
-             my $defbgthree = '"FFBB99"';
+             my $defbgthree = '#FFBB99';
              my %maplist;
              if ($pschp eq 'all') {
                  %maplist = %allmaps;
              } else {
                  %maplist = ($pschp => $mapp{$pschp});
              }
- Line 1831  ENDTABLEHEADFOUR
+ Line 2471  ENDTABLEHEADFOUR
                  my $map = 0;
  #		$r->print("Catmarker: @catmarker<br />\n");
                  foreach (@ids) {
                    ($map)=(/([\d]*?)\./);
                    my $rid = $_;
  #                  $r->print("$mapid:$map:   $rid <br /> \n");
                    if ($map eq $mapid) {
- Line 1853  ENDTABLEHEADFOUR
+ Line 2493  ENDTABLEHEADFOUR
                        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');
+                         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_/;
- Line 1867  ENDTABLEHEADFOUR
+ Line 2516  ENDTABLEHEADFOUR
                      } # 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);
+                 my $tmp="";
- <center><h4>
- Set Defaults for All Resources in $foldermap<br />
- <font color="red"><i>$showtitle</i></font><br />
- Specifically for
- ENDMAPONE
                  if ($uname) {
  		    my $person=&Apache::loncommon::plainname($uname,$udom);
-                     $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
+                     $tmp.=&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
-                         &mt('in')." \n");
+                         &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".
+                     $tmp.=&mt("Group")." <font color=\"red\"><i>$cgroup".
-                               "</i></font> ".&mt('of')." \n");
+                               "</i></font> ".&mt('of')." \n";
                      $csec = '';
                  } elsif ($csec) {
-                     $r->print(&mt("Section")." <font color=\"red\"><i>$csec".
+                     $tmp.=&mt("Section")." <font color=\"red\"><i>$csec".
-                               "</i></font> ".&mt('of')." \n");
+                               "</i></font> ".&mt('of')." \n";
                  }
-                 $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
+                 $r->print('<div align="center"><h4>'
-                 $r->print("</h4>\n");
+                          .&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('<p>'.&Apache::loncommon::start_data_table()
-                 $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
+                          .&Apache::loncommon::start_data_table_header_row()
-                 $r->print('<th>'.&mt('Default Value').'</th>');
+                          .'<th>'.&mt('Parameter Name').'</th>'
-                 $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+                          .'<th>'.&mt('Default Value').'</th>'
+                          .'<th>'.&mt('Parameter in Effect').'</th>'
+                          .&Apache::loncommon::end_data_table_header_row()
+                 );
  	        foreach (&keysinorder(\%name,\%keyorder)) {
-                     $r->print('<tr>');
+                     $r->print(&Apache::loncommon::start_data_table_row());
                      &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                             \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                             $parmlev,$uname,$udom,$csec,$cgroup);
                  }
-                 $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 $defbgone = '#E0E099';
-             my $defbgtwo = '"FFFF99"';
+             my $defbgtwo = '#FFFF99';
-             my $defbgthree = '"FFBB99"';
+             my $defbgthree = '#FFBB99';
  #-------------------------------------------- for each map, gather information
              my $mapid="0.0";
- Line 1924  ENDMAPONE
+ Line 2579  ENDMAPONE
              my %display = ();
              my %type = ();
              my %default = ();
              foreach (@ids) {
                  my $rid = $_;
                  my $uri=&Apache::lonnet::declutter($uris{$rid});
  #--------------------------------------------------------------------
- Line 1944  ENDMAPONE
+ Line 2599  ENDMAPONE
                    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');
+                     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_/;
- Line 1953  ENDMAPONE
+ Line 2617  ENDMAPONE
                    }
                  } # end loop through keys
              } # end loop through ids
  #---------------------------------------------------- print header information
  	    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) {
- Line 1966  ENDMAPONE
+ Line 2631  ENDMAPONE
              } 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>$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('<p>'.&Apache::loncommon::start_data_table()
-             $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
+                      .&Apache::loncommon::start_data_table_header_row()
-             $r->print('<th>'.&mt('Default Value').'</th>');
+                      .'<th>'.&mt('Parameter Name').'</th>'
-             $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+                      .'<th>'.&mt('Default Value').'</th>'
+                      .'<th>'.&mt('Parameter in Effect').'</th>'
+                      .&Apache::loncommon::end_data_table_header_row()
+             );
  	    foreach (&keysinorder(\%name,\%keyorder)) {
-                 $r->print('<tr>');
+                 $r->print(&Apache::loncommon::start_data_table_row());
                  &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                         \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                                     $parmlev,$uname,$udom,$csec,$cgroup);
              }
-             $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());
  } # 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(undef,
- 						    '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 />';
-             }
-         }
-     }
- # ------------------------- Re-init course environment entries for this session
-     &Apache::lonnet::coursedescription($env{'request.course.id'});
- # -------------------------------------------------------- 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 /><font color=red> '.
-                                  &mt('Modification may make assessment data inaccessible').
-                                  '</font>',
-              '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 />'.
-                     '<font color="red">'.&mt('Modifying this will make problems').' '.
-                     &mt('have different numbers and answers').'</font>',
- 	     '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])',
-              '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>').')',
- 	     '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',
-                              'disable_receipt_display',
-                              'spreadsheet_default_classcalc',
-                              'spreadsheet_default_studentcalc',
-                              'spreadsheet_default_assesscalc',
-                              'hideemptyrows',
-                              'default_enrollment_start_date',
-                              'default_enrollment_end_date',
- 			     'tthoptions',
- 			     'disablesigfigs',
- 			     'disableexampointprint'
-                              );
- 	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 .= '<tr><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},
-,$onchange).'</td>';
-             }
-             $output .= '<td>'.
-                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
-                 '</td>';
-             $output .= "</tr>\n";
- 	}
-         my $onchange = 'onFocus="javascript:window.document.forms'.
-             '[\'envform\'].elements[\'newp_setparmval\']'.
-             '.checked=true;"';
- 	$output.='<tr><td><i>'.&mt('Create New Environment Variable').'</i><br />'.
- 	    '<input type="text" size=40 name="newp_name" '.
-                 $onchange.' /></td><td>'.
-             '<input type="text" size=40 name="newp_value" '.
-                 $onchange.' /></td><td>'.
- 	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
-     }
-     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 Parameters',
- 				       $browse_js);
-     my $end_page =
- 	&Apache::loncommon::end_page();
-     $r->print(<<ENDENV);
- $start_page
- $breadcrumbs
- <form method="post" action="/adm/parmset?action=crsenv" name="envform">
- $setoutput
- <p>
- <table border=2>
- <tr><th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th></tr>
- $output
- </table>
- <input type="submit" name="crsenv" value="$lt{'sce'}">
- </form>
- $end_page
- ENDENV
- }
  ##################################################
  # Overview mode
  ##################################################
- Line 2354  sub tablestart {
+ Line 2669  sub tablestart {
  	return '';
      } else {
  	$tableopen=1;
- 	return '<table border="2"><tr><th>'.&mt('Parameter').'</th><th>'.
+ 	return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
  	    &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
      }
  }
- Line 2362  sub tablestart {
+ Line 2677  sub tablestart {
  sub tableend {
      if ($tableopen) {
  	$tableopen=0;
- 	return '</table>';
+ 	return &Apache::loncommon::end_data_table();
      } else {
  	return'';
      }
- Line 2376  sub readdata {
+ Line 2691  sub readdata {
      my $classlist=&Apache::loncoursedata::get_classlist();
      foreach (keys %$classlist) {
-         # the following undefs are for 'domain', and 'username' respectively.
+         if ($_=~/^($match_username)\:($match_domain)$/) {
-         if ($_=~/^(\w+)\:(\w+)$/) {
  	    my ($tuname,$tudom)=($1,$2);
  	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
              foreach my $userkey (keys %{$useropt}) {
- Line 2413  sub storedata {
+ Line 2727  sub storedata {
              if ($tuname) {
  		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
  	    }
- 	    if ($cmd eq 'set') {
+ 	    if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
- 		my $data=$env{$_};
+ 		my ($data, $typeof, $text);
-                 my $typeof=$env{'form.typeof_'.$thiskey};
+ 		if ($cmd eq 'set') {
-  		if ($$olddata{$thiskey} ne $data) {
+ 		    $data=$env{$_};
+ 		    $typeof=$env{'form.typeof_'.$thiskey};
+ 		    $text = &mt('Saved modified parameter for');
+ 		} elsif ($cmd eq 'datepointer') {
+ 		    $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+ 		    $typeof=$env{'form.typeof_'.$thiskey};
+ 		    $text = &mt('Saved modified date for');
+ 		} elsif ($cmd eq 'dateinterval') {
+ 		    $data=&get_date_interval_from_form($thiskey);
+ 		    $typeof=$env{'form.typeof_'.$thiskey};
+ 		    $text = &mt('Saved modified date for');
+ 		}
+ 		if (defined($data) and $$olddata{$thiskey} ne $data) {
  		    if ($tuname) {
  			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
  								 $tkey.'.type' => $typeof},
  						 $tudom,$tuname) eq 'ok') {
- 			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+ 			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
+ 			    $r->print('<br />'.$text.' '.
  				      &Apache::loncommon::plainname($tuname,$tudom));
  			} else {
- 			    $r->print('<h2><font color="red">'.
+ 			    $r->print('<div class="LC_error">'.
- 				      &mt('Error storing parameters').'</font></h2>');
+ 				      &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('<h2><font color="red">'.
+ 			$r->print('<div class="LC_error">'.
- 				  &mt('Error deleting parameters').'</font></h2>');
+ 				  &mt('Error deleting parameters').'</div>');
  		    }
  		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
  		} else {
- 		    push (@deldata,$thiskey);
+ 		    push (@deldata,$thiskey,$thiskey.'.type');
- 		}
- 	    } elsif ($cmd eq 'datepointer') {
- 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-                 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') {
- 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
- 			} else {
- 			    $r->print('<h2><font color="red">'.
- 				      &mt('Error storing parameters').'</font></h2>');
- 			}
- 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
- 		    } else {
- 			$newdata{$thiskey}=$data;
- 			$newdata{$thiskey.'.type'}=$typeof;
- 		    }
  		}
  	    }
  	}
- Line 2473  sub storedata {
+ Line 2782  sub storedata {
      my $putentries=$#newdatakeys+1;
      if ($delentries) {
  	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+ 	    my %loghash=map { $_ => '' } @deldata;
+ 	    &log_parmset(\%loghash,1);
  	    $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
  	} else {
- 	    $r->print('<h2><font color="red">'.
+ 	    $r->print('<div class="LC_error">'.
- 		      &mt('Error deleting parameters').'</font></h2>');
+ 		      &mt('Error deleting parameters').'</div>');
  	}
  	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
      if ($putentries) {
  	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
- 	    $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');
+ 			    &log_parmset(\%newdata,0);
+ 	    $r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');
  	} else {
- 	    $r->print('<h2><font color="red">'.
+ 	    $r->print('<div class="LC_error">'.
- 		      &mt('Error storing parameters').'</font></h2>');
+ 		      &mt('Error saving parameters').'</div>');
  	}
  	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
- Line 2493  sub storedata {
+ Line 2805  sub storedata {
  sub extractuser {
      my $key=shift;
-     return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+     return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
+ }
+ sub 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 {
- Line 2507  sub listdata {
+ Line 2839  sub listdata {
      $tableopen=0;
      my $foundkeys=0;
      my %keyorder=&standardkeyorder();
      foreach my $thiskey (sort {
+ 	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') {
- 	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+             if ($ares     ne $bres    ) {
- 	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+ 		$result = ($ares     cmp $bres);
- 	    if (!defined($astudent)) {
+             } elsif ($astudent ne $bstudent) {
- 		($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+ 		$result = ($astudent cmp $bstudent);
- 	    }
+ 	    } elsif ($apart    ne $bpart   ) {
- 	    if (!defined($bstudent)) {
+ 		$result = ($apart    cmp $bpart);
- 		($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)) {
-;
- 		} else {
- 		    ($arealm cmp $brealm) || ($astudent cmp $bstudent);
- 		}
- 	    } else {
- 		($arealm cmp $brealm) || ($astudent cmp $bstudent);
  	    }
  	} else {
- 	    $a cmp $b;
+ 	    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}) {
  	if ($$listdata{$thiskey.'.type'}) {
              my $thistype=$$listdata{$thiskey.'.type'};
              if ($$resourcedata{$thiskey.'.type'}) {
- Line 2551  sub listdata {
+ Line 2891  sub listdata {
  	    my $section=&mt('All Students');
  	    if ($middle=~/^\[(.*)\]/) {
  		my $issection=$1;
- 		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+ 		if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
  		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
  		} else {
  		    $section=&mt('Group/Section').': '.$issection;
- Line 2560  sub listdata {
+ Line 2900  sub listdata {
  	    }
  	    $middle=~s/\.+$//;
  	    $middle=~s/^\.+//;
- 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
+ 	    my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
  	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
- 		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
+ 		$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
  	    } elsif ($middle) {
  		my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
- 		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
+ 		$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
  	    }
  	    if ($sortorder eq 'realmstudent') {
  		if ($realm ne $oldrealm) {
- Line 2592  sub listdata {
+ Line 2932  sub listdata {
  	    }
  	    if ($part ne $oldpart) {
  		$r->print(&tableend().
- 			  "\n<font color='blue'>".&mt('Part').": $part</font>");
+ 			  "\n".'<span class="LC_parm_part">'.&mt('Part').": $part</span>");
  		$oldpart=$part;
  	    }
  #
- # Preset defaults?
- #
-             my ($hour,$min,$sec,$val)=('','','','');
- 	    unless ($$resourcedata{$thiskey}) {
- 		my ($parmname)=($thiskey=~/\.(\w+)$/);
- 		($hour,$min,$sec,$val)=&preset_defaults($parmname);
- 	    }
- #
  # Ready to print
  #
- 	    $r->print(&tablestart().'<tr><td><b>'.$name.
+             my $parmitem = &standard_parameter_names($name);
- 		      ':</b></td><td><input type="checkbox" name="del_'.
+ 	    $r->print(&tablestart().
+ 		      &Apache::loncommon::start_data_table_row().
+ 		      '<td><b>'.&mt($parmitem).
+ 		      '</b></td><td><input type="checkbox" name="del_'.
  		      $thiskey.'" /></td><td>');
  	    $foundkeys++;
  	    if (&isdateparm($thistype)) {
- Line 2618  sub listdata {
+ Line 2952  sub listdata {
  			  &Apache::lonhtmlcommon::date_setter('parmform',
  							      $jskey,
  						      $$resourcedata{$thiskey},
- 							      '',1,'','',$hour,$min,$sec).
+ 							      '',1,'','').
  '<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') {
+ 	    } elsif ($thistype eq 'date_interval') {
- 		my $showval;
+ 		$r->print(&date_interval_selector($thiskey,
- 		if (defined($$resourcedata{$thiskey})) {
+ 						  $$resourcedata{$thiskey}));
- 		    $showval=$$resourcedata{$thiskey};
+ 	    } elsif ($thistype =~ m/^string/) {
- 		} else {
+ 		$r->print(&string_selector($thistype,$thiskey,
- 		    $showval=$val;
+ 					   $$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;
+ 		$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
- 		if (defined($$resourcedata{$thiskey})) {
- 		    $showval=$$resourcedata{$thiskey};
- 		} else {
- 		    $showval=$val;
- 		}
- 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
- 			  $showval.'">');
  	    }
  	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
- 		      $thistype.'">');
+ 		      $thistype.'" />');
- 	    $r->print('</td></tr>');
+ 	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
  	}
      }
      return $foundkeys;
  }
+ sub date_interval_selector {
+     my ($thiskey, $showval) = @_;
+     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);
+ 	$result .= ' '.&mt($name);
+     }
+     $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) = @_;
+     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+ }
+ 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.' ]],
+      );
+ sub string_selector {
+     my ($thistype, $thiskey, $showval) = @_;
+     if (!exists($strings{$thistype})) {
+ 	return &default_selector($thiskey,$showval);
+     }
+     my $result;
+     foreach my $possibilities (@{ $strings{$thistype} }) {
+ 	my ($name, $description) = @{ $possibilities };
+ 	$result .= '<label><input type="radio" name="set_'.$thiskey.
+ 		  '" value="'.$name.'"';
+ 	if ($showval eq $name) {
+ 	    $result .= ' checked="checked"';
+ 	}
+ 	$result .= ' />'.&mt($description).'</label> ';
+     }
+     return $result;
+ }
+ #
+ # 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'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+     	text=>"Overview Mode"});
      my $start_page = &Apache::loncommon::start_page('Set Parameters');
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
  $start_page
  $breadcrumbs
- Line 2697  ENDOVER
+ Line 3126  ENDOVER
      my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
      if (!@psprt) { $psprt[0]='0'; }
      my @selected_sections =
  	&Apache::loncommon::get_env_multiple('form.Section');
      @selected_sections = ('all') if (! @selected_sections);
-     foreach (@selected_sections) {
+     foreach my $sec (@selected_sections) {
-         if ($_ eq 'all') {
+         if ($sec eq 'all') {
              @selected_sections = ('all');
          }
      }
- Line 2710  ENDOVER
+ Line 3139  ENDOVER
      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);
+     if (grep {$_ eq 'all'} (@psprt)) {
+ 	@psprt = keys(%allparts);
+     }
  # Menu to select levels, etc
-     $r->print('<table border="1"><tr><td>');
+     #$r->print('<table id="LC_parm_overview_scope">
+     #           <tr><td class="LC_parm_overview_level_menu">');
+     $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());
      &levelmenu($r,\%alllevs,$parmlev);
      if ($parmlev ne 'general') {
- 	$r->print('<td>');
+ 	#$r->print('<td class="LC_parm_overview_map_menu">');
+         $r->print(&Apache::lonhtmlcommon::row_closure());
  	&mapmenu($r,\%allmaps,$pschp,\%maptitles);
- 	$r->print('</td>');
+ 	#$r->print('</td>');
      }
-     $r->print('</td></tr></table>');
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
-     $r->print('<table border="1"><tr><td>');
+     $r->print('</div></div>');
+     #$r->print('</td></tr></table>');
+     #$r->print('<table id="LC_parm_overview_controls">
+     #           <tr><td class="LC_parm_overview_parm_selectors">');
+     $r->print('<div class="LC_Box">');
+     $r->print('<div>');
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
      &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-     $r->print('</td><td><table border="0" cellspacing="0" cellpadding="0">'.
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
-               '<tr><td>'.&mt('Parts').'</td><td></td><td>'.&mt('Section(s)').
+     &parmboxes($r,\%allparms,\@pscat,\%keyorder);
-               '</td><td></td><td>'.&mt('Group(s)').'</td></tr><tr><td>');
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
+     #$r->print('</td><td class="LC_parm_overview_restrictions">'.
+      $r->print('<table>'.
+               '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
+               '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
      &partmenu($r,\%allparts,\@psprt);
-     $r->print('</td><td>&nbsp;</td><td>');
+     $r->print('</td><td>');
      &sectionmenu($r,\@selected_sections);
-     $r->print('</td><td>&nbsp;</td><td>');
+     $r->print('</td><td>');
      &groupmenu($r,\@selected_groups);
      $r->print('</td></tr></table>');
-     $r->print('</td></tr></table>');
+     #$r->print('</td></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>');
- Line 2774  ENDOVER
+ Line 3230  ENDOVER
  	&listdata($r,$resourcedata,$listdata,$sortorder);
      }
      $r->print(&tableend().
- 	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Store').'" /></p>':'').
+ 	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
  	      '</form>'.&Apache::loncommon::end_page());
  }
- Line 2818  sub overview {
+ Line 3274  sub overview {
      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=setoverview',
+ 	text=>"Overview Mode"});
      my $start_page=&Apache::loncommon::start_page('Modify Parameters');
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
  $start_page
  $breadcrumbs
- Line 2843  ENDOVER
+ Line 3301  ENDOVER
      my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
      $r->print(&tableend().'<p>'.
- 	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form>'.
+ 	($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
  	      &Apache::loncommon::end_page());
  }
- ##################################################
+ sub clean_parameters {
- ##################################################
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- =pod
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
- =item check_cloners
+     &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);
+ $start_page
+ $breadcrumbs
+ <form method="post" action="/adm/parmset?action=cleanparameters" name="parmform">
+ ENDOVER
+ # Store modified
- Checks if new users included in list of allowed cloners
+     &storedata($r,$crs,$dom);
- are valid users.  Replaces supplied list with
- cleaned list containing only users with valid usernames
- and domains.
- Inputs: $clonelist, $oldcloner
+ # Read modified data
- 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
+     my $resourcedata=&readdata($crs,$dom);
- cloners (username:domain) who do not exist in system.
- =item change_clone
+ # List data
- Modifies the list of courses a user can clone (stored
+     $r->print('<h3>'.
- in the user's environment.db file), called when a
+ 	      &mt('These parameters refer to resources that do not exist.').
- change is made to the list of users allowed to clone
+ 	      '</h3>'.
- a course.
+ 	      '<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>');
+     foreach my $thiskey (sort(keys(%{$resourcedata}))) {
+ 	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] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
+ 			      $url,$resid,$map));
+ 	    }
+ 	    $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
+ 	    $r->print('</td></tr>');
+ 	}
+     }
+     $r->print(&Apache::loncommon::end_data_table().'<p>'.
+ 	      '<input type="submit" value="'.&mt('Delete Selected').'" />'.
+ 	      '</p></form>'.
+ 	      &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'};
+     &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(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ ENDOVER
+     $r->print('<form name="shiftform" method="post">'.
+               '<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>');
+     $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'};
+     &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(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ ENDOVER
+     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
+     $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+               &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+               &Apache::lonlocal::locallocaltime($timeshifted)));
+     my $delta=$timeshifted-$env{'form.timebase'};
+     &dateshift($delta);
+     $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+)$/);
+     $data{'scope_type'} = 'all';
+     if ($middle=~/^\[(.*)\]/) {
+        	$data{'scope'} = $1;
+ 	if ($data{'scope'}=~/^useropt\:($match_username)\:($match_domain)/) {
+ 	    $data{'scope_type'} = 'user';
+ 	    $data{'scope'} = [$1,$2];
+ 	} else {
+ 	    #FIXME check for group scope
+ 	    $data{'scope_type'} = 'section';
+ 	}
+ 	$middle=~s/^\[(.*)\]//;
+     }
+     $middle=~s/\.+$//;
+     $middle=~s/^\.+//;
+     $data{'realm_type'}='all';
+     if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+ 	$data{'realm'} = $1;
+ 	$data{'realm_type'} = 'folder';
+ 	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+ 	($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
+     } elsif ($middle) {
+ 	$data{'realm'} = $middle;
+ 	$data{'realm_type'} = 'symb';
+ 	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+ 	my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
+ 	$data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
+     }
+     $data{'parameter_part'} = $part;
+     $data{'parameter_name'} = $name;
+     return %data;
+ }
- 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;
+         @{$allowclone} = split(/,/,$clonelist);
      } else {
          $$allowclone[0] = $clonelist;
      }
  }
  sub check_cloners {
      my ($clonelist,$oldcloner) = @_;
-     my ($clean_clonelist,$disallowed);
+     my ($clean_clonelist,%disallowed);
      my @allowclone = ();
      &extract_cloners($$clonelist,\@allowclone);
      foreach my $currclone (@allowclone) {
-         if (!grep/^$currclone$/,@$oldcloner) {
+         if (!grep(/^\Q$currclone\E$/,@$oldcloner)) {
-             my ($uname,$udom) = split/:/,$currclone;
+             if ($currclone eq '*') {
-             if ($uname && $udom) {
+                 $clean_clonelist .= $currclone.',';
-                 if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+             } else {
-                     $disallowed .= $currclone.',';
+                 my ($uname,$udom) = split(/:/,$currclone);
+                 if ($uname eq '*') {
+                     if ($udom =~ /^$match_domain$/) {
+                         if (!&Apache::lonnet::domain($udom)) {
+                             $disallowed{'domain'} .= $currclone.',';
+                         } else {
+                             $clean_clonelist .= $currclone.',';
+                         }
+                     } else {
+                         $disallowed{'format'} .= $currclone.',';
+                     }
+                 } elsif ($currclone !~/^($match_username)\:($match_domain)$/) {
+                     $disallowed{'format'} .= $currclone.',';
                  } else {
-                     $clean_clonelist .= $currclone.',';
+                     if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                         $disallowed{'newuser'} .= $currclone.',';
+                     } else {
+                         $clean_clonelist .= $currclone.',';
+                     }
                  }
              }
          } else {
              $clean_clonelist .= $currclone.',';
          }
      }
-     if ($disallowed) {
+     foreach my $key (keys(%disallowed)) {
-         $disallowed =~ s/,$//;
+         $disallowed{$key} =~ s/,$//;
      }
      if ($clean_clonelist) {
          $clean_clonelist =~ s/,$//;
      }
      $$clonelist = $clean_clonelist;
-     return $disallowed;
+     return %disallowed;
  }
  sub change_clone {
      my ($clonelist,$oldcloner) = @_;
- Line 2928  sub change_clone {
+ Line 3541  sub change_clone {
      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) {
+             if (!grep(/^$currclone$/,@$oldcloner)) {
-                 ($uname,$udom) = split/:/,$currclone;
+                 if ($currclone ne '*') {
-                 if ($uname && $udom) {
+                     ($uname,$udom) = split(/:/,$currclone);
-                     unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                     if ($uname && $udom && $uname ne '*') {
-                         my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                         if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                             if ($currclonecrs{'cloneable'} eq '') {
+                             if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
-                                 $currclonecrs{'cloneable'} = $clone_crs;
+                                 if ($currclonecrs{'cloneable'} eq '') {
-                             } else {
+                                     $currclonecrs{'cloneable'} = $clone_crs;
-                                 $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                 } else {
+                                     $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                 }
+                                 &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                              }
-                             &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                          }
                      }
                  }
              }
          }
          foreach my $oldclone (@$oldcloner) {
-             if (!grep/^$oldclone$/,@allowclone) {
+             if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
-                 ($uname,$udom) = split/:/,$oldclone;
+                 if ($oldclone ne '*') {
-                 if ($uname && $udom) {
+                     ($uname,$udom) = split(/:/,$oldclone);
-                     unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                     if ($uname && $udom && $uname ne '*' ) {
-                         my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                         my %newclonecrs = ();
+                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                         if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+                             my %newclonecrs = ();
-                             if ($currclonecrs{'cloneable'} =~ /,/) {
+                             if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
-                                 my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+                                 if ($currclonecrs{'cloneable'} =~ /,/) {
-                                 foreach (@currclonecrs) {
+                                     my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
-                                     unless ($_ eq $clone_crs) {
+                                     foreach my $crs (@currclonecrs) {
-                                         $newclonecrs{'cloneable'} .= $_.',';
+                                         if ($crs ne $clone_crs) {
+                                             $newclonecrs{'cloneable'} .= $crs.',';
+                                         }
                                      }
+                                     $newclonecrs{'cloneable'} =~ s/,$//;
+                                 } else {
+                                     $newclonecrs{'cloneable'} = '';
                                  }
-                                 $newclonecrs{'cloneable'} =~ s/,$//;
+                                 &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
-                             } else {
-                                 $newclonecrs{'cloneable'} = '';
                              }
-                             &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                          }
                      }
                  }
- Line 2979  sub change_clone {
+ Line 3596  sub change_clone {
  }
- ##################################################
- ##################################################
- =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('Parameter Manager'));
      $r->print(<<ENDMAINFORMHEAD);
  <form method="post" enctype="multipart/form-data"
        action="/adm/parmset" name="studentform">
- Line 3008  ENDMAINFORMHEAD
+ Line 3616  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 @menu =
-         (
+         ( { categorytitle=>'Settings for this Course',
-           { text => 'Set Course Environment Parameters',
+ 	    items => [
- 	    action => 'crsenv',
+ 		  { linktext => 'Course Configuration',
-             permission => $parm_permission,
+ 		    url => '/adm/courseprefs?origin=params',
-             },
+ 		    permission => $parm_permission,
-           { text => 'Set Portfolio Metadata',
+ 		    linktitle =>'Edit course configuration.'  ,
- 	    action => 'setrestrictmeta',
+ 		    icon => 'preferences-desktop-remote-desktop.png'  ,
-             permission => $parm_permission,
+ 		    #help => 'Course_Environment',
-             },
+ 		    },
- 	  { text => 'Manage Course Slots',
+ 		  { linktext => 'Portfolio Metadata',
- 	    url => '/adm/slotrequest?command=showslots',
+ 		    url => '/adm/parmset?action=setrestrictmeta',
- 	    permission => $vgr,
+ 		    permission => $parm_permission,
-             },
+ 		    linktitle => 'Restrict metadata for this course.' ,
- 	  { divider => 1,
+ 		    icon =>'contact-new.png'   ,
- 	    },
+ 		    },
-           { text => 'Set/Modify Resource Parameters - Helper Mode',
+ 		  { linktext => 'Manage Course Slots',
-             url => '/adm/helper/parameter.helper',
+ 		    url => '/adm/slotrequest?command=showslots',
-             permission => $parm_permission,
+ 		    permission => $vgr,
-             },
+ 		    linktitle =>'Manage slots for this course.'  ,
-           { text => 'Modify Resource Parameters - Overview Mode',
+ 		    icon => 'format-justify-fill.png'  ,
-             action => 'setoverview',
+ 		    },
-             permission => $parm_permission,
+ 		  { linktext => 'Reset Student Access Times',
-             },
+ 		    url => '/adm/helper/resettimes.helper',
- 	  { text => 'Set Resource Parameters - Overview Mode',
+ 		    permission => $mgr,
-             action => 'newoverview',
+ 		    linktitle =>'Reset access times for folders/maps, resources or the course.'  ,
-             permission => $parm_permission,
+ 		    icon => 'start-here.png'  ,
-             },
+ 		    },
-           { text => 'Set/Modify Resource Parameters - Table Mode',
-             action => 'settable',
+ 		  { linktext => 'Set Parameter Setting Default Actions',
-             permission => $parm_permission,
+ 		    url => '/adm/parmset?action=setdefaults',
-             help => 'Cascading_Parameters',
+ 		    permission => $parm_permission,
-             },
+ 		    linktitle =>'Set default actions for parameters.'  ,
-           { text => 'Set Parameter Setting Default Actions',
+ 		    icon => 'folder-new.png'  ,
-             action => 'setdefaults',
+ 		    }]},
-             permission => $parm_permission,
+ 	  { categorytitle => 'New and Existing Parameter Settings for Resources',
-             },
+ 	    items => [
- 	  { text => 'Parameter Change Log and Course Blog Posting',
+ 		  { linktext => 'Edit Resource Parameters - Helper Mode',
-             action => 'parameterchangelog',
+ 		    url => '/adm/helper/parameter.helper',
-             permission => $parm_permission,
+ 		    permission => $parm_permission,
-             },
+ 		    linktitle =>'Set/Modify resource parameters in helper mode.'  ,
+ 		    icon => 'dialog-information.png'  ,
+ 		    #help => 'Parameter_Helper',
+ 		    },
+ 		  { linktext => 'Edit Resource Parameters - Overview Mode',
+ 		    url => '/adm/parmset?action=newoverview',
+ 		    permission => $parm_permission,
+ 		    linktitle =>'Set/Modify resource parameters in overview mode.'  ,
+ 		    icon => 'edit-find.png'  ,
+ 		    #help => 'Parameter_Overview',
+ 		    },
+ 		  { linktext => 'Edit Resource Parameters - Table Mode',
+ 		    url => '/adm/parmset?action=settable',
+ 		    permission => $parm_permission,
+ 		    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 course blog posting/user notification change log.'  ,
+ 		    icon => 'emblem-system.png'   ,
+ 		    }]}
            );
-     my $menu_html = '';
+     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-     foreach my $menu_item (@menu) {
- 	if ($menu_item->{'divider'}) {
- 	    $menu_html .= '<hr />';
- 	    next;
- 	}
-         next if (! $menu_item->{'permission'});
-         $menu_html.='<p>';
-         $menu_html.='<font size="+1">';
-         if (exists($menu_item->{'url'})) {
-             $menu_html.=qq{<a href="$menu_item->{'url'}">};
-         } else {
-             $menu_html.=
-                 qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
-         }
-         $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-         if (exists($menu_item->{'help'})) {
-             $menu_html.=
-                 &Apache::loncommon::help_open_topic($menu_item->{'help'});
-         }
-         $menu_html.='</p>'.$/;
-     }
-     $r->print($menu_html);
      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>';
+     if (!($options =~ /deleted/)) {
-     $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+         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'],
+ sub order_meta_fields {
- 		   ['onlyone','Student may select only one choice'],
+     my ($r)=@_;
- 		   ['stuadd', 'Student may type choices']);
+     my $idx = 1;
-     foreach my $opt (@options) {
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- 	my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
- 	$output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
- 	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
- 	    &mt($opt->[1]).'</label> <br />';
+     	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'));
+     if ($env{'form.storeorder'}) {
+         my $newpos = $env{'form.newpos'} - 1;
+         my $currentpos = $env{'form.currentpos'} - 1;
+         my @neworder = ();
+         my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+         my $i;
+         if ($newpos > $currentpos) {
+         # moving stuff up
+             for ($i=0;$i<$currentpos;$i++) {
+         	$neworder[$i]=$oldorder[$i];
+             }
+             for ($i=$currentpos;$i<$newpos;$i++) {
+         	$neworder[$i]=$oldorder[$i+1];
+             }
+             $neworder[$newpos]=$oldorder[$currentpos];
+             for ($i=$newpos+1;$i<=$#oldorder;$i++) {
+         	$neworder[$i]=$oldorder[$i];
+             }
+         } else {
+         # moving stuff down
+     	    for ($i=0;$i<$newpos;$i++) {
+     	        $neworder[$i]=$oldorder[$i];
+     	    }
+     	    $neworder[$newpos]=$oldorder[$currentpos];
+     	    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
+     	        $neworder[$i]=$oldorder[$i-1];
+     	    }
+     	    for ($i=$currentpos+1;$i<=$#oldorder;$i++) {
+     	        $neworder[$i]=$oldorder[$i];
+     	    }
+         }
+ 	my $ordered_fields = join ",", @neworder;
+         my $put_result = &Apache::lonnet::put('environment',
+                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ 	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
+     }
+     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
+     my $ordered_fields;
+     my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+     if (!@fields_in_order) {
+         # no order found, pick sorted order then create metadata.addedorder key.
+         foreach my $key (sort keys %$fields) {
+             push @fields_in_order, $key;
+             $ordered_fields = join ",", @fields_in_order;
+         }
+         my $put_result = &Apache::lonnet::put('environment',
+                             {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
      }
+     $r->print('<table>');
+     my $num_fields = scalar(@fields_in_order);
+     foreach my $key (@fields_in_order) {
+         $r->print('<tr><td>');
+         $r->print('<form method="post" action="">');
+         $r->print('<select name="newpos" onChange="this.form.submit()">');
+         for (my $i = 1;$i le $num_fields;$i ++) {
+             if ($i eq $idx) {
+                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
+             } else {
+                 $r->print('<option value="'.$i.'">'.$i.'</option>');
+             }
+         }
+         $r->print('</select></td><td>');
+         $r->print('<input type="hidden" name="currentpos" value="'.$idx.'" />');
+         $r->print('<input type="hidden" name="storeorder" value="true" />');
+         $r->print('</form>');
+         $r->print($$fields{$key}.'</td></tr>');
+         $idx ++;
+     }
+     $r->print('</table>');
+     return 'ok';
+ }
+ sub continue {
+     my $output;
+     $output .= '<form action="" method="post">';
+     $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
+     $output .= '<input type="submit" value="Continue" />';
      return ($output);
  }
+ sub addmetafield {
+     my ($r)=@_;
+     &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.undelete'})) {
+         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
+         foreach my $meta_field(@meta_fields) {
+             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
+             $options =~ s/deleted//;
+             $options =~ s/,,/,/;
+             my $put_result = &Apache::lonnet::put('environment',
+                                         {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
+             $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+         }
+         $r->print(&continue());
+     } elsif (exists($env{'form.fieldname'})) {
+         my $meta_field = $env{'form.fieldname'};
+         my $display_field = $env{'form.fieldname'};
+         $meta_field =~ s/\W/_/g;
+         $meta_field =~ tr/A-Z/a-z/;
+         my $put_result = &Apache::lonnet::put('environment',
+                             {'metadata.'.$meta_field.'.values'=>"",
+                              'metadata.'.$meta_field.'.added'=>"$display_field",
+                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
+         $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+         $r->print(&continue());
+     } else {
+         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
+         if ($fields) {
+             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+             $r->print('<form method="post" action="">');
+             foreach my $key(keys(%$fields)) {
+                 $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
+             }
+             $r->print('<input type="submit" name="undelete" value="Undelete" />');
+             $r->print('</form>');
+         }
+         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
+         $r->print('<input type="text" name="fieldname" /><br />');
+         $r->print('<input type="submit" value="Add Metadata Field" />');
+     }
+     $r->print('</form>');
+ }
  sub setrestrictmeta {
      my ($r)=@_;
      my $next_meta;
      my $output;
      my $item_num;
      my $put_result;
+     &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(undef,
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
- 						    'Restrict Metadata'));
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
      my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
- Line 3125  sub setrestrictmeta {
+ Line 3926  sub setrestrictmeta {
                      $save_field = $meta_field;
              	    if ($env{'form.'.$meta_field.'_stuadd'}) {
              	        $options.='stuadd,';
              	    }
-             	    if ($env{'form.'.$meta_field.'_onlyone'}) {
+             	    if ($env{'form.'.$meta_field.'_choices'}) {
+             	        $options.='choices,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
              	        $options.='onlyone,';
              	    }
              	    if ($env{'form.'.$meta_field.'_active'}) {
              	        $options.='active,';
              	    }
+             	    if ($env{'form.'.$meta_field.'_deleted'}) {
+             	        $options.='deleted,';
+             	    }
                      my $name = $save_field;
                       $put_result = &Apache::lonnet::put('environment',
                                                    {'metadata.'.$meta_field.'.options'=>$options,
- Line 3141  sub setrestrictmeta {
+ Line 3948  sub setrestrictmeta {
              }
          }
      }
-     &Apache::lonnet::coursedescription($env{'request.course.id'});
+     &Apache::lonnet::coursedescription($env{'request.course.id'},
+ 				       {'freshen_cache' => 1});
+     # Get the default metadata fields
      my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+     # Now get possible added metadata fields
+     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
+     my $row_alt = 1;
+     $output .= &Apache::loncommon::start_data_table();
      foreach my $field (sort(keys(%metadata_fields))) {
-         &Apache::lonnet::logthis ($field);
          if ($field ne 'courserestricted') {
+             $row_alt = $row_alt ? 0 : 1;
  	    $output.= &output_row($r, $field, $metadata_fields{$field});
  	}
      }
-     $r->print(<<ENDenv);
+     my $buttons = (<<ENDButtons);
+         <input type="submit" name="restrictmeta" value="Save" />
+         </form><br />
+         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+         <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+         </form>
+         <br />
+         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+         <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+ ENDButtons
+     my $added_flag = 1;
+     foreach my $field (sort(keys(%$added_metadata_fields))) {
+         $row_alt = $row_alt ? 0 : 1;
+         $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+     }
+     $output .= &Apache::loncommon::end_data_table();
+     $r->print(<<ENDenv);
          <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
-         <p>
          $output
-         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+         $buttons
          </form>
  ENDenv
      $r->print(&Apache::loncommon::end_page());
      return 'ok';
  }
- ##################################################
+ sub get_added_meta_fieldnames {
+     my ($cid) = @_;
+     my %fields;
+     foreach my $key(%env) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+             my $field_name = $1;
+             my ($display_field_name) = $env{$key};
+             $fields{$field_name} = $display_field_name;
+         }
+     }
+     return \%fields;
+ }
+ sub get_deleted_meta_fieldnames {
+     my ($cid) = @_;
+     my %fields;
+     foreach my $key(%env) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+             my $field_name = $1;
+             if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
+                 my ($display_field_name) = $env{$key};
+                 $fields{$field_name} = $display_field_name;
+             }
+         }
+     }
+     return \%fields;
+ }
  sub defaultsetter {
      my ($r) = @_;
-     my $start_page =
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
+     	text=>"Set Defaults"});
+     my $start_page =
  	&Apache::loncommon::start_page('Parameter Setting Default Actions');
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Defaults');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
      $r->print(<<ENDDEFHEAD);
  $start_page
  $breadcrumbs
- Line 3188  ENDDEFHEAD
+ Line 4048  ENDDEFHEAD
      my %keyorder=&standardkeyorder();
      my %defkeytype=();
      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
  				\%mapp, \%symbp,\%maptitles,\%uris,
  				\%keyorder,\%defkeytype);
      if ($env{'form.storerules'}) {
- Line 3251  ENDDEFHEAD
+ Line 4111  ENDDEFHEAD
  	    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.'));
-     $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
+     $r->print("\n".&Apache::loncommon::start_data_table().
- 	      &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
+ 	      &Apache::loncommon::start_data_table_header_row().
+ 	      "<th>".&mt('Rule for parameter').'</th><th>'.
+ 	      &mt('Action').'</th><th>'.&mt('Value').'</th>'.
+ 	      &Apache::loncommon::end_data_table_header_row());
      foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
  	unless ($tempkey) { next; }
- 	$r->print("\n<tr><td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
+ 	$r->print("\n".&Apache::loncommon::start_data_table_row().
+ 		  "<td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
  	my $action=&rulescache($tempkey.'_action');
  	$r->print('<select name="'.$tempkey.'_action">');
  	if (&isdateparm($defkeytype{$tempkey})) {
- Line 3298  ENDINPUTDATE
+ Line 4162  ENDINPUTDATE
  	} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
              my $yeschecked='';
              my $nochecked='';
-             if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
+             if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
-             if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='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="yes"$yeschecked /> $lt{'yes'}</label><br />
- <label><input type="radio" name="$tempkey\_value" value="no" $nochecked /> $lt{'no'}</label>
+ <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('</td></tr>');
+         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
      }
-     $r->print("</table>\n<input type='submit' name='storerules' value='".
+     $r->print(&Apache::loncommon::end_data_table().
- 	      &mt('Store Rules')."' /></form>\n".
+ 	      "\n".'<input type="submit" name="storerules" value="'.
+ 	      &mt('Save').'" /></form>'."\n".
  	      &Apache::loncommon::end_page());
      return;
  }
- sub parm_change_log {
+ sub components {
-     my ($r)=@_;
+     my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
-     &startpage($r);
-     my @ids=();
-     my %symbp=();
-     my %mapp=();
-     my %typep=();
-     my %keyp=();
-     my %uris=();
-     my %maptitles=();
- # -------------------------------------------------------- Variable declaration
+     if ($typeflag) {
+ 	$key=~s/\.type$//;
+     }
-     my %allmaps=();
+     my ($middle,$part,$name)=
-     my %alllevs=();
+ 	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+     my $issection;
-     my $uname;
+     my $section=&mt('All Students');
-     my $udom;
+     if ($middle=~/^\[(.*)\]/) {
-     my $uhome;
+ 	$issection=$1;
-     my $csec;
+ 	$section=&mt('Group/Section').': '.$issection;
-     my $cgroup;
+ 	$middle=~s/^\[(.*)\]//;
-     my $grouplist;
+     }
-     my @usersgroups = ();
+     $middle=~s/\.+$//;
+     $middle=~s/^\.+//;
-     my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
+     if ($uname) {
+ 	$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
+ 	$issection='';
+     }
+     my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+     my $realmdescription=&mt('all resources');
+     if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+ 	$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
+  	$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+    } elsif ($middle) {
+ 	my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+ 	$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
+ 	$realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
+     }
+     my $what=$part.'.'.$name;
+     return ($realm,$section,$name,$part,
+ 	    $what,$middle,$uname,$udom,$issection,$realmdescription);
+ }
+ my %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;
+         } 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';
+ }
-     $alllevs{'Resource Level'}='full';
+ sub standard_parameter_names {
-     $alllevs{'Map/Folder Level'}='map';
+     my ($name)=@_;
-     $alllevs{'Course Level'}='general';
+     if (!%standard_parms) {
+ 	&load_parameter_names();
+     }
+     if ($standard_parms{$name}) {
+ 	return $standard_parms{$name};
+     } else {
+ 	return $name;
+     }
+ }
-     my %allparms;
+ sub standard_parameter_types {
-     my %allparts;
+     my ($name)=@_;
-     my %keyorder;
+     if (!%standard_parms_types) {
- # --------------------------------------------------------- Get all assessments
+         &load_parameter_names();
-     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
+     }
- 				\%mapp, \%symbp,\%maptitles,\%uris,
+     if ($standard_parms_types{$name}) {
- 				\%keyorder);
+         return $standard_parms_types{$name};
+     }
+     return;
+ }
-     $mapp{'0.0'} = '';
+ sub parm_change_log {
-     $symbp{'0.0'} = '';
+     my ($r)=@_;
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+ 	text=>"Parameter Change Log"});
+     $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
-     my %level=&Apache::lonlocal::texthash('parmlevel_14' => 'General Course',
- 					  'parmlevel_13' => 'Map or Folder level in course',
- 					  'parmlevel_12' => 'Resource default',
- 					  'parmlevel_11' => 'Map default',
- 					  'parmlevel_10' => 'Resource level in course',
- 					  'parmlevel_9' => 'General for section',
- 					  'parmlevel_8' => 'Map or Folder level for section',
- 					  'parmlevel_7' => 'Resource level in section',
- 					  'parmlevel_6' => 'General for group',
- 					  'parmlevel_5' => 'Map or Folder level for group',
- 					  'parmlevel_4' => 'Resource level in group',
- 					  'parmlevel_3' => 'General for specific student',
- 					  'parmlevel_2' => 'Map or Folder level for specific student',
- 					  'parmlevel_1' => 'Resource level for specific student');
- #    $id.'_exe_uname' => $env{'user.name'},
- #    $id.'_exe_udom'  => $env{'user.domain'},
- #    $id.'_exe_time'  => time(),
- #    $id.'_exe_ip'    => $ENV{'REMOTE_ADDR'},
- #    $id.'_symb'      => $symb,
- #    $id.'_spnam'     => $spnam,
- #    $id.'_snum'      => $snum,
- #    $id.'_nval'      => $nval,
- #    $id.'_ntype'     => $ntype,
- #    $id.'_uname'     => $uname,
- #    $id.'_udom'      => $udom,
- #    $id.'_csec'      => $csec,
- #    $id.'_cgroup'    => $cgroup
      my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
  				      $env{'course.'.$env{'request.course.id'}.'.domain'},
  				      $env{'course.'.$env{'request.course.id'}.'.num'});
-     my %exetime=();
-     foreach my $key (keys(%parmlog)) {
+     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
- 	if ($key=~/^(.+)\_exe\_time$/) {
- 	    $exetime{$1}=$parmlog{$key};
+     $r->print('<form action="/adm/parmset?action=parameterchangelog"
- 	}
+                      method="post" name="parameterlog">');
-     }
-     $r->print('<table border="2">');
+     my %saveable_parameters = ('show' => 'scalar',);
-     foreach my $id (sort { $exetime{$a}<=>$exetime{$b} } (keys(%exetime))) {
+     &Apache::loncommon::store_course_settings('parameter_log',
-         my ($part,$name)=($parmlog{$id.'_spnam'}=~/^(.*)[\_\.]([^\_\.]+)$/);
+                                               \%saveable_parameters);
-         my $spnam=$part.'_'.$name;
+     &Apache::loncommon::restore_course_settings('parameter_log',
- 	$r->print('<tr><td>'.
+                                                 \%saveable_parameters);
- 		  &Apache::lonlocal::locallocaltime($parmlog{$id.'_exe_time'}).
+     $r->print(&Apache::loncommon::display_filter().
- 		  '</td><td>'.
+               '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
- 		  &Apache::loncommon::aboutmewrapper(
+ 	      ' '.&mt('Include parameter types').'</label>'.
- 						     &Apache::loncommon::plainname($parmlog{$id.'_exe_uname'},
+ 	      '<input type="submit" value="'.&mt('Display').'" /></form>');
- 										   $parmlog{$id.'_exe_udom'}),
- 						     $parmlog{$id.'_exe_uname'},
+     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
- 						     $parmlog{$id.'_exe_udom'}).'<br /><tt>'.
+ 						     $env{'course.'.$env{'request.course.id'}.'.domain'});
- 		  $parmlog{$id.'_exe_uname'}.':'.$parmlog{$id.'_exe_udom'}.'</tt>'.
+     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
- 		  ((($parmlog{$id.'_exe_uname'} ne $env{'user.name'}) ||
+ 	      '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
- 		    ($parmlog{$id.'_exe_udom'} ne $env{'user.domain'}))?
+ 	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
- 		   '<br />'.&Apache::loncommon::messagewrapper(&mt('Send message'),
+ 	      &Apache::loncommon::end_data_table_header_row());
- 							       $parmlog{$id.'_exe_uname'},
+     my $shown=0;
- 							       $parmlog{$id.'_exe_udom'}):'').
+     my $folder='';
- 		  '</td><td>'.
+     if ($env{'form.displayfilter'} eq 'currentfolder') {
-                   $level{'parmlevel_'.$parmlog{$id.'_snum'}}.
+ 	my $last='';
-                   '</td><td>'.
+ 	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
-                   &mt($allparms{$name}).'<br /><tt>'.$name.'</tt>'.
+ 		&GDBM_READER(),0640)) {
-                   '</td><td>'.
+ 	    $last=$hash{'last_known'};
-                   ($part?&mt('Part: [_1]',$part):&mt('All parts')).
+ 	    untie(%hash);
- 		  '</td><td>'.
+ 	}
-                   $parmlog{$id.'_symb'}.
+ 	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
- 		  '</td><td>'.
- 		  ($parmlog{$id.'_nval'}?
- 		   (&isdateparm($spnam)?&Apache::lonlocal::locallocaltime($parmlog{$id.'_nval'}):$parmlog{$id.'_nval'})
- 		   :&mt('Deleted Parameter')).
- 		  '</td></tr>');
      }
-     $r->print('</table>');
+     foreach my $id (sort
+ 		    {
+ 			if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+ 			    return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+ 			}
+ 			my $aid = (split('00000',$a))[-1];
+ 			my $bid = (split('00000',$b))[-1];
+ 			return $bid<=>$aid;
+ 		    } (keys(%parmlog))) {
+         my @changes=keys(%{$parmlog{$id}{'logentry'}});
+ 	my $count = 0;
+ 	my $time =
+ 	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
+ 	my $plainname =
+ 	    &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
+ 					  $parmlog{$id}{'exe_udom'});
+ 	my $about_me_link =
+ 	    &Apache::loncommon::aboutmewrapper($plainname,
+ 					       $parmlog{$id}{'exe_uname'},
+ 					       $parmlog{$id}{'exe_udom'});
+ 	my $send_msg_link='';
+ 	if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
+ 	     || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+ 	    $send_msg_link ='<br />'.
+ 		&Apache::loncommon::messagewrapper(&mt('Send message'),
+ 						   $parmlog{$id}{'exe_uname'},
+ 						   $parmlog{$id}{'exe_udom'});
+ 	}
+ 	my $row_start=&Apache::loncommon::start_data_table_row();
+ 	my $makenewrow=0;
+ 	my %istype=();
+ 	my $output;
+ 	foreach my $changed (reverse(sort(@changes))) {
+             my $value=$parmlog{$id}{'logentry'}{$changed};
+ 	    my $typeflag = ($changed =~/\.type$/ &&
+ 			    !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
+             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
+ 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+ 	    if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 		if ($folder) {
+ 		    if ($middle!~/^\Q$folder\E/) { next; }
+ 		}
+ 	    }
+ 	    if ($typeflag) {
+ 		$istype{$parmname}=$value;
+ 		if (!$env{'form.includetypes'}) { next; }
+ 	    }
+ 	    $count++;
+ 	    if ($makenewrow) {
+ 		$output .= $row_start;
+ 	    } else {
+ 		$makenewrow=1;
+ 	    }
+             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; }
+     }
+     $r->print(&Apache::loncommon::end_data_table());
      $r->print(&Apache::loncommon::end_page());
  }
- ##################################################
+ sub update_slots {
- ##################################################
+     my ($slot_name,$cdom,$cnum,$symb,$uname,$udom) = @_;
+     my %slot=&Apache::lonnet::get_slot($slot_name);
- =pod
+     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::instructor_log('slotreservationslog',\%storehash,
+                                         '',$uname,$udom,$cnum,$cdom);
+         &Apache::lonnet::instructor_log($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::instructor_log('slotreservationslog',\%storehash,
+,$uname,$udom,$cnum,$cdom);
+                 &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+,$uname,$udom,$uname,$udom);
+             }
+         }
+     }
+     return $delresult;
+ }
- =cut
+ sub check_for_course_info {
- ##################################################
+     my $navmap = Apache::lonnavmaps::navmap->new();
- ##################################################
+     return 1 if ($navmap);
- #    use Data::Dumper;
+     return 0;
+ }
  sub handler {
      my $r=shift;
-     if ($r->header_only) {
+     &reset_caches();
- 	&Apache::loncommon::content_type($r,'text/html');
- 	$r->send_http_header;
+     &Apache::loncommon::content_type($r,'text/html');
- 	return OK;
+     $r->send_http_header;
-     }
+     return OK if $r->header_only;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  					    ['action','state',
                                               'pres_marker',
                                               'pres_value',
                                               'pres_type',
-                                              'udom','uname','symb','serial']);
+                                              'udom','uname','symb','serial','timebase']);
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
  					    text=>"Parameter Manager",
  					    faq=>10,
- 					    bug=>'Instructor Interface'});
+ 					    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) {
+     my $exists = &check_for_course_info();
-         # Start Page
-         &Apache::loncommon::content_type($r,'text/html');
-         $r->send_http_header;
-         # id numbers can change on re-ordering of folders
-         &resetsymbcache();
+     if ($env{'request.course.id'} &&  $parm_permission && $exists) {
          #
          # Main switch on form.action and form.state, as appropriate
          #
- Line 3492  sub handler {
+ Line 4576  sub handler {
          if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
  	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
  	    &assessparms($r);
          } elsif (! exists($env{'form.action'})) {
-             $r->print(&header());
-             $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
- 							 'Parameter Manager'));
              &print_main_menu($r,$parm_permission);
-         } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'setoverview') {
-             &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 'setrestrictmeta' && $parm_permission) {
+ 	} elsif ($env{'form.action'} eq 'addmetadata') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+ 	    &addmetafield($r);
- 						    text=>"Restrict Metadata"});
+ 	} elsif ($env{'form.action'} eq 'ordermetadata') {
+ 	    &order_meta_fields($r);
+         } elsif ($env{'form.action'} eq 'setrestrictmeta') {
  	    &setrestrictmeta($r);
-         } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'newoverview') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
- 						    text=>"Overview Mode"});
  	    &newoverview($r);
-         }  elsif ($env{'form.action'} eq 'setdefaults' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'setdefaults') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
- 						    text=>"Set Defaults"});
  	    &defaultsetter($r);
- 	} elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
+ 	} elsif ($env{'form.action'} eq 'settable') {
-             &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) {
+         } elsif ($env{'form.action'} eq 'parameterchangelog') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
- 						    text=>"Parameter Change Log and Course Blog Posting"});
  	    &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);
+ 	} elsif ($env{'form.action'} eq 'categorizecourse') {
+             &assign_course_categories($r);
+         }
      } else {
  # ----------------------------- Not in a course, or not allowed to modify parms
- 	$env{'user.error.msg'}=
+ 	if ($exists) {
- 	    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+ 	    $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;
  }
 ;
  __END__
- =pod
- =back
- =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.287
changed lines
	Added in v.1.471