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.298 and 1.413

-version 1.298, 2006/05/01 19:37:33
+version 1.413, 2008/10/23 14:26:17
  Line 63  use Apache::lonhomework;
  use Apache::lonxml;
  use Apache::lonlocal;
  use Apache::lonnavmaps;
+ use Apache::longroup;
+ use Apache::lonrss;
+ use LONCAPA qw(:DEFAULT :match);
- # --- Caches local to lonparmset
- my $parmhashid;
- my %parmhash;
- my $symbsid;
- my %symbs;
- my $rulesid;
- my %rules;
- # --- end local caches
  ##################################################
  ##################################################
- Line 90  Inputs:  $what - a parameter spec (inclu
+ Line 83  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 116  sub parmval {
+ Line 109  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 160  sub parmval_by_symb {
+ Line 155  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 169  sub parmval_by_symb {
+ Line 164  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 185  sub parmval_by_symb {
+ Line 180  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 202  sub parmval_by_symb {
+ Line 197  sub parmval_by_symb {
  # ---------------------------------------------------------- fifth, check user
-     if (defined($uname)) {
+     if ($uname ne '') {
  	if (defined($$useropt{$courselevel})) {
  	    $outpar[3]=$$useropt{$courselevel};
  	    $result=3;
- Line 221  sub parmval_by_symb {
+ Line 216  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 {
- Line 300  sub date_sanity_info {
+ Line 325  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 340  sub storeparm {
+ Line 382  sub storeparm {
  # - new type
  # - username
  # - userdomain
  my %recstack;
  sub storeparm_by_symb {
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
- Line 403  sub storeparm_by_symb_inner {
+ Line 444  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 488  sub storeparm_by_symb_inner {
+ Line 531  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 '';
  }
- Line 502  sub storeparm_by_symb_inner {
+ Line 545  sub storeparm_by_symb_inner {
  Format a value for output.
- Inputs:  $value, $type
+ Inputs:  $value, $type, $editable
  Returns: $value, formatted for output.  If $type indicates it is a date,
  localtime($value) is returned.
+ $editable will return an icon to click on
  =cut
  ##################################################
  ##################################################
  sub valout {
-     my ($value,$type)=@_;
+     my ($value,$type,$editable)=@_;
      my $result = '';
      # Values of zero are valid.
      if (! $value && $value ne '0') {
- 	$result = '&nbsp;&nbsp;';
+ 	if ($editable) {
+ 	    $result = '<span class="LC_clickhere">*</span>';
+ 	} else {
+ 	    $result='&nbsp;';
+ 	}
      } else {
          if ($type eq 'date_interval') {
              my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+             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;
- Line 581  sub plink {
+ Line 642  sub plink {
      my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
      my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
      unless (defined($winvalue)) { $winvalue=$val; }
+     my $valout = &valout($value,$type,1);
+     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="'.$marker.'" /></td></tr><tr><td align="center">'.
  	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
  	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
- 		&valout($value,$type).'</a></td></tr></table>';
+ 	    $valout.'</a></td></tr></table>';
  }
  sub page_js {
- Line 649  sub startpage {
+ Line 716  sub startpage {
  				       &page_js(),
  				       {'add_entries' => \%loaditems,});
      my $breadcrumbs =
- 	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting');
+ 	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
      $r->print(<<ENDHEAD);
  $start_page
  $breadcrumbs
- Line 696  sub print_row {
+ Line 763  sub print_row {
      }
      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
      if ($automatic) {
- 	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+ 	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
      }
      $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
- Line 922  sub extractResourceInformation {
+ Line 989  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 $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+ 	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
+ 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
  		my $parmdis = $display;
- 		$parmdis =~ s/\[Part.*$//g;
+ 		$parmdis =~ s/\s*\[Part.*$//g;
-                 $$allparms{$name}=$parmdis;
+ 		$$allparms{$name}=$parmdis;
- 		$$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		if (ref($defkeytype)) {
+ 		    $$defkeytype{$name}=
+ 			&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		}
+ 	    }
  #
  # allparts is a hash of all parts
  #
- 		$$allparts{$part} = "Part: $part";
+ 	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+ 	    $$allparts{$part} = &mt('Part: [_1]',$part);
  #
  # Remember all keys going with this resource
  #
- 		if ($$keyp{$id}) {
+ 	    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)';
      }
  }
- Line 1051  sub parmmenu {
+ Line 1127  sub parmmenu {
  </script>
  ENDSCRIPT
      $r->print();
-     $r->print("\n<table><tr>");
+     $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
      my $cnt=0;
      foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
- 	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
+ 	$r->print("\n<td><label><input type='checkbox' name='pscat' ");
  	$r->print('value="'.$tempkey.'"');
  	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
  	    $r->print(' checked');
  	}
- 	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
+ 	$r->print('>'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
+ 		                                  : &mt($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('<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 1097  sub partmenu {
+ Line 1200  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 1110  sub usermenu {
+ Line 1213  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 1142  sub usermenu {
+ Line 1236  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 1168  function group_or_section(caller) {
+ Line 1263  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 1191  function group_or_section(caller) {
+ Line 1287  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 1211  sub displaymenu {
+ Line 1313  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 1223  sub mapmenu {
+ Line 1325  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 1237  sub levelmenu {
+ Line 1339  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 1247  sub levelmenu {
+ Line 1349  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="true" 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="true" 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 1485  sub assessparms {
+ Line 1578  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 1497  sub assessparms {
+ Line 1590  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 1517  sub assessparms {
+ Line 1610  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>';
  	    }
              @usersgroups = &Apache::lonnet::get_users_groups(
                                         $udom,$uname,$env{'request.course.id'});
              if (@usersgroups > 0) {
-                 unless (grep/^\Q$cgroup\E$/,@usersgroups) {
+                 unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
                      $cgroup = $usersgroups[0];
                  }
              }
- Line 1565  sub assessparms {
+ Line 1658  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) {
- Line 1580  sub assessparms {
+ Line 1674  sub assessparms {
  	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
      } else {
          my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
-         $r->print(&mt('Specific Resource').": ".$resource.
+ 	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 1736  sub assessparms {
  					      );
             $r->print(<<ENDTABLETWO);
  <th rowspan=3>$lt{'pie'}</th>
- <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
+ <th rowspan=3>$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
  </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
  <th colspan=1>$lt{'ic'}</th>
- Line 1741  ENDTABLEHEADFOUR
+ Line 1836  ENDTABLEHEADFOUR
                               '</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.')');
- Line 1843  ENDTABLEHEADFOUR
+ Line 1938  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('<tr><th>'.&mt('Parameter Name').'</th>');
- Line 1878  ENDMAPONE
+ Line 1974  ENDMAPONE
                             \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                             $parmlev,$uname,$udom,$csec,$cgroup);
                  }
-                 $r->print("</table></center>");
+                 $r->print("</table></div>");
              } # end each map
          } # end of $parmlev eq map
  #--------------------------------- Entry for parm level general (Course level)
- Line 1940  ENDMAPONE
+ Line 2036  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">');
- Line 1988  sub crsenv {
+ Line 2084  sub crsenv {
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my (%crsinfo,$chome);
      #
      # Go through list of changes
      foreach (keys %env) {
- Line 2007  sub crsenv {
+ Line 2105  sub crsenv {
                  ('environment',
                   {'top level map backup '.$bkuptime => $tmp[1] },
                   $dom,$crs).
-                      '<br>';
+                      '<br />';
          }
          #
          # Deal with modified default spreadsheets
- Line 2035  sub crsenv {
+ Line 2133  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 email 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 email address specified, user [_1] is unknown.",$name).
+ 			'</span>';
+ 		    undef($value);
+ 		}
+ 	    }
+         }
          # Get existing cloners
          my @oldcloner = ();
          if ($name eq 'cloners') {
- Line 2048  sub crsenv {
+ Line 2169  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 />';
              }
          }
      }
+     my $start_table     =&Apache::loncommon::start_data_table();
+     my $start_header_row=&Apache::loncommon::start_data_table_header_row();
+     my $end_header_row  =&Apache::loncommon::end_data_table_header_row();
  # ------------------------- Re-init course environment entries for this session
-     &Apache::lonnet::coursedescription($env{'request.course.id'}
+     &Apache::lonnet::coursedescription($env{'request.course.id'},
  				       {'freshen_cache' => 1});
  # -------------------------------------------------------- Get parameters again
- Line 2096  sub crsenv {
+ Line 2270  sub crsenv {
      my $SelectStyleFile=&mt('Select Style File');
      my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
      my $output='';
+     my $can_categorize;
      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>',
               '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 live chatroom 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 />'.
-                                  '(<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 2165  sub crsenv {
+ Line 2349  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 2210  sub crsenv {
+ Line 2397  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'
+ 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'
+                    .'('.&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>"').')',
+              'timezone'
+                  => '<b>'.&mt('Timezone in which the course takes place').'</b>',
+              'suppress_embed_prompt'
+                  => '<b>'.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').'</b><br />'.
+                     ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',
+              'hidefromcat'
+                  => '<b>'.&mt('Exclude from course catalog').'</b><br />'.
+                     ' ('.&mt('[_1] to exclude, anything else to include - included if assigned an institutional code, or manually catagorized','"<tt>yes</tt>"').')',
+              'categories'
+                  => '<b>'.&mt('Categorize course').'</b> <a href="javascript:catsbrowser()">'.
+                     &mt('Display Categories').'</a>',
+              'datelocale'
+                  => '<b>'.&mt('Locale used for course calendar').'</b>',
+              );
+         my @Display_Order = ('url','description','courseid','cloners');
+         (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+         if ($can_toggle_cat) {
+             push(@Display_Order,'hidefromcat');
+         }
+         if ($can_categorize) {
+             push(@Display_Order,'categories');
+         }
+         push (@Display_Order,('grading',
                               'externalsyllabus',
                               'default_xml_style','pageseparators',
-                              'question.email','comment.email','policy.email',
+                              'question.email','question.email.text','comment.email',
+                              'comment.email.text','policy.email','policy.email.text',
                               'student_classlist_view',
+                              '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',
                               'languages',
+                              'timezone',
+                              'datelocale',
  			     'nothideprivileged',
                               'rndseed',
                               'receiptalg',
                               'problem_stream_switch',
  			     'suppress_tries',
+                              'suppress_embed_prompt',
                               'default_paper_size',
+ 			     'print_header_format',
                               'disable_receipt_display',
                               'spreadsheet_default_classcalc',
                               'spreadsheet_default_studentcalc',
- Line 2236  sub crsenv {
+ Line 2456  sub crsenv {
                               'default_enrollment_start_date',
                               'default_enrollment_end_date',
  			     'tthoptions',
+ 			     'texengine',
  			     'disablesigfigs',
- 			     'disableexampointprint'
+ 			     'disableexampointprint',
-                              );
+ 			     'task_messages','task_grading'));
  	foreach my $parameter (sort(keys(%values))) {
-             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
+             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+                     ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+                     || ($parameter eq 'type')) {
                  if (! $descriptions{$parameter}) {
                      $descriptions{$parameter}=$parameter;
                      push(@Display_Order,$parameter);
                  }
              }
  	}
          foreach my $parameter (@Display_Order) {
              my $description = $descriptions{$parameter};
              # onchange is javascript to automatically check the 'Set' button.
              my $onchange = 'onFocus="javascript:window.document.forms'.
                  "['envform'].elements['".$parameter."_setparmval']".
                  '.checked=true;"';
-             $output .= '<tr><td>'.$description.'</td>';
+             $output .= &Apache::loncommon::start_data_table_row().
+ 		'<td>'.$description.'</td>';
              if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
                  $output .= '<td>'.
                      &Apache::lonhtmlcommon::date_setter('envform',
- Line 2261  sub crsenv {
+ Line 2486  sub crsenv {
                                                          $values{$parameter},
                                                          $onchange).
                                                          '</td>';
+             } 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::loncommon::select_datelocale($parameter.'_value',
+                                                           $currdatelocale,
+                                                           $onchange,$includeempty).'</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 {
                  $output .= '<td>'.
                      &Apache::lonhtmlcommon::textbox($parameter.'_value',
- Line 2270  sub crsenv {
+ Line 2528  sub crsenv {
              $output .= '<td>'.
                  &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
                  '</td>';
-             $output .= "</tr>\n";
+             $output .= &Apache::loncommon::end_data_table_row()."\n";
  	}
          my $onchange = 'onFocus="javascript:window.document.forms'.
              '[\'envform\'].elements[\'newp_setparmval\']'.
              '.checked=true;"';
- 	$output.='<tr><td><i>'.&mt('Create New Environment Variable').'</i><br />'.
+ 	$output.=&Apache::loncommon::start_data_table_row().
+ 	    '<td><i>'.&mt('Create New Environment Variable').'</i><br />'.
  	    '<input type="text" size=40 name="newp_name" '.
                  $onchange.' /></td><td>'.
              '<input type="text" size=40 name="newp_value" '.
                  $onchange.' /></td><td>'.
- 	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
+ 	    '<input type="checkbox" name="newp_setparmval" /></td>'.
+ 	    &Apache::loncommon::end_data_table_row()."\n";
      }
      my %lt=&Apache::lonlocal::texthash(
  		    'par'   => 'Parameter',
  		    'val'   => 'Value',
- 		    'set'   => 'Set',
+ 		    'set'   => 'Set?',
- 		    'sce'   => 'Set Course Environment'
+ 		    'sav'   => 'Save'
  				       );
      my $Parameter=&mt('Parameter');
      my $Value=&mt('Value');
      my $Set=&mt('Set');
-     my $browse_js=
+     my ($jscript,$categorize_js);
- 	'<script type="text/javascript" language="Javascript">'.
+     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
- 	&Apache::loncommon::browser_and_searcher_javascript('parmset').
+     if ($can_categorize) {
- 	'</script>';
+         $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();
+     my $end_table=&Apache::loncommon::end_data_table();
      $r->print(<<ENDENV);
  $start_page
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=crsenv" name="envform">
  $setoutput
- <p>
+ <div><input type="submit" name="crsenv" value="$lt{'sav'}" /></div>
- <table border=2>
+ $start_table
- <tr><th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th></tr>
+ $start_header_row
+ <th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}</th>
+ $end_header_row
  $output
- </table>
+ $end_table
- <input type="submit" name="crsenv" value="$lt{'sce'}">
+ <input type="submit" name="crsenv" value="$lt{'sav'}" />
  </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 2349  sub readdata {
+ Line 2716  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 2386  sub storedata {
+ Line 2752  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 2413  sub storedata {
+ Line 2791  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 2453  sub storedata {
+ Line 2811  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 2472  sub storedata {
+ Line 2830  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 2486  sub listdata {
+ Line 2864  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 2530  sub listdata {
+ Line 2916  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 2539  sub listdata {
+ Line 2925  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 2571  sub listdata {
+ Line 2957  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().
- Line 2599  sub listdata {
+ Line 2976  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.'">');
- Line 2640  sub listdata {
+ Line 2999  sub listdata {
      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) = @_;
- Line 2681  ENDOVER
+ Line 3151  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 2702  ENDOVER
+ Line 3172  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 2755  ENDOVER
+ Line 3231  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 2828  ENDOVER
+ Line 3304  ENDOVER
  	      &Apache::loncommon::end_page());
  }
+ sub clean_parameters {
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $start_page=&Apache::loncommon::start_page('Clean Parameters');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
+     $r->print(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ <form method="post" action="/adm/parmset?action=cleanparameters" name="parmform">
+ ENDOVER
+ # Store modified
+     &storedata($r,$crs,$dom);
+ # Read modified data
+     my $resourcedata=&readdata($crs,$dom);
+ # List data
+     $r->print('<h3>'.
+ 	      &mt('These parameters refer to resources that do not exist.').
+ 	      '</h3>'.
+ 	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.'<br />'.
+ 	      '<br />');
+     $r->print(&Apache::loncommon::start_data_table().
+ 	      '<tr>'.
+ 	      '<th>'.&mt('Delete').'</th>'.
+ 	      '<th>'.&mt('Parameter').'</th>'.
+ 	      '</tr>');
+     foreach my $thiskey (sort(keys(%{$resourcedata}))) {
+ 	next if (!exists($resourcedata->{$thiskey.'.type'})
+ 		 && $thiskey=~/\.type$/);
+ 	my %data = &parse_key($thiskey);
+ 	if (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 Checked Parameters').'" />'.
+ 	      '</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'};
+     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'};
+     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;
+ }
  ##################################################
  ##################################################
  =pod
  =item check_cloners
- Line 2860  where $action is add or drop, and $clone
+ Line 3503  where $action is add or drop, and $clone
  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 2914  sub change_clone {
+ Line 3572  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 2989  ENDMAINFORMHEAD
+ Line 3651  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 =
-         (
+         ( { divider=>'Settings for Your Course',
-           { text => 'Set Course Environment Parameters',
+ 	  },
+           { text => 'Set Course Environment',
  	    action => 'crsenv',
              permission => $parm_permission,
+             help => 'Course_Environment',
              },
            { text => 'Set Portfolio Metadata',
  	    action => 'setrestrictmeta',
- Line 3004  ENDMAINFORMHEAD
+ Line 3669  ENDMAINFORMHEAD
  	    url => '/adm/slotrequest?command=showslots',
  	    permission => $vgr,
              },
- 	  { divider => 1,
+ 	  { text => 'Reset Student Access Times',
+ 	    url => '/adm/helper/resettimes.helper',
+ 	    permission => $mgr,
+             },
+           { text => 'Set Parameter Setting Default Actions',
+             action => 'setdefaults',
+             permission => $parm_permission,
+             },
+ 	  { divider => 'New and Existing Parameter Settings for Your Resources',
  	    },
            { text => 'Set/Modify Resource Parameters - Helper Mode',
              url => '/adm/helper/parameter.helper',
              permission => $parm_permission,
+             help => 'Parameter_Helper',
              },
-           { text => 'Modify Resource Parameters - Overview Mode',
+  	  { text => 'Set/Modify Resource Parameters - Overview Mode',
-             action => 'setoverview',
-             permission => $parm_permission,
-             },
- 	  { text => 'Set Resource Parameters - Overview Mode',
              action => 'newoverview',
              permission => $parm_permission,
+             help => 'Parameter_Overview',
              },
            { text => 'Set/Modify Resource Parameters - Table Mode',
              action => 'settable',
              permission => $parm_permission,
-             help => 'Cascading_Parameters',
+             help => 'Table_Mode',
              },
-           { text => 'Set Parameter Setting Default Actions',
+            { divider => 'Existing Parameter Settings for Your Resources',
-             action => 'setdefaults',
+ 	  },
+ 	  { text => 'Modify Resource Parameters - Overview Mode',
+             action => 'setoverview',
              permission => $parm_permission,
-             },
+             help => 'Parameter_Overview',
+  	    },
  	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
              action => 'parameterchangelog',
              permission => $parm_permission,
- Line 3035  ENDMAINFORMHEAD
+ Line 3710  ENDMAINFORMHEAD
      my $menu_html = '';
      foreach my $menu_item (@menu) {
  	if ($menu_item->{'divider'}) {
- 	    $menu_html .= '<hr />';
+ 	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
  	    next;
  	}
          next if (! $menu_item->{'permission'});
          $menu_html.='<p>';
-         $menu_html.='<font size="+1">';
+         $menu_html.='<span class="LC_parm_menu_item">';
          if (exists($menu_item->{'url'})) {
              $menu_html.=qq{<a href="$menu_item->{'url'}">};
          } else {
              $menu_html.=
                  qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
          }
-         $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+         $menu_html.= &mt($menu_item->{'text'}).'</a></span>';
          if (exists($menu_item->{'help'})) {
              $menu_html.=
                  &Apache::loncommon::help_open_topic($menu_item->{'help'});
- Line 3059  ENDMAINFORMHEAD
+ Line 3734  ENDMAINFORMHEAD
  }
  ### Set portfolio metadata
  sub output_row {
-     my ($r, $field_name, $field_text) = @_;
+     my ($r, $field_name, $field_text, $added_flag) = @_;
      my $output;
      my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
      my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
-     unless (defined($options)) {
+     if (!defined($options)) {
          $options = 'active,stuadd';
          $values = '';
      }
-     $output.='<strong>'.$field_text.':</strong>';
+     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 catalog information'],
-     my @options= ( ['active', 'Show to student'],
+                     ['choices','Provide choices for students to select from']);
- 		   ['onlyone','Student may select only one choice'],
+ #		   ['onlyone','Student may select only one choice']);
- 		   ['stuadd', 'Student may type choices']);
+         if ($added_flag) {
-     foreach my $opt (@options) {
+             push @options,['deleted', 'Delete Metadata Field'];
- 	my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+         }
- 	$output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+        $output = &Apache::loncommon::start_data_table_row();
- 	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+         $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
- 	    &mt($opt->[1]).'</label> <br />';
+         $output .= &Apache::loncommon::end_data_table_row();
+         foreach my $opt (@options) {
+ 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ 	    $output .= &Apache::loncommon::continue_data_table_row();
+ 	    $output .= '<td>'.('&nbsp;' x 5).'<span class="LC_metadata"><label>
+ 	               <input type="checkbox" name="'.
+ 	               $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+ 	               &mt($opt->[1]).'</label></span> </td>';
+ 	    $output .= &Apache::loncommon::end_data_table_row();
+ 	}
+         $output .= &Apache::loncommon::continue_data_table_row();
+         $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
+         my $multiple_checked;
+         my $single_checked;
+         if ($options =~ m/onlyone/) {
+             $multiple_checked = "";
+             $single_checked = " CHECKED ";
+         } else {
+             $multiple_checked = " CHECKED ";
+             $single_checked = "";
+         }
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+ 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
+ 	            Student may select multiple choices from list</span></td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+ 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
+ 	            Student may select only one choice from list</span></td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
      }
      return ($output);
  }
+ sub order_meta_fields {
+     my ($r)=@_;
+     my $idx = 1;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+     &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>"/adm/parmset?action=setrestrictmeta",
+               text=>"Restrict Metadata"},
+              {text=>"Order Metadata"});
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+     if ($env{'form.storeorder'}) {
+         my $newpos = $env{'form.newpos'} - 1;
+         my $currentpos = $env{'form.currentpos'} - 1;
+         my @neworder = ();
+         my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+         my $i;
+         if ($newpos > $currentpos) {
+         # moving stuff up
+             for ($i=0;$i<$currentpos;$i++) {
+         	$neworder[$i]=$oldorder[$i];
+             }
+             for ($i=$currentpos;$i<$newpos;$i++) {
+         	$neworder[$i]=$oldorder[$i+1];
+             }
+             $neworder[$newpos]=$oldorder[$currentpos];
+             for ($i=$newpos+1;$i<=$#oldorder;$i++) {
+         	$neworder[$i]=$oldorder[$i];
+             }
+         } else {
+         # moving stuff down
+     	    for ($i=0;$i<$newpos;$i++) {
+     	        $neworder[$i]=$oldorder[$i];
+     	    }
+     	    $neworder[$newpos]=$oldorder[$currentpos];
+     	    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
+     	        $neworder[$i]=$oldorder[$i-1];
+     	    }
+     	    for ($i=$currentpos+1;$i<=$#oldorder;$i++) {
+     	        $neworder[$i]=$oldorder[$i];
+     	    }
+         }
+ 	my $ordered_fields = join ",", @neworder;
+         my $put_result = &Apache::lonnet::put('environment',
+                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ 	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
+     }
+     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
+     my $ordered_fields;
+     my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+     if (!@fields_in_order) {
+         # no order found, pick sorted order then create metadata.addedorder key.
+         foreach my $key (sort keys %$fields) {
+             push @fields_in_order, $key;
+             $ordered_fields = join ",", @fields_in_order;
+         }
+         my $put_result = &Apache::lonnet::put('environment',
+                             {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+     }
+     $r->print('<table>');
+     my $num_fields = scalar(@fields_in_order);
+     foreach my $key (@fields_in_order) {
+         $r->print('<tr><td>');
+         $r->print('<form method="post" action="">');
+         $r->print('<select name="newpos" onChange="this.form.submit()">');
+         for (my $i = 1;$i le $num_fields;$i ++) {
+             if ($i eq $idx) {
+                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
+             } else {
+                 $r->print('<option value="'.$i.'">'.$i.'</option>');
+             }
+         }
+         $r->print('</select></td><td>');
+         $r->print('<input type="hidden" name="currentpos" value="'.$idx.'" />');
+         $r->print('<input type="hidden" name="storeorder" value="true" />');
+         $r->print('</form>');
+         $r->print($$fields{$key}.'</td></tr>');
+         $idx ++;
+     }
+     $r->print('</table>');
+     return 'ok';
+ }
+ sub continue {
+     my $output;
+     $output .= '<form action="" method="post">';
+     $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
+     $output .= '<input type="submit" value="Continue" />';
+     return ($output);
+ }
+ sub addmetafield {
+     my ($r)=@_;
+     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     if (exists($env{'form.undelete'})) {
+         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
+         foreach my $meta_field(@meta_fields) {
+             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
+             $options =~ s/deleted//;
+             $options =~ s/,,/,/;
+             my $put_result = &Apache::lonnet::put('environment',
+                                         {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
+             $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+         }
+         $r->print(&continue());
+     } elsif (exists($env{'form.fieldname'})) {
+         my $meta_field = $env{'form.fieldname'};
+         my $display_field = $env{'form.fieldname'};
+         $meta_field =~ s/\W/_/g;
+         $meta_field =~ tr/A-Z/a-z/;
+         my $put_result = &Apache::lonnet::put('environment',
+                             {'metadata.'.$meta_field.'.values'=>"",
+                              'metadata.'.$meta_field.'.added'=>"$display_field",
+                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
+         $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+         $r->print(&continue());
+     } else {
+         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
+         if ($fields) {
+             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+             $r->print('<form method="post" action="">');
+             foreach my $key(keys(%$fields)) {
+                 $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
+             }
+             $r->print('<input type="submit" name="undelete" value="Undelete" />');
+             $r->print('</form>');
+         }
+         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
+         $r->print('<input type="text" name="fieldname" /><br />');
+         $r->print('<input type="submit" value="Add Metadata Field" />');
+     }
+     $r->print('</form>');
+ }
  sub setrestrictmeta {
      my ($r)=@_;
      my $next_meta;
      my $output;
      my $item_num;
      my $put_result;
      $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 3106  sub setrestrictmeta {
+ Line 3945  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 3123  sub setrestrictmeta {
+ Line 3968  sub setrestrictmeta {
      }
      &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) = @_;
- Line 3236  ENDDEFHEAD
+ Line 4126  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 3289  ENDYESNO
+ Line 4183  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 Rules')."' /></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 3318  sub components {
+ Line 4215  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)=@_;
-     my %standard_parms=&Apache::lonlocal::texthash('duedate' => 'Due Date',
+     if (!%standard_parms) {
- 						   'answerdate' => 'Answer Date',
+ 	&load_parameter_names();
- 						   'opendate' => 'Open Date',
+     }
- 						   'maxtries' => 'Max. Number of Tries',
- 						   'weight' => 'Weight',
- 						   'date_start' => 'Starting Date',
- 						   'date_end' => 'Ending Date',
- 						   'int_pos' => 'Positive Integer',
- 						   'int_zero_pos' => 'Positive Integer or Zero',
- 						   'hinttries' => 'Number of Tries till Hints appear');
      if ($standard_parms{$name}) {
  	return $standard_parms{$name};
      } else {
- Line 3349  sub standard_parameter_names {
+ Line 4260  sub standard_parameter_names {
      }
  }
+ #
+ # Parameter Change Log
+ #
  sub parm_change_log {
      my ($r)=@_;
-     &startpage($r);
+     $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
      my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
  				      $env{'course.'.$env{'request.course.id'}.'.domain'},
  				      $env{'course.'.$env{'request.course.id'}.'.num'});
+     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
+     $r->print('<form action="/adm/parmset?action=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().
-     my $bgcolor='#EEEEEE';
+ 	      '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
-     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
+ 	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
- 	if ($bgcolor eq '#EEEEEE') { $bgcolor='#FFFFCC'; } else { $bgcolor='#EEEEEE'; }
+ 	      &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=$#changes+1;
+ 	my $count = 0;
  	my $time =
  	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
  	my $plainname =
- Line 3380  sub parm_change_log {
+ Line 4334  sub parm_change_log {
  						   $parmlog{$id}{'exe_uname'},
  						   $parmlog{$id}{'exe_udom'});
  	}
- 	$r->print('<tr bgcolor="'.$bgcolor.'"><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=();
+ 	my $output;
  	foreach my $changed (reverse(sort(@changes))) {
-             my $value=$parmlog{$id}{'logentry'}->{$changed};
+             my $value=$parmlog{$id}{'logentry'}{$changed};
-             my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)=
+ 	    my $typeflag = ($changed =~/\.type$/ &&
- 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'});
+ 			    !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
- 	    if ($typeflag) { $istype{$parmname}=$value; }
+             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
- 	    if ($makenewrow) { $r->print('<tr bgcolor="'.$bgcolor.'">'); } else { $makenewrow=1; }
+ 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
- 	    $r->print('<td>'.$realm.'</td><td>'.$section.'</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>');
+ 		      ($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]',&standard_parameter_names($value)));
+ 		    $output .= &mt('Type: [_1]',&standard_parameter_names($value));
  		} else {
  		    my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
  						      $uname,$udom,$issection,$issection,$courseopt);
  		    if (&isdateparm($istype{$parmname})) {
- 			$r->print(&Apache::lonlocal::locallocaltime($value));
+ 			$output .= &Apache::lonlocal::locallocaltime($value);
  		    } else {
- 			$r->print($value);
+ 			$output .= $value;
  		    }
  		    if ($value ne $all[$level]) {
- 			$r->print('<br /><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) {
+ 		my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
+                 my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
+ 				    (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
  		if (($uname) && ($udom)) {
- 		    $r->print('<td>Notify Link</td>');
+ 		    $output .=
+ 			&Apache::loncommon::messagewrapper('Notify User',
+ 							   $uname,$udom,$title,
+ 							   $description);
  		} else {
- 		    $r->print('<td>Blog Link</td>');
+ 		    $output .=
+ 			&Apache::lonrss::course_blog_link($id,$title,
+ 							  $description);
  		}
- 	    } else {
- 		$r->print('<td>&nbsp;</td>');
  	    }
- 	    $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 check_for_course_info {
+     my $navmap = Apache::lonnavmaps::navmap->new();
+     return 1 if ($navmap);
+     return 0;
+ }
  ##################################################
  ##################################################
- Line 3444  sub parm_change_log {
+ Line 4438  sub parm_change_log {
  Main handler.  Calls &assessparms and &crsenv subroutines.
  =cut
  ##################################################
  ##################################################
- #    use Data::Dumper;
  sub handler {
      my $r=shift;
+     &reset_caches();
      if ($r->header_only) {
  	&Apache::loncommon::content_type($r,'text/html');
  	$r->send_http_header;
- Line 3462  sub handler {
+ Line 4457  sub handler {
                                               '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'});
  # ----------------------------------------------------- Needs to be in a course
      my $parm_permission =
  	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
  	 &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
  				  $env{'request.course.sec'}));
-     if ($env{'request.course.id'} &&  $parm_permission) {
+     my $exists = &check_for_course_info();
+     if ($env{'request.course.id'} &&  $parm_permission && $exists) {
          # Start Page
          &Apache::loncommon::content_type($r,'text/html');
          $r->send_http_header;
-         # id numbers can change on re-ordering of folders
-         &resetsymbcache();
          #
          # Main switch on form.action and form.state, as appropriate
          #
- Line 3494  sub handler {
+ Line 4488  sub handler {
          #  the table mode
          if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
  	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+             &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+ 						    text=>"Problem Parameters"});
  	    &assessparms($r);
          } elsif (! exists($env{'form.action'})) {
- Line 3508  sub handler {
+ Line 4504  sub handler {
              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
  						    text=>"Overview Mode"});
  	    &overview($r);
+ 	} elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ 						    text=>"Add Metadata Field"});
+ 	    &addmetafield($r);
+ 	} elsif ($env{'form.action'} eq 'ordermetadata' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ 						    text=>"Add Metadata Field"});
+ 	    &order_meta_fields($r);
          } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
  						    text=>"Restrict Metadata"});
- Line 3529  sub handler {
+ Line 4533  sub handler {
              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
  						    text=>"Parameter Change Log"});
  	    &parm_change_log($r);
- 	}
+         } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
+ 						    text=>"Clean Parameters"});
+ 	    &clean_parameters($r);
+         } elsif ($env{'form.action'} eq 'dateshift1' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+                                                     text=>"Shifting Dates"});
+             &date_shift_one($r);
+         } elsif ($env{'form.action'} eq 'dateshift2' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+                                                     text=>"Shifting Dates"});
+             &date_shift_two($r);
+ 	} elsif ($env{'form.action'} eq 'categorizecourse' && $parm_permission) {
+             &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;
  }

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

Removed from v.1.298
changed lines
	Added in v.1.413