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.291 and 1.442

-version 1.291, 2006/04/17 21:28:50
+version 1.442, 2009/04/05 17:31:04
  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 crsenv()
+ Show and set course data and parameters.  This is a large routine that should
+ be simplified and shortened... someday.
+ Inputs: $r
+ Returns: nothing
+ =item can_modify_catsettings()
+ =item assign_course_categories()
+ =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 and &crsenv subroutines.
+ =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 357  sub parmval {
  sub parmval_by_symb {
      my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
- # load caches
-     &cacheparmhash();
-     my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+     my $useropt;
+     if ($uname ne '' && $udom ne '') {
+ 	$useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+     }
      my $result='';
      my @outpar=();
  # ----------------------------------------------------- Cascading lookup scheme
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
+     $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$what;
      my $mapparm=$map.'___(all).'.$what;
- Line 161  sub parmval_by_symb {
+ Line 403  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 412  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 428  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 445  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 464  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 parmhash {
+ 	my ($id) = @_;
- sub resetrulescache {
+ 	&cacheparmhash();
-     $rulesid='';
+ 	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 566  sub preset_defaults {
      }
  }
- ##################################################
  sub date_sanity_info {
     my $checkdate=shift;
- Line 301  sub date_sanity_info {
+ Line 576  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 622  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 674  sub storeparm_by_symb {
      return '';
  }
- {
+ sub log_parmset {
-     my $logid;
+     return &Apache::lonnet::instructor_log('parameterlog',@_);
-     sub log_parmset {
- 	my ($storehash,$delflag,$uname,$udom)=@_;
-         my $logentry=join(',',map {
- 	    &Apache::lonnet::escape($_).'=>'.&Apache::lonnet::escape($$storehash{$_});
- 	} keys %$storehash);
- 	$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.'_delflag'   => $delflag,
-                                  $id.'_logentry'  => $logentry,
- 				 $id.'_uname'     => $uname,
- 				 $id.'_udom'      => $udom,
- 			     },
- 			     $env{'course.'.$env{'request.course.id'}.'.domain'},
- 			     $env{'course.'.$env{'request.course.id'}.'.num'}
- 			     );
-     }
  }
  sub storeparm_by_symb_inner {
- Line 426  sub storeparm_by_symb_inner {
+ Line 684  sub storeparm_by_symb_inner {
  # ---------------------------------------------------------- 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 511  sub storeparm_by_symb_inner {
+ Line 771  sub storeparm_by_symb_inner {
      }
      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 604  sub plink {
+ Line 847  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 667  sub startpage {
+ Line 917  sub startpage {
      my %loaditems = ('onunload' => "pclose()",
  		     'onload'   => "group_or_section('cgroup')",);
+     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 713  sub print_row {
+ Line 971  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\_//;
- Line 799  sub print_row {
+ Line 1057  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 816  sub print_row {
+ Line 1074  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 843  sub print_usergroups {
+ Line 1109  sub print_usergroups {
      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 855  sub print_usergroups {
+ Line 1121  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 884  sub parm_control_group {
+ Line 1150  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 946  sub extractResourceInformation {
+ Line 1180  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 = $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;
- Line 1075  sub parmmenu {
+ Line 1322  sub parmmenu {
  </script>
  ENDSCRIPT
      $r->print();
-     $r->print("\n<table><tr>");
+     $r->print("\n".'<table id="LC_parm_overview_parm_menu"><tr>');
      my $cnt=0;
      foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
- 	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
+ 	$r->print("\n".'<td><label><input type="checkbox" name="pscat" ');
  	$r->print('value="'.$tempkey.'"');
  	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
- 	    $r->print(' checked');
+ 	    $r->print(' checked="checked"');
  	}
- 	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
+         $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                   : $tempkey)
+                   .'</label></td>');
   	$cnt++;
          if ($cnt==3) {
  	    $r->print("</tr>\n<tr>");
  	    $cnt=0;
  	}
      }
-     $r->print('
+     $r->print('</tr>'
- </tr><tr><td>
+              .'<tr id="LC_parm_overview_parm_menu_selectors">'
- <a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
+              .'<td valign="top">'
- <a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
+              .'<fieldset><legend><b>'.&mt('Parameter Selection').'</b></legend>'
- </td><td>
+              .'<span class="LC_nobreak">'
- <a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
+              .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
- <a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
+              .'</span>'
- <a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
+              .'<br />'
- <a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
+              .'<span class="LC_nobreak">'
- <a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
+              .'&bull; <a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>'
- </td><td>
+              .'</span>'
- <a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
+              .'<br />'
- </td>
+              .'<span class="LC_nobreak">'
- ');
+              .'&bull; <a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>'
-     $r->print('</tr></table>');
+              .'</span>'
+              .'</fieldset>'
+              .'</td>'
+              .'<td colspan="2" valign="top">'
+              .'<fieldset><legend><b>'.&mt('Add Selection for...').'</b></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 1121  sub partmenu {
+ Line 1395  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 1134  sub usermenu {
+ Line 1408  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 1166  sub usermenu {
+ Line 1431  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">
  function group_or_section(caller) {
- Line 1192  function group_or_section(caller) {
+ Line 1458  function group_or_section(caller) {
  </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 1215  function group_or_section(caller) {
+ Line 1482  function group_or_section(caller) {
          }
          $groups.='</select>';
      }
-     $r->print(<<ENDMENU);
- <b>
+     if (%sectionhash || %grouphash) {
- $sections
+         $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
- $groups
+         $g_s_footer='</div></fieldset>';
- <br />
+     }
- $lt{'fu'}
- <input type="text" value="$uname" size="12" name="uname" />
+     $r->print('<b>'
- $lt{'oi'}
+              .$g_s_header
- <input type="text" value="$id" size="12" name="id" />
+              .$sections
- $lt{'ad'}
+              .$groups
- $chooseopt
+              .$g_s_footer
- </b>
+              .'<fieldset><legend>'.&mt('User').'</legend><div>'
- ENDMENU
+              .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+                  ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+                  ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
+                  ,$chooseopt)
+              .'</div></fieldset>'
+              .'</b>'
+     );
  }
  sub displaymenu {
- Line 1235  sub displaymenu {
+ Line 1508  sub displaymenu {
      $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
  	     &mt('Select Parts to View').'</th></tr><tr><td>');
      &parmmenu($r,$allparms,$pscat,$keyorder);
-     $r->print('</td><td>');
+     $r->print('</td><td valign="top" align="center">');
      &partmenu($r,$allparts,$psprt);
      $r->print('</td></tr></table>');
  }
- Line 1247  sub mapmenu {
+ Line 1520  sub mapmenu {
      $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
      foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
  	$r->print('<option value="'.$_.'"');
- 	if (($pschp eq $_)) { $r->print(' selected'); }
+ 	if (($pschp eq $_)) { $r->print(' selected="selected"'); }
  	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
      }
      $r->print("</select>");
- Line 1261  sub levelmenu {
+ Line 1534  sub levelmenu {
      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 1271  sub levelmenu {
+ Line 1544  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 1352  sub sortmenu {
+ Line 1616  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 1386  sub standardkeyorder {
+ Line 1650  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 1438  sub assessparms {
+ Line 1673  sub assessparms {
      my $uhome;
      my $csec;
      my $cgroup;
-     my $grouplist;
      my @usersgroups = ();
      my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
- Line 1510  sub assessparms {
+ Line 1744  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 1522  sub assessparms {
+ Line 1756  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 1542  sub assessparms {
+ Line 1776  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 1575  sub assessparms {
+ Line 1805  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],
- Line 1594  sub assessparms {
+ Line 1857  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_'.$_.'" />');
      }
      if (!$pssymb) {
          $r->print('<table border="1"><tr><td>');
          &levelmenu($r,\%alllevs,$parmlev);
+         $r->print('</td>');
  	if ($parmlev ne 'general') {
              $r->print('<td>');
  	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
  	    $r->print('</td>');
  	}
-         $r->print('</td></tr></table>');
+         $r->print('</tr></table>');
  	&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 />');
      }
- Line 1641  sub assessparms {
+ Line 1907  sub assessparms {
                $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 1669  sub assessparms {
+ Line 1935  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 1721  ENDTABLEHEADFOUR
+ Line 1987  ENDTABLEHEADFOUR
  		    ||
  		    ($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 1751  ENDTABLEHEADFOUR
+ Line 2017  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 1763  ENDTABLEHEADFOUR
+ Line 2038  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 1805  ENDTABLEHEADFOUR
+ Line 2080  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;
- Line 1858  ENDTABLEHEADFOUR
+ Line 2133  ENDTABLEHEADFOUR
                        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 1872  ENDTABLEHEADFOUR
+ Line 2156  ENDTABLEHEADFOUR
  #---------------------------------------------------- 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 1945  ENDMAPONE
+ Line 2235  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 1958  ENDMAPONE
+ Line 2257  ENDMAPONE
  #---------------------------------------------------- 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 1969  ENDMAPONE
+ Line 2269  ENDMAPONE
              }
              if ($csec) {$r->print(&mt("Section")."<font color=\"red\"> <i>$csec</i></font>\n")};
-             if ($cgroup) {$r->print(&mt("Group")."<font color=\"red\"> <i>$csec</i></font>\n")};
+             if ($cgroup) {$r->print(&mt("Group")."<font color=\"red\"> <i>$cgroup</i></font>\n")};
              $r->print("</h4>\n");
  #---------------------------------------------------------------- print table
-             $r->print('<p><table border="2">');
+             $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,
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
- 						    'Edit Course Environment');
+ 	text=>"Course Environment"});
+     my $breadcrumbs =
+ 	&Apache::lonhtmlcommon::breadcrumbs('Edit Course Environment');
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my (%crsinfo,$chome);
+     my $crstype = &Apache::loncommon::course_type();
      #
      # Go through list of changes
      foreach (keys %env) {
- Line 2026  sub crsenv {
+ Line 2320  sub crsenv {
          if ($name eq 'newp') {
              $name = $env{'form.newp_name'};
          }
+         if ($name =~ /^rolenames_([^_]+)$/) {
+             $name = $1.'.plaintext';
+             my $standardtitle =
+                 &Apache::lonnet::plaintext($1,$crstype,$env{'request.course.id'},1);
+             my %adv_roles =
+                 &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
+             if ($value ne '') {
+                 foreach my $role (keys(%adv_roles)) {
+                     if ($role =~ m{^cr/$match_domain/$match_name/\Q$value\E$}) {
+                         $setoutput.= '<span class="LC_error">'.
+                                      &mt('Requested replacement title for [_1] role is already used as the name of a custom role ([_2]).',$standardtitle,$value).
+                                      '</span><br />';
+                         undef($value);
+                     }
+                 }
+             }
+         }
          if ($name eq 'url') {
              $value=~s/^\/res\///;
              my $bkuptime=time;
- Line 2036  sub crsenv {
+ Line 2347  sub crsenv {
                  ('environment',
                   {'top level map backup '.$bkuptime => $tmp[1] },
                   $dom,$crs).
-                      '<br>';
+                      '<br />';
          }
          #
          # Deal with modified default spreadsheets
- Line 2064  sub crsenv {
+ Line 2375  sub crsenv {
          if ($name =~ /^default_enrollment_(start|end)_date$/) {
              $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
          }
+ 	#
+         # Deal with the emails
+         if ($name =~ /\.email$/) {
+ 	    foreach my $specifier (split(',',$value)) {
+ 		my ($user,$sections_or_groups)=
+ 		    ($specifier=~/^([^\(]+)\(([^\)]+)\)/);
+ 		if (!$sections_or_groups) {
+ 		    $user = $specifier;
+ 		}
+ 		my ($name,$domain) = split(':',$user);
+ 		if (!defined($user) || !defined($domain)) {
+ 		    $setoutput.= '<br /> <span class="LC_error">'.
+ 			&mt("Invalid e-mail address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ 			'</span>';
+ 		    undef($value);
+ 		} elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
+ 		    $setoutput.= '<br /> <span class="LC_error">'.
+ 			&mt("Invalid e-mail address specified, user [_1] is unknown.",$name).
+ 			'</span>';
+ 		    undef($value);
+ 		}
+ 	    }
+         }
          # Get existing cloners
          my @oldcloner = ();
          if ($name eq 'cloners') {
- Line 2077  sub crsenv {
+ Line 2411  sub crsenv {
          #
          # Let the user know we made the changes
          if ($name && defined($value)) {
-             my $failed_cloners;
+             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);
+                 %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 />';
+                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>';
+                 if ($name =~ /^default_enrollment_(start|end)_date$/) {
+                     $setoutput .= &Apache::lonlocal::locallocaltime($value);
+                 } elsif ($name eq 'categories') {
+                     $setoutput .= $env{'form.categories_display'};
+                 } else {
+                     $setoutput .= $value;
+                 }
+                 $setoutput .= '</b>.<br />';
                  if ($name eq 'cloners') {
                      &change_clone($value,\@oldcloner);
                  }
-                 # Flush the course logs so course description is immediately updated
+                 # Update environment and nohist_courseids.db
+                 if (($name eq 'description') || ($name eq 'cloners') ||
+                     ($name eq 'hidefromcat') || ($name eq 'categories')) {
+                     if ($chome eq '') {
+                         %crsinfo =
+                             &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
+                                                  $crs,undef,undef,'.');
+                         $chome = &Apache::lonnet::homeserver($crs,$dom);
+                     }
+                 }
                  if ($name eq 'description' && defined($value)) {
-                     &Apache::lonnet::flushcourselogs();
+                     &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.description' => $value});
+                     if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                         $crsinfo{$env{'request.course.id'}}{'description'} = $value;
+                         my $putresult =
+                             &Apache::lonnet::courseidput($dom,\%crsinfo,
+                                                          $chome,'notime');
+                     }
+                 }
+                 if (($name eq 'cloners') || ($name eq 'hidefromcat') || ($name eq 'categories')) {
+                     if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                         &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$name => $value});
+                         $crsinfo{$env{'request.course.id'}}{$name} = $value;
+                         my $putresult =
+                             &Apache::lonnet::courseidput($dom,\%crsinfo,
+                                                          $chome,'notime');
+                     }
                  }
              } 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)) {
+             if (($name eq 'cloners') && (keys(%failed_cloners) > 0)) {
-                 $setoutput.= &mt('Unable to include').' - <b>'.$failed_cloners.'</b>, '.
+                 $setoutput.= &mt('Unable to include').': ';
-                  &mt('reason').' - '.&mt('LON-CAPA user(s) do(es) not exist').
+                 my @fails;
-                  '.<br />'.&mt('Please ').
+                 my $num = 0;
-                  ' <a href="/adm/createuser">'.
+                 if (defined($failed_cloners{'format'})) {
-                  &mt('add the user(s)').'</a>, '.
+                     $fails[$num] .= '<b>'.$failed_cloners{'format'}.
-                  &mt('and then return to the ').
+                                   '</b>, '.&mt('reason').' - '.
-                  '<a href="/admparmset?action=crsenv">'.
+                                   &mt('Invalid format');
-                  &mt('Course Parameters page').'</a> '.
+                     $num ++;
-                  &mt('to add the new user(s) to the list of possible cloners').
+                 }
-                  '.<br />';
+                 if (defined($failed_cloners{'domain'})) {
+                     $fails[$num] .= '<b>'.$failed_cloners{'domain'}.
+                                   '</b>, '.&mt('reason').' - '.
+                                   &mt('Domain does not exist');
+                     $num ++;
+                 }
+                 if (defined($failed_cloners{'newuser'})) {
+                     $fails[$num] .= '<b>'.$failed_cloners{'newuser'}.                                   '</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="/adm/parmset?action=crsenv">'.
+                         &mt('Course Parameters page').'</a> '.
+                         &mt('to add the new user(s) to the list of possible cloners');
+                 }
+                 $setoutput .= join(';&nbsp;&nbsp;',@fails).'.<br />';
              }
          }
      }
  # ------------------------- Re-init course environment entries for this session
-     &Apache::lonnet::coursedescription($env{'request.course.id'});
+     &Apache::lonnet::coursedescription($env{'request.course.id'},
+ 				       {'freshen_cache' => 1});
  # -------------------------------------------------------- Get parameters again
- Line 2124  sub crsenv {
+ Line 2509  sub crsenv {
      my $SelectStyleFile=&mt('Select Style File');
      my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
      my $output='';
+     my $output_SB = ''; # will be replaced by "$output" when all changes are done
+     my $can_categorize;
+     my %lt=&Apache::lonlocal::texthash(
+                'par'   => 'Parameter',
+                'val'   => 'Value',
+                'set'   => 'Set?',
+                'sav'   => 'Save',
+            );
      if (! exists($values{'con_lost'})) {
          my %descriptions=
- 	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
+ 	    ('url'            => '<b>'.&mt('Top Level Map').'</b><br />'.
                                   '<a href="javascript:openbrowser'.
                                   "('envform','url','sequence')\">".
-                                  &mt('Select Map').'</a><br /><font color=red> '.
+                                  &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                                  &mt('Modification may make assessment data inaccessible').
+                                  &mt('Modification may make assessment data inaccessible!').
-                                  '</font>',
+                                  '</span>',
-              'description'    => '<b>'.&mt('Course Description').'</b>',
+              'description'    => '<b>'.&mt('Course Title').'</b>',
               'courseid'       => '<b>'.&mt('Course ID or number').
                                   '</b><br />'.
-                                  '('.&mt('internal').', '.&mt('optional').')',
+                                  '('.&mt('internal, 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.'),
+              'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br />'
+                                 .'("<tt>'.&mt('user:domain,user:domain,*:domain').'</tt>")<br />'
+                                 .&mt('Users with active Course Coordinator role in this course are permitted to clone and need not be included.').'<br />'
+                                 .&mt('Use [_1] to allow course to be cloned by anyone in the specified domain.','"<tt>*:domain</tt>"').'<br />'
+                                 .&mt('Use [_1] to allow unrestricted cloning in all domains.','"<tt>*</tt>"'),
               'grading'        => '<b>'.&mt('Grading').'</b><br />'.
-                                  '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
+                                  &mt('[_1], [_2], or [_3]','"<tt>standard</tt>"','"<tt>external</tt>"','"<tt>spreadsheet</tt>"').&Apache::loncommon::help_open_topic('GradingOptions'),
-              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
+ 	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'
+                                 .&mt('Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections.').'<br />'
+                                 .'('.&mt('[_1]: they are allowed (this is the default). [_2]: no, they can only grade their own section.','"<tt>any</tt>"','"<tt>section</tt>"').')',
+              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b><br />'.
                      '<a href="javascript:openbrowser'.
                      "('envform','default_xml_style'".
-                     ",'sty')\">$SelectStyleFile</a><br>",
+                     ",'sty')\">$SelectStyleFile</a><br />",
-              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
+              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').'</b><br />'
-                                  '</b><br />(<tt>user:domain,'.
+                                 .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
-                                  'user:domain(section;section;...;*;...),...</tt>)',
+              'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').'</b>',
-              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
+              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'
-                                  '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+                                 .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
-              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
+              'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').'</b>',
-                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b><br />'
-              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
+                                  .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
-                                  '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
+              'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').'</b>',
-              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
+              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'
-                                  '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
+                                 .'('.&mt('[_1] for default hiding','"<tt>yes</tt>"').')',
-                                  &mt('changes will not show until next login').')',
+              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'
-              '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.'),
+                                  .'('.&mt('[_1] for visible separation.','"<tt>yes</tt>"').' '
+                                  .&mt('Changes will not show until next login.').')',
-              'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
+              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'
-                                   '</b><br />"<tt>st</tt>": '.
+                                         .'('.&mt('[_1]: students can view all sections. [_2]: students can only view their own section. blank or [_3] prevents student view.','"<tt>all</tt>"','"<tt>section</tt>"','"<tt>disabled</tt>"').')',
-                                   &mt('student').', "<tt>ta</tt>": '.
+              'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'
-                                   'TA, "<tt>in</tt>": '.
+                                              .'('.&mt("[_1] for link to each a listing of each student's files.",'"<tt>yes</tt>"').')',
-                                   &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
+              'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'
- 	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
+                                            .'('.&mt('[_1] to require students to opt-in to listing in the roster (on the roster page).','"<tt>yes</tt>"').')',
+              'plc.roles.denied'=> '<b>'.&mt('Disallow chat room use for Roles').'</b><br />'
+                                  .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<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 />'.
+                           '<b>'.&mt('Disallow chat room use for Users').'</b><br />'.
-                                  '(<tt>user:domain,user:domain,...</tt>)',
+                                   '("<tt>'.&mt('user:domain,user:domain,...').'</tt>")',
-              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
+              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').'</b><br />'
-                                   '</b><br />"<tt>st</tt>": '.
+                                  .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"')
-                                   'student, "<tt>ta</tt>": '.
+                                  .'("<tt>'.&mt('role,role,...').'</tt>") '
-                                   'TA, "<tt>in</tt>": '.
+                                  .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-                                   '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>)',
+                                  '("<tt>'.&mt('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> '.
+                  => '<b>'.&mt('Default Student Spreadsheet').'</b><br />'.
                      '<a href="javascript:openbrowser'.
                      "('envform','spreadsheet_default_calc'".
                      ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
- Line 2193  sub crsenv {
+ Line 2595  sub crsenv {
                      ",'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>").')',
+ 	            '('.&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>": '.
+                  => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />'
-                                   &mt('student').', "<tt>ta</tt>": '.
+                    .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<br />'
-                                   'TA, "<tt>in</tt>": '.
+                    .'('.&mt('Set value to [_1] to allow all roles.','"<tt>yes</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 />'.
+                    .'("<tt>'.&mt('role:section,role:section,...').'</tt>")<br />'
-                     '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
+                    .'('.&mt('Example: "<tt>st:001,st:002,in,cc</tt>" would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').')',
  	     'rndseed'
- 	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
+ 	         => '<b>'.&mt('Randomization algorithm used').'</b><br />'
-                     '<font color="red">'.&mt('Modifying this will make problems').' '.
+                    .'<span class="LC_error">'
-                     &mt('have different numbers and answers').'</font>',
+                    .&mt('Modifying this will make problems have different numbers and answers!')
+                    .'</span>',
  	     'receiptalg'
  	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
                      &mt('This controls how receipt numbers are generated.'),
               'suppress_tries'
                   => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
-                     ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
+                     ' ('.&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>').')',
+                     ' ('.&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'
+ 	     'print_header_format'
-                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
+ 	         => ' <b>'.&mt('Print header format').'</b><br />'
-                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
+                    .&mt('Substitutions:<br />[_1]: student name, [_2]: course id, [_3]: assignment note. Numbers after the <tt>%</tt> limit the field size.','"<tt>%n</tt>"','"<tt>%c</tt>"','"<tt>%a</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>'.
+              'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b><br />'
-                                  '<br />(<tt>user:domain,user:domain,...</tt>)',
+                                      .'("<tt>'.&mt('user:domain,user:domain,*:domain').'</tt>")',
               'languages' => '<b>'.&mt('Languages used').'</b>',
               'disable_receipt_display'
                   => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+ 	     'task_messages'
+ 	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','"<tt>only_student</tt>"','"<tt>student_and_user_notes_screen</tt>"').')',
  	     'disablesigfigs'
  	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
- Line 2238  sub crsenv {
+ Line 2643  sub crsenv {
               '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>'
+ 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting TeX').'</b>',
-              );
-         my @Display_Order = ('url','description','courseid','cloners','grading',
+ 	     'texengine'
-                              'externalsyllabus',
+ 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'
-                              'default_xml_style','pageseparators',
+                    .'('.&mt("[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student's preference",'"<tt>jsMath</tt>"','"<tt>mimetex</tt>"','"<tt>tth</tt>"').')',
-                              'question.email','comment.email','policy.email',
+              'timezone'
-                              'student_classlist_view',
+                  => '<b>'.&mt('Timezone in which the course takes place').'</b>',
-                              'plc.roles.denied','plc.users.denied',
-                              'pch.roles.denied','pch.users.denied',
+              'suppress_embed_prompt'
-                              'allow_limited_html_in_feedback',
+                  => '<b>'.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').'</b><br />'.
-                              'allow_discussion_post_editing',
+                     ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',
-                              'languages',
+              'hidefromcat'
- 			     'nothideprivileged',
+                  => '<b>'.&mt('Exclude from course catalog').'</b><br />'.
-                              'rndseed',
+                     ' ('.&mt('[_1] to exclude, anything else to include - included if assigned an institutional code, or manually catagorized','"<tt>yes</tt>"').')',
-                              'receiptalg',
+              'categories'
-                              'problem_stream_switch',
+                  => '<b>'.&mt('Categorize course').'</b> <a href="javascript:catsbrowser()">'.
- 			     'suppress_tries',
+                     &mt('Display Categories').'</a>',
-                              'default_paper_size',
+              'datelocale'
-                              'disable_receipt_display',
+                  => '<b>'.&mt('Locale used for course calendar').'</b>',
-                              'spreadsheet_default_classcalc',
+              'rolenames'
-                              'spreadsheet_default_studentcalc',
+                  => '<b>'.&mt('Replacement titles for standard course roles').'</b><br />'.
-                              'spreadsheet_default_assesscalc',
+                     '('.&mt('To replace the standard title for a course role, enter the title you wish to use, otherwise leave blank.').')',
-                              'hideemptyrows',
+              );
-                              'default_enrollment_start_date',
-                              'default_enrollment_end_date',
- 			     'tthoptions',
+ # ----------------------------------------------------------------
- 			     'disablesigfigs',
+ # Begin: New Version with Parameter Categories
- 			     'disableexampointprint'
-                              );
+     sub parameter_row {
- 	foreach my $parameter (sort(keys(%values))) {
+         # Create parameter row for course environment screen
-             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
-                 if (! $descriptions{$parameter}) {
+         my ($parameter, $description) = @_;
-                     $descriptions{$parameter}=$parameter;
-                     push(@Display_Order,$parameter);
+         # Start Parameter Row
-                 }
+         my $output = &Apache::loncommon::start_data_table_row();
-             }
- 	}
+         # Column 1/3: Descriptive text of current parameter
-         foreach my $parameter (@Display_Order) {
+         $output .= '<td>'.$description.'</td>';
-             my $description = $descriptions{$parameter};
-             # onchange is javascript to automatically check the 'Set' button.
+         # Column 2/3: Input field (Sometimes special field(s), depending on parameter)
-             my $onchange = 'onFocus="javascript:window.document.forms'.
-                 "['envform'].elements['".$parameter."_setparmval']".
+         # onchange is javascript to automatically check the 'Set' button.
-                 '.checked=true;"';
+         my $onchange = 'onFocus="javascript:window.document.forms'
-             $output .= '<tr><td>'.$description.'</td>';
+                       ."['envform'].elements['".$parameter."_setparmval']"
+                       .'.checked=true;"';
              if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
                  $output .= '<td>'.
                      &Apache::lonhtmlcommon::date_setter('envform',
- Line 2289  sub crsenv {
+ Line 2695  sub crsenv {
                                                          $values{$parameter},
                                                          $onchange).
                                                          '</td>';
-             } else {
+             } elsif ($parameter eq 'timezone') {
+                 my $includeempty = 1;
+                 my $timezone = &Apache::lonlocal::gettimezone();
+                 $output .= '<td>'.
+                     &Apache::loncommon::select_timezone($parameter.'_value',
+                                                         $timezone,
+                                                         $onchange,$includeempty).'</td>';
+             } elsif ($parameter eq 'datelocale') {
+                 my $includeempty = 1;
+                 my $locale_obj = &Apache::lonlocal::getdatelocale();
+                 my $currdatelocale;
+                 if (ref($locale_obj)) {
+                     $currdatelocale = $locale_obj->id();
+                 }
                  $output .= '<td>'.
-                     &Apache::lonhtmlcommon::textbox($parameter.'_value',
+                     &Apache::loncommon::select_datelocale($parameter.'_value',
-                                                     $values{$parameter},
+                                                           $currdatelocale,
-,$onchange).'</td>';
+                                                           $onchange,$includeempty).'</td>';
-             }
+             } elsif ($parameter eq 'rolenames') {
-             $output .= '<td>'.
+                 $output.= '<td><table>';
-                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+                 foreach my $role ('cc','in','ta','ep','ad','st') {
-                 '</td>';
+                     my $onchange = 'onFocus="javascript:window.document.forms'.
-             $output .= "</tr>\n";
+                                    "['envform'].elements['".
- 	}
+                                    $parameter.'_'.$role."_setparmval']".
-         my $onchange = 'onFocus="javascript:window.document.forms'.
+                                    '.checked=true;"';
-             '[\'envform\'].elements[\'newp_setparmval\']'.
+                     $output.= '<tr><td>'.&Apache::lonnet::plaintext($role,$crstype,undef,1).
-             '.checked=true;"';
+                               '</td><td>'.
- 	$output.='<tr><td><i>'.&mt('Create New Environment Variable').'</i><br />'.
+                               &Apache::lonhtmlcommon::textbox($parameter.'_'.$role.'_value',
- 	    '<input type="text" size=40 name="newp_name" '.
+                                                     $values{$role.'.plaintext'},
-                 $onchange.' /></td><td>'.
+,$onchange).
-             '<input type="text" size=40 name="newp_value" '.
+                               '</td></tr>';
-                 $onchange.' /></td><td>'.
+                 }
- 	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
+                 $output .= '</table></td><td><table>';
+                 foreach my $role ('cc','in','ta','ep','ad','st') {
+                     $output .= '<tr><td>'.&Apache::lonhtmlcommon::checkbox($parameter.'_'.$role.'_setparmval').
+                               '</td></tr>';
+                 }
+                 $output .= '</table></td>';
+             } elsif ($parameter eq 'categories') {
+                 my $catdisplay;
+                 if ($values{'categories'} ne '') {
+                     my @curritems = split(/\&/,$values{'categories'});
+                     foreach my $item (@curritems) {
+                         my ($name,$parent,$pos) = split(/:/,$item);
+                         $catdisplay .= &unescape($name).'&';
+                     }
+                     $catdisplay =~ s/\&$//;
+                 }
+                 $output .= '<td>'.
+                            '<input type="hidden" name="categories_value" value="'.
+                            $values{'categories'}.'" />'.
+                            '<input type="textbox" name="categories_display" value="'.
+                            $catdisplay.'" readonly="readonly" size="40" /></td>';
+             } else { # Display default textbox in all other cases
+                 $output .= '<td>'
+                           .&Apache::lonhtmlcommon::textbox($parameter.'_value',
+                                                            $values{$parameter},
+,
+                                                            $onchange)
+                           .'</td>';
+             }
+         # Column 3/3: Check Box (in most cases)
+         unless ($parameter eq 'rolenames') {
+             $output .= '<td>'
+                       .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval')
+                       .'</td>';
+         }
+         # End Parameter Row
+         $output .= &Apache::loncommon::end_data_table_row();
+         return $output;
+     } # End sub parameter_row
+     # Parameter Category Names
+     my %parm_cat_names = &Apache::lonlocal::texthash (
+         'cat_0'      => 'Parameter Category Zero',
+         'cat_1'      => 'Parameter Category One',
+         'cat_2'      => 'Parameter Category Two',
+         'cat_3'      => 'Parameter Category Three',
+         'cat_4'      => 'Parameter Category Four',
+         'cat_5'      => 'Parameter Category Five',
+         'cat_6'      => 'Parameter Category Six',
+         'cat_7'      => 'Parameter Category Seven',
+         'cat_can'    => 'Parameter Category Can',
+         'cat_custom' => 'Parameter Category Custom',
+     );
+     # Display Order of Parameter Categories
+     my @Display_Order = (
+         'cat_0',
+         'cat_1',
+         'cat_2',
+         'cat_3',
+         'cat_4',
+         'cat_5',
+         'cat_6',
+         'cat_7',
+         'cat_can',
+         'cat_custom',
+     );
+     # Link Parameter Categories with Parameters
+     # Order of parameters is display order
+     my %parm_cat_parms = (
+         'cat_0' => [
+             'url',
+             'description',
+             'courseid',
+             'cloners'
+         ],
+         'cat_1' => [
+             'grading',
+             'externalsyllabus',
+             'default_xml_style',
+             'pageseparators'
+         ],
+         'cat_2' => [
+             'question.email',
+             'question.email.text',
+             'comment.email',
+             'comment.email.text',
+             'policy.email',
+             'policy.email.text',
+         ],
+         'cat_3' => [
+             'student_classlist_view',
+             'student_classlist_opt_in',
+             'student_classlist_portfiles',
+             'plc.roles.denied',
+             'plc.users.denied',
+             'pch.roles.denied',
+             'pch.users.denied',
+             'allow_limited_html_in_feedback',
+             'allow_discussion_post_editing',
+         ],
+         'cat_4' => [
+             'languages',
+             'timezone',
+             'datelocale',
+             'rolenames',
+             'nothideprivileged',
+             'rndseed',
+             'receiptalg',
+             'problem_stream_switch',
+             'suppress_tries',
+             'suppress_embed_prompt',
+             'default_paper_size',
+             'print_header_format',
+             'disable_receipt_display',
+         ],
+         'cat_5' => [
+             'spreadsheet_default_classcalc',
+             'spreadsheet_default_studentcalc',
+             'spreadsheet_default_assesscalc',
+             'hideemptyrows',
+         ],
+         'cat_6' => [
+             'default_enrollment_start_date',
+             'default_enrollment_end_date',
+         ],
+         'cat_7' => [
+             'tthoptions',
+             'texengine',
+             'disablesigfigs',
+             'disableexampointprint',
+             'task_messages',
+             'task_grading',
+         ],
+     );
+     # Add special parameters depending on special context to parameter categories hash
+     my @can_cats;
+     (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+     if ($can_toggle_cat) {
+         push(@can_cats,'hidefromcat');
+     }
+     if ($can_categorize) {
+         push(@can_cats,'categories');
+     }
+     $parm_cat_parms{'cat_can'} = [@can_cats];
+     # Add custom parameters to custom parameter category
+     my @custom_cats;
+     foreach my $parameter (sort(keys(%values))) {
+         unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+                 ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+                 || ($parameter eq 'type') ||
+                 ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) {
+             if (! $descriptions{$parameter}) {
+                 $descriptions{$parameter}=$parameter;
+                 push(@custom_cats,$parameter);
+             }
+         }
      }
-     my %lt=&Apache::lonlocal::texthash(
+     $parm_cat_parms{'cat_custom'} = [@custom_cats];
- 		    'par'   => 'Parameter',
- 		    'val'   => 'Value',
- 		    'set'   => 'Set',
+ # Display Course Parameter Overview
- 		    'sce'   => 'Set Course Environment'
+ # Provide hyperlinks to detailed parameter settings
- 				       );
+ $output_SB .= '<a name="parmlist" />'
+              .'<div class="LC_ContentBoxSpecial">'
-     my $Parameter=&mt('Parameter');
+              .'<h2 class="LC_hcell">'.&mt('Course Parameter Overview').'</h2>'
-     my $Value=&mt('Value');
+              .'<ul>';
-     my $Set=&mt('Set');
+ foreach my $catkey (@Display_Order) {
-     my $browse_js=
+     if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories
- 	'<script type="text/javascript" language="Javascript">'.
+     $output_SB .= '<li>'
- 	&Apache::loncommon::browser_and_searcher_javascript('parmset').
+                  .'<a href="#parmlist_'.$catkey.'">'
- 	'</script>';
+                  .$parm_cat_names{$catkey}
+                  .'</a>'
+                  .'</li>';
+ }
+ $output_SB .= '</ul>'
+             .'</div>';
+ my $buttons='<div align="right">'
+            .'<input type="submit" name="crsenv" value="'.&mt('Save All').'" />'
+            .'<br /><a href="#parmlist">'.&mt('Back to Course Parameter Overview').'</a>'
+            .'</div>';
+ # Display all Parameters grouped by categories
+ $output_SB .= '<h2>'.&mt('Course Parameters').'</h2>';
+ foreach my $catkey (@Display_Order) {
+     if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories
+     $output_SB .= &Apache::loncommon::start_data_table();
+     $output_SB .= &Apache::loncommon::start_data_table_empty_row()
+                  .'<td colspan="3">'
+                  .'<a name="parmlist_'.$catkey.'" />'
+                  .'<h3>'.$parm_cat_names{$catkey}.'</h3>'
+                  .'</td>'
+                  .&Apache::loncommon::end_data_table_empty_row
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.$lt{'par'}.'</th><th>'.$lt{'val'}.'</th><th>'.$lt{'set'}.'</th>'
+                  .&Apache::loncommon::end_data_table_header_row();
+     foreach my $parameter (@{$parm_cat_parms{$catkey}}) {
+         my $description = $descriptions{$parameter};
+         $output_SB .= &parameter_row($parameter, $description);
+     }
+     # Add special row to custom category
+     # Offer possibilty to create a new environment variable
+     if ($catkey eq 'cat_custom') {
+         my $onchange = 'onFocus="javascript:window.document.forms'
+                       .'[\'envform\'].elements[\'newp_setparmval\']'
+                       .'.checked=true;"';
+         $output_SB .= &Apache::loncommon::start_data_table_row()
+                    .'<td>'
+                    .'<i>'.&mt('Create New Environment Variable').'</i><br />'
+                    .'<input type="text" size="40" name="newp_name" '.$onchange.' />'
+                    .'</td><td>'
+                    .'<input type="text" size="40" name="newp_value" '.$onchange.' />'
+                    .'</td><td>'
+                    .'<input type="checkbox" name="newp_setparmval" /></td>'
+                    .&Apache::loncommon::end_data_table_row();
+     }
+     # Add buttons row at end of each category
+     $output_SB .= &Apache::loncommon::start_data_table_empty_row()
+                  .'<td colspan="3">'
+                  .$buttons
+                  .'</td>'
+                  .&Apache::loncommon::end_data_table_empty_row;
+     $output_SB .= &Apache::loncommon::end_data_table()
+                 . '<br />';
+ }
+ # End: New Version with Parameter Categories
+ # ----------------------------------------------------------------
+     }
+     my ($jscript,$categorize_js);
+     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
+     if ($can_categorize) {
+         $categorize_js = <<ENDSCRIPT;
+ function catsbrowser() {
+     var catswin = null;
+     var url = '/adm/parmset?action=categorizecourse';
+     if (!catswin || catswin.closed) {
+         catswin=window.open(url,'categorieswin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+     } else {
+         catswin.focus();
+     }
+ }
+ ENDSCRIPT
+     }
+     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
+                $browse_js."\n".$categorize_js."\n".'</script>';
      my $start_page =
- 	&Apache::loncommon::start_page('Set Course Environment Parameters',
+ 	&Apache::loncommon::start_page('Set Course Environment',
- 				       $browse_js);
+ 				       $jscript);
      my $end_page =
  	&Apache::loncommon::end_page();
      $r->print(<<ENDENV);
- Line 2335  $start_page
+ Line 2998  $start_page
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=crsenv" name="envform">
  $setoutput
- <p>
+ $output_SB
- <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
  }
+ sub can_modify_catsettings {
+     my ($dom) = @_;
+     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+     my ($can_toggle_cat,$can_categorize);
+     if (ref($domconf{'coursecategories'}) eq 'HASH') {
+         if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+             $can_toggle_cat = 1;
+         }
+         if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+             $can_categorize = 1;
+         }
+     }
+     return ($can_toggle_cat,$can_categorize);
+ }
+ sub assign_course_categories {
+     my ($r) = @_;
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $hascats = 0;
+     my $cathash;
+     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+     if (ref($domconf{'coursecategories'}) eq 'HASH') {
+         $cathash = $domconf{'coursecategories'}{'cats'};
+         if (ref($cathash) eq 'HASH') {
+             $hascats = 1;
+         }
+     }
+     my $catwin_js;
+     if ($hascats) {
+         my $alert = &mt('Use \"Save\" in the main window to save course categories');
+         $catwin_js = <<ENDSCRIPT;
+ <script type="text/javascript">
+ function updateCategories() {
+     var newcategories = '';
+     var unescapedcats = '';
+     if (document.chgcats.usecategory.length) {
+         for (var i=0; i<document.chgcats.usecategory.length; i++) {
+             if (document.chgcats.usecategory[i].checked == true) {
+                 newcategories = newcategories + document.chgcats.usecategory[i].value + '&';
+                 unescapedcats = unescapedcats + document.chgcats.catname[i].value + ' & ';
+             }
+         }
+         if (newcategories.length > 0) {
+             newcategories = newcategories.slice(0,-1);
+         }
+         if (unescapedcats.length > 0) {
+             unescapedcats = unescapedcats.slice(0,-3);
+         }
+     } else {
+          if (document.chgcats.usecategory.checked == true) {
+              newcategories = document.chgcats.usecategory.value;
+              unescapedcats = document.chgcats.catname.value;
+          }
+     }
+     opener.document.envform.categories_value.value = newcategories;
+     opener.document.envform.categories_display.value = unescapedcats;
+     opener.document.envform.categories_setparmval.checked = true;
+     alert("$alert");
+     self.close();
+     return;
+ }
+ </script>
+ ENDSCRIPT
+     } else {
+         my $onload;
+     }
+     my $start_page =
+         &Apache::loncommon::start_page('Course Categories',$catwin_js,
+                                        {'only_body'      => 1,});
+     my $end_page = &Apache::loncommon::end_page();
+     my $categoriesform = '<h3>'.&mt('Categorize Course').'</h3>';
+     if ($hascats) {
+         my %currsettings =
+             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
+         $categoriesform .= &mt('Assign one or more categories to this course.').'<br /><br />'.
+                                '<form name="chgcats" action="/adm/parmset" method="post">'."\n"
+                                .&Apache::loncommon::assign_categories_table($cathash,
+                                                        $currsettings{'categories'})."\n"
+                                .'<br /><input type="button" name="changes" value="'
+                                .&mt('Copy to main window').'" '
+                                .'onclick="javascript:updateCategories()" /></form><br />';
+     } else {
+         $categoriesform .= &mt('No categories defined for this domain');
+     }
+     $r->print($start_page.$categoriesform.$end_page);
+     return;
+ }
  ##################################################
  # Overview mode
  ##################################################
- Line 2355  sub tablestart {
+ Line 3105  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 2363  sub tablestart {
+ Line 3113  sub tablestart {
  sub tableend {
      if ($tableopen) {
  	$tableopen=0;
- 	return '</table>';
+ 	return &Apache::loncommon::end_data_table();
      } else {
  	return'';
      }
- Line 2377  sub readdata {
+ Line 3127  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 2414  sub storedata {
+ Line 3163  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') {
  			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
- 			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+ 			    $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 {
- Line 2441  sub storedata {
+ Line 3202  sub storedata {
  			    &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') {
- 			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
- 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
- 			} else {
- 			    $r->print('<h2><font color="red">'.
- 				      &mt('Error storing parameters').'</font></h2>');
- 			}
- 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
- 		    } else {
- 			$newdata{$thiskey}=$data;
- 			$newdata{$thiskey.'.type'}=$typeof;
- 		    }
  		}
  	    }
  	}
- Line 2481  sub storedata {
+ Line 3222  sub storedata {
  	    &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') {
  			    &log_parmset(\%newdata,0);
- 	    $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');
+ 	    $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 2500  sub storedata {
+ Line 3241  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 2514  sub listdata {
+ Line 3275  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 2558  sub listdata {
+ Line 3327  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 2567  sub listdata {
+ Line 3336  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 2599  sub listdata {
+ Line 3368  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.
+ 	    $r->print(&tablestart().
- 		      ':</b></td><td><input type="checkbox" name="del_'.
+ 		      &Apache::loncommon::start_data_table_row().
+ 		      '<td><b>'.&standard_parameter_names($name).
+ 		      '</b></td><td><input type="checkbox" name="del_'.
  		      $thiskey.'" /></td><td>');
  	    $foundkeys++;
  	    if (&isdateparm($thistype)) {
- Line 2625  sub listdata {
+ Line 3387  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 2707  ENDOVER
+ Line 3564  ENDOVER
      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 2728  ENDOVER
+ Line 3585  ENDOVER
  				\%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">');
      &levelmenu($r,\%alllevs,$parmlev);
      if ($parmlev ne 'general') {
- 	$r->print('<td>');
+ 	$r->print('<td class="LC_parm_overview_map_menu">');
  	&mapmenu($r,\%allmaps,$pschp,\%maptitles);
  	$r->print('</td>');
      }
      $r->print('</td></tr></table>');
-     $r->print('<table border="1"><tr><td>');
+     $r->print('<table id="LC_parm_overview_controls">
+                <tr><td class="LC_parm_overview_parm_selectors">');
      &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-     $r->print('</td><td><table border="0" cellspacing="0" cellpadding="0">'.
+     $r->print('</td><td class="LC_parm_overview_restrictions">
-               '<tr><td>'.&mt('Parts').'</td><td></td><td>'.&mt('Section(s)').
+                 <table class="LC_parm_overview_restrictions">'.
-               '</td><td></td><td>'.&mt('Group(s)').'</td></tr><tr><td>');
+               '<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>');
- Line 2781  ENDOVER
+ Line 3644  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 2825  sub overview {
+ Line 3688  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 2850  ENDOVER
+ Line 3715  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);
+ 	    }
+ 	    $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
+ 			  &standard_parameter_names($data{'parameter_name'}),
+ 			  $resourcedata->{$thiskey}));
+ 	    $r->print('<br />');
+ 	    if ($data{'scope_type'} eq 'all') {
+ 		$r->print(&mt('All users'));
+ 	    } elsif ($data{'scope_type'} eq 'user') {
+ 		$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
+ 	    } elsif ($data{'scope_type'} eq 'section') {
+ 		$r->print(&mt('Section: [_1]',$data{'scope'}));
+ 	    } elsif ($data{'scope_type'} eq 'group') {
+ 		$r->print(&mt('Group: [_1]',$data{'scope'}));
+ 	    }
+ 	    $r->print('<br />');
+ 	    if ($data{'realm_type'} eq 'all') {
+ 		$r->print(&mt('All Resources'));
+ 	    } elsif ($data{'realm_type'} eq 'folder') {
+ 		$r->print(&mt('Folder: [_1]'),$data{'realm'});
+ 	    } elsif ($data{'realm_type'} eq 'symb') {
+ 		my ($map,$resid,$url) =
+ 		    &Apache::lonnet::decode_symb($data{'realm'});
+ 		$r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
+ 			      $url,$resid,$map));
+ 	    }
+ 	    $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
+ 	    $r->print('</td></tr>');
+ 	}
+     }
+     $r->print(&Apache::loncommon::end_data_table().'<p>'.
+ 	      '<input type="submit" value="'.&mt('Delete 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 2940  sub change_clone {
+ Line 3959  sub change_clone {
          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 2986  sub change_clone {
+ Line 4009  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 3015  ENDMAINFORMHEAD
+ Line 4029  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 Environment',
-             permission => $parm_permission,
+ 		    url => '/adm/parmset?action=crsenv',
-             },
+ 		    permission => $parm_permission,
-           { text => 'Set Portfolio Metadata',
+ 		    linktitle =>'Edit environment settings for this course.'  ,
- 	    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><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
+         foreach my $opt (@options) {
+ 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ 	    $output .= &Apache::loncommon::continue_data_table_row();
+ 	    $output .= '<td>'.('&nbsp;' x 5).'<span class="LC_metadata"><label>
+ 	               <input type="checkbox" name="'.
+ 	               $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+ 	               &mt($opt->[1]).'</label></span> </td>';
+ 	    $output .= &Apache::loncommon::end_data_table_row();
+ 	}
+         $output .= &Apache::loncommon::continue_data_table_row();
+         $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
+         my $multiple_checked;
+         my $single_checked;
+         if ($options =~ m/onlyone/) {
+             $multiple_checked = '';
+             $single_checked = ' checked="checked"';
+         } else {
+             $multiple_checked = ' checked="checked"';
+             $single_checked = '';
+         }
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+ 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
+ 	            '.&mt('Student may select multiple choices from list').'</span></td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+ 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
+ 	            '.&mt('Student may select only one choice from list').'</span></td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
+     }
+     return ($output);
+ }
-     my @options= ( ['active', 'Show to student'],
- 		   ['onlyone','Student may select only one choice'],
- 		   ['stuadd', 'Student may type choices']);
+ sub order_meta_fields {
-     foreach my $opt (@options) {
+     my ($r)=@_;
- 	my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+     my $idx = 1;
- 	$output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- 	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
- 	    &mt($opt->[1]).'</label> <br />';
+     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+     	text=>"Add Metadata Field"});
+     &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>"/adm/parmset?action=setrestrictmeta",
+               text=>"Restrict Metadata"},
+              {text=>"Order Metadata"});
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+     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 3133  sub setrestrictmeta {
+ Line 4340  sub setrestrictmeta {
              	    if ($env{'form.'.$meta_field.'_stuadd'}) {
              	        $options.='stuadd,';
              	    }
-             	    if ($env{'form.'.$meta_field.'_onlyone'}) {
+             	    if ($env{'form.'.$meta_field.'_choices'}) {
+             	        $options.='choices,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
              	        $options.='onlyone,';
              	    }
              	    if ($env{'form.'.$meta_field.'_active'}) {
              	        $options.='active,';
              	    }
+             	    if ($env{'form.'.$meta_field.'_deleted'}) {
+             	        $options.='deleted,';
+             	    }
                      my $name = $save_field;
                       $put_result = &Apache::lonnet::put('environment',
                                                    {'metadata.'.$meta_field.'.options'=>$options,
- Line 3148  sub setrestrictmeta {
+ Line 4361  sub setrestrictmeta {
              }
          }
      }
-     &Apache::lonnet::coursedescription($env{'request.course.id'});
+     &Apache::lonnet::coursedescription($env{'request.course.id'},
+ 				       {'freshen_cache' => 1});
+     # Get the default metadata fields
      my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+     # Now get possible added metadata fields
+     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
+     my $row_alt = 1;
+     $output .= &Apache::loncommon::start_data_table();
      foreach my $field (sort(keys(%metadata_fields))) {
-         &Apache::lonnet::logthis ($field);
          if ($field ne 'courserestricted') {
+             $row_alt = $row_alt ? 0 : 1;
  	    $output.= &output_row($r, $field, $metadata_fields{$field});
  	}
      }
+     my $buttons = (<<ENDButtons);
+         <input type="submit" name="restrictmeta" value="Save" />
+         </form><br />
+         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+         <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+         </form>
+         <br />
+         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+         <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+ ENDButtons
+     my $added_flag = 1;
+     foreach my $field (sort(keys(%$added_metadata_fields))) {
+         $row_alt = $row_alt ? 0 : 1;
+         $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+     }
+     $output .= &Apache::loncommon::end_data_table();
      $r->print(<<ENDenv);
          <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
-         <p>
          $output
-         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+         $buttons
          </form>
  ENDenv
      $r->print(&Apache::loncommon::end_page());
      return 'ok';
  }
- ##################################################
+ sub get_added_meta_fieldnames {
+     my ($cid) = @_;
+     my %fields;
+     foreach my $key(%env) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+             my $field_name = $1;
+             my ($display_field_name) = $env{$key};
+             $fields{$field_name} = $display_field_name;
+         }
+     }
+     return \%fields;
+ }
+ sub get_deleted_meta_fieldnames {
+     my ($cid) = @_;
+     my %fields;
+     foreach my $key(%env) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+             my $field_name = $1;
+             if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
+                 my ($display_field_name) = $env{$key};
+                 $fields{$field_name} = $display_field_name;
+             }
+         }
+     }
+     return \%fields;
+ }
  sub defaultsetter {
      my ($r) = @_;
+     &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 3262  ENDDEFHEAD
+ Line 4528  ENDDEFHEAD
      }
  $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
  	  &mt('Automatic setting rules apply to table mode interfaces only.'));
-     $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
+     $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 3315  ENDYESNO
+ Line 4585  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 components {
-     my ($key,$uname,$udom,$exeuser,$exedomain)=@_;
+     my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
-     my $typeflag=0;
-     if ($key=~/\.type$/) {
+     if ($typeflag) {
  	$key=~s/\.type$//;
-         $typeflag=1;
      }
+     my ($middle,$part,$name)=
+ 	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
      my $issection;
-     my ($middle,$part,$name)=($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
      my $section=&mt('All Students');
      if ($middle=~/^\[(.*)\]/) {
  	$issection=$1;
- Line 3344  sub components {
+ Line 4617  sub components {
  	$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
  	$issection='';
      }
-     my $realm='<font color="red">'.&mt('All Resources').'</font>';
+     my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+     my $realmdescription=&mt('all resources');
      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).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
-     } elsif ($middle) {
+  	$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+    } 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>';
+ 	$realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
      }
      my $what=$part.'.'.$name;
-     return ($realm,$section,$name,$part,$typeflag,
+     return ($realm,$section,$name,$part,
- 	    $what,$middle,$uname,$udom,$issection);
+ 	    $what,$middle,$uname,$udom,$issection,$realmdescription);
  }
+ my %standard_parms;
+ sub load_parameter_names {
+     open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+     while (my $configline=<$config>) {
+ 	if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
+ 	chomp($configline);
+ 	my ($short,$plain)=split(/:/,$configline);
+ 	my (undef,$name,$type)=split(/\&/,$short,3);
+ 	if ($type eq 'display') {
+ 	    $standard_parms{$name} = $plain;
+ 	}
+     }
+     close($config);
+     $standard_parms{'int_pos'}      = 'Positive Integer';
+     $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+     %standard_parms=&Apache::lonlocal::texthash(%standard_parms);
+ }
+ sub standard_parameter_names {
+     my ($name)=@_;
+     if (!%standard_parms) {
+ 	&load_parameter_names();
+     }
+     if ($standard_parms{$name}) {
+ 	return $standard_parms{$name};
+     } else {
+ 	return $name;
+     }
+ }
  sub parm_change_log {
      my ($r)=@_;
-     &startpage($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 %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">');
-     }
+     my %saveable_parameters = ('show' => 'scalar',);
+     &Apache::loncommon::store_course_settings('parameter_log',
+                                               \%saveable_parameters);
+     &Apache::loncommon::restore_course_settings('parameter_log',
+                                                 \%saveable_parameters);
+     $r->print(&Apache::loncommon::display_filter().
+               '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
+ 	      ' '.&mt('Include parameter types').'</label>'.
+ 	      '<input type="submit" value="'.&mt('Display').'" /></form>');
      my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
  						     $env{'course.'.$env{'request.course.id'}.'.domain'});
-     $r->print('<table border="2">');
+     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
-     foreach my $id (sort { $exetime{$b}<=>$exetime{$a} } (keys(%exetime))) {
+ 	      '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
-         my @changes=split(/\,/,$parmlog{$id.'_logentry'});
+ 	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
- 	my $count=$#changes+1;
+ 	      &Apache::loncommon::end_data_table_header_row());
+     my $shown=0;
+     my $folder='';
+     if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 	my $last='';
+ 	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+ 		&GDBM_READER(),0640)) {
+ 	    $last=$hash{'last_known'};
+ 	    untie(%hash);
+ 	}
+ 	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
+     }
+     foreach my $id (sort
+ 		    {
+ 			if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+ 			    return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+ 			}
+ 			my $aid = (split('00000',$a))[-1];
+ 			my $bid = (split('00000',$b))[-1];
+ 			return $bid<=>$aid;
+ 		    } (keys(%parmlog))) {
+         my @changes=keys(%{$parmlog{$id}{'logentry'}});
+ 	my $count = 0;
  	my $time =
- 	    &Apache::lonlocal::locallocaltime($parmlog{$id.'_exe_time'});
+ 	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
  	my $plainname =
- 	    &Apache::loncommon::plainname($parmlog{$id.'_exe_uname'},
+ 	    &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
- 					  $parmlog{$id.'_exe_udom'});
+ 					  $parmlog{$id}{'exe_udom'});
  	my $about_me_link =
  	    &Apache::loncommon::aboutmewrapper($plainname,
- 					       $parmlog{$id.'_exe_uname'},
+ 					       $parmlog{$id}{'exe_uname'},
- 					       $parmlog{$id.'_exe_udom'});
+ 					       $parmlog{$id}{'exe_udom'});
+ 	my $send_msg_link='';
- 	my $send_msg_link;
+ 	if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
- 	if ((($parmlog{$id.'_exe_uname'} ne $env{'user.name'})
+ 	     || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
- 	     || ($parmlog{$id.'_exe_udom'} ne $env{'user.domain'}))) {
+ 	    $send_msg_link ='<br />'.
- 	    my $send_msg_link ='<br />'.
  		&Apache::loncommon::messagewrapper(&mt('Send message'),
- 						   $parmlog{$id.'_exe_uname'},
+ 						   $parmlog{$id}{'exe_uname'},
- 						   $parmlog{$id.'_exe_udom'});
+ 						   $parmlog{$id}{'exe_udom'});
  	}
- 	$r->print('<tr><td rowspan="'.$count.'">'.$time.'</td>
+ 	my $row_start=&Apache::loncommon::start_data_table_row();
-                        <td rowspan="'.$count.'">'.$about_me_link.
- 		  '<br /><tt>'.$parmlog{$id.'_exe_uname'}.
- 			          ':'.$parmlog{$id.'_exe_udom'}.'</tt>'.
- 		  $send_msg_link.'</td>');
  	my $makenewrow=0;
  	my %istype=();
- 	foreach my $changed (sort @changes) {
+ 	my $output;
-             my ($key,$value)=split(/\=\>/,&Apache::lonnet::unescape($changed));
+ 	foreach my $changed (reverse(sort(@changes))) {
-             my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)=
+             my $value=$parmlog{$id}{'logentry'}{$changed};
- 		&components($key,$parmlog{$id.'_uname'},$parmlog{$id.'_udom'});
+ 	    my $typeflag = ($changed =~/\.type$/ &&
- 	    if ($typeflag) { $istype{$parmname}=$value; }
+ 			    !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
- 	    if ($makenewrow) { $r->print('<tr>'); } else { $makenewrow=1; }
+             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
- 	    $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+ 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
- 		      &mt('Part: [_1]',$part).'</td><td>');
+ 	    if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 		if ($folder) {
+ 		    if ($middle!~/^\Q$folder\E/) { next; }
+ 		}
+ 	    }
+ 	    if ($typeflag) {
+ 		$istype{$parmname}=$value;
+ 		if (!$env{'form.includetypes'}) { next; }
+ 	    }
+ 	    $count++;
+ 	    if ($makenewrow) {
+ 		$output .= $row_start;
+ 	    } else {
+ 		$makenewrow=1;
+ 	    }
+ 	    $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+ 		      &standard_parameter_names($parmname).'</td><td>'.
+ 		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
  	    my $stillactive=0;
- 	    if ($parmlog{$id.'_deleteflag'}) {
+ 	    if ($parmlog{$id}{'delflag'}) {
- 		$r->print(&mt('Deleted'));
+ 		$output .= &mt('Deleted');
  	    } else {
  		if ($typeflag) {
- 		    $r->print(&mt('Type: [_1]',$value));
+ 		    $output .= &mt('Type: [_1]',&standard_parameter_names($value));
  		} else {
  		    my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
  						      $uname,$udom,$issection,$issection,$courseopt);
  		    if (&isdateparm($istype{$parmname})) {
- 			$r->print(&Apache::lonlocal::locallocaltime($value));
+ 			$output .= &Apache::lonlocal::locallocaltime($value);
  		    } else {
- 			$r->print($value);
+ 			$output .= $value;
  		    }
  		    if ($value ne $all[$level]) {
- 			$r->print('<br /><font color="red">'.&mt('Not active anymore').'</font>');
+ 			$output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
  		    } else {
  			$stillactive=1;
  		    }
  		}
  	    }
- 	    $r->print('</td>');
+ 	    $output .= '</td><td>';
  	    if ($stillactive) {
- 		$r->print('<td>Notify Link</td>');
+ 		my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
- 	    } else {
+                 my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
- 		$r->print('<td>&nbsp;</td>');
+ 				    (&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);
+ 		}
  	    }
- 	    $r->print('</tr>');
+ 	    $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+ 	}
+         if ($env{'form.displayfilter'} eq 'containing') {
+ 	    my $wholeentry=$about_me_link.':'.
+ 		$parmlog{$id}{'exe_uname'}.':'.$parmlog{$id}{'exe_udom'}.':'.
+ 		$output;
+ 	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
+ 	}
+         if ($count) {
+ 	    $r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>
+                        <td rowspan="'.$count.'">'.$about_me_link.
+ 		  '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
+ 			          ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
+ 		  $send_msg_link.'</td>'.$output);
+ 	    $shown++;
  	}
+ 	if (!($env{'form.show'} eq &mt('all')
+ 	      || $shown<=$env{'form.show'})) { last; }
      }
-     $r->print('</table>');
+     $r->print(&Apache::loncommon::end_data_table());
      $r->print(&Apache::loncommon::end_page());
  }
- ##################################################
+ sub 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 3502  sub handler {
+ Line 4961  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 'crsenv') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
- 						    text=>"Course Environment"});
              &crsenv($r);
-         } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'setoverview') {
-             &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.291
changed lines
	Added in v.1.442