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.350.2.6 and 1.452

-version 1.350.2.6, 2007/01/18 21:14:04
+version 1.452, 2009/05/30 21:52:30
  Line 44  This module sets coursewide and assessme
  =head1 INTERNAL SUBROUTINES
- =over 4
+ =over
- =cut
- ###################################################################
- ###################################################################
- package Apache::lonparmset;
- use strict;
- use Apache::lonnet;
- use Apache::Constants qw(:common :http REDIRECT);
- use Apache::lonhtmlcommon();
- use Apache::loncommon;
- use GDBM_File;
- use Apache::lonhomework;
- use Apache::lonxml;
- use Apache::lonlocal;
- use Apache::lonnavmaps;
- 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
- ##################################################
- ##################################################
  =pod
- =item parmval
+ =item parmval()
  Figure out a cascading parameter.
- Line 108  Returns:  A list, the first item is the
+ Line 73  Returns:  A list, the first item is the
 - Map or Folder level for specific student
 - resource level for specific student
+ =item parmval_by_symb()
+ =item reset_caches()
+ =item cacheparmhash()
+ =item parmhash()
+ =item symbcache()
+ =item preset_defaults()
+ =item date_sanity_info()
+ =item storeparm()
+ Store a parameter by symb
+     Takes
+     - symb
+     - name of parameter
+     - level
+     - new value
+     - new type
+     - username
+     - userdomain
+ =item log_parmset()
+ =item storeparm_by_symb_inner()
+ =item valout()
+ Format a value for output.
+ Inputs:  $value, $type, $editable
+ Returns: $value, formatted for output.  If $type indicates it is a date,
+ localtime($value) is returned.
+ $editable will return an icon to click on
+ =item plink()
+ Produces a link anchor.
+ Inputs: $type,$dis,$value,$marker,$return,$call
+ Returns: scalar with html code for a link which will envoke the
+ javascript function 'pjump'.
+ =item page_js()
+ =item startpage()
+ =item print_row()
+ =item print_td()
+ =item print_usergroups()
+ =item parm_control_group()
+ =item extractResourceInformation() :
+ Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
+ Input: See list below:
+ =item * B<ids> : An array that will contain all of the ids in the course.
+ =item * B<typep> : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
+ =item * B<keyp> : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
+ =item * B<allparms> : hash, name of parameter->display value (what is the display value?)
+ =item * B<allparts> : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+ =item * B<allkeys> : hash, full key to part->display value (what's display value?)
+ =item * B<allmaps> : hash, ???
+ =item * B<fcat> : ???
+ =item * B<defp> : hash, ???
+ =item * B<mapp> : ??
+ =item * B<symbp> : hash, id->full sym?
+ =item isdateparm()
+ =item parmmenu()
+ =item partmenu()
+ =item usermenu()
+ =item displaymenu()
+ =item mapmenu()
+ =item levelmenu()
+ =item sectionmenu()
+ =item keysplit()
+ =item keysinorder()
+ =item keysinorder_bytype()
+ =item keysindisplayorder()
+ =item standardkeyorder()
+ =item assessparms() :
+ Show assessment data and parameters.  This is a large routine that should
+ be simplified and shortened... someday.
+ Inputs: $r
+ Returns: nothing
+ Variables used (guessed by Jeremy):
+ =item * B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
+ =item * B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
+ =item * B<@catmarker> contains list of all possible parameters including part #s
+ =item * B<$fullkeyp> contains the full part/id # for the extraction of proper parameters
+ =item * B<$tempkeyp> contains part 0 only (no ids - ie, subparts)
+         When storing information, store as part 0
+         When requesting information, request from full part
+ =item tablestart()
+ =item tableend()
+ =item extractuser()
+ =item parse_listdata_key()
+ =item listdata()
+ =item date_interval_selector()
+ =item get_date_interval_from_form()
+ =item default_selector()
+ =item string_selector()
+ =item dateshift()
+ =item newoverview()
+ =item secgroup_lister()
+ =item overview()
+ =item clean_parameters()
+ =item date_shift_one()
+ =item date_shift_two()
+ =item parse_key()
+ =item check_cloners() :
+ Checks if new users included in list of allowed cloners
+ are valid users.  Replaces supplied list with
+ cleaned list containing only users with valid usernames
+ and domains.
+ Inputs: $clonelist, $oldcloner
+ where $clonelist is ref to array of requested cloners,
+ and $oldcloner is ref to array of currently allowed
+ cloners.
+ Returns: string - comma separated list of requested
+ cloners (username:domain) who do not exist in system.
+ =item change_clone() :
+ Modifies the list of courses a user can clone (stored
+ in the user's environment.db file), called when a
+ change is made to the list of users allowed to clone
+ a course.
+ Inputs: $action,$cloner
+ where $action is add or drop, and $cloner is identity of
+ user for whom cloning ability is to be changed in course.
+ =item check_cloners()
+ =item change_clone()
+ =item header()
+ Output html header for page
+ =item print_main_menu()
+ =item output_row()
+ Set portfolio metadata
+ =item order_meta_fields()
+ =item addmetafield()
+ =item setrestrictmeta()
+ =item get_added_meta_fieldnames()
+ =item get_deleted_meta_fieldnames()
+ =item defaultsetter()
+ =item components()
+ =item load_parameter_names()
+ =item parm_change_log()
+ =item handler() :
+ Main handler.  Calls &assessparms subroutine.
+ =back
  =cut
- ##################################################
+ ###################################################################
+ ###################################################################
+ package Apache::lonparmset;
+ use strict;
+ use Apache::lonnet;
+ use Apache::Constants qw(:common :http REDIRECT);
+ use Apache::lonhtmlcommon();
+ use Apache::loncommon;
+ use GDBM_File;
+ use Apache::lonhomework;
+ use Apache::lonxml;
+ use Apache::lonlocal;
+ use Apache::lonnavmaps;
+ use Apache::longroup;
+ use Apache::lonrss;
+ use LONCAPA qw(:DEFAULT :match);
  sub parmval {
      my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
      return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
- Line 119  sub parmval {
+ Line 344  sub parmval {
  sub parmval_by_symb {
      my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
- # load caches
-     &cacheparmhash();
      my $useropt;
      if ($uname ne '' && $udom ne '') {
- Line 130  sub parmval_by_symb {
+ Line 353  sub parmval_by_symb {
      my $result='';
      my @outpar=();
  # ----------------------------------------------------- Cascading lookup scheme
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
      $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$what;
- Line 167  sub parmval_by_symb {
+ Line 390  sub parmval_by_symb {
  # ------------------------------------------------------ third, check map parms
-     my $thisparm=$parmhash{$symbparm};
+     my $thisparm=&parmhash($symbparm);
      if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }
      if (defined($$courseopt{$courselevelr})) {
- Line 228  sub parmval_by_symb {
+ Line 451  sub parmval_by_symb {
      return ($result,@outpar);
  }
- sub resetparmhash {
-     $parmhashid='';
- }
- sub cacheparmhash {
-     if ($parmhashid eq  $env{'request.course.fn'}) { return; }
-     my %parmhashfile;
-     if (tie(%parmhashfile,'GDBM_File',
- 	      $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
- 	%parmhash=%parmhashfile;
- 	untie %parmhashfile;
- 	$parmhashid=$env{'request.course.fn'};
-     }
- }
- sub resetsymbcache {
+ # --- Caches local to lonparmset
-     $symbsid='';
- }
- sub symbcache {
-     my $id=shift;
+ sub reset_caches {
-     if ($symbsid ne $env{'request.course.id'}) {
+     &resetparmhash();
- 	%symbs=();
+     &resetsymbcache();
-     }
+     &resetrulescache();
-     unless ($symbs{$id}) {
+ }
- 	my $navmap = Apache::lonnavmaps::navmap->new();
- 	if ($id=~/\./) {
+ {
- 	    my $resource=$navmap->getById($id);
+     my $parmhashid;
- 	    $symbs{$id}=$resource->symb();
+     my %parmhash;
- 	} else {
+     sub resetparmhash {
- 	    my $resource=$navmap->getByMapPc($id);
+ 	undef($parmhashid);
- 	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+ 	undef(%parmhash);
+     }
+     sub cacheparmhash {
+ 	if ($parmhashid eq  $env{'request.course.fn'}) { return; }
+ 	my %parmhashfile;
+ 	if (tie(%parmhashfile,'GDBM_File',
+ 		$env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
+ 	    %parmhash=%parmhashfile;
+ 	    untie(%parmhashfile);
+ 	    $parmhashid=$env{'request.course.fn'};
  	}
- 	$symbsid=$env{'request.course.id'};
      }
-     return $symbs{$id};
- }
- sub resetrulescache {
+     sub parmhash {
-     $rulesid='';
+ 	my ($id) = @_;
- }
+ 	&cacheparmhash();
+ 	return $parmhash{$id};
+     }
+  }
+ {
+     my $symbsid;
+     my %symbs;
+     sub resetsymbcache {
+ 	undef($symbsid);
+ 	undef(%symbs);
+     }
+     sub symbcache {
+ 	my $id=shift;
+ 	if ($symbsid ne $env{'request.course.id'}) {
+ 	    undef(%symbs);
+ 	}
+ 	if (!$symbs{$id}) {
+ 	    my $navmap = Apache::lonnavmaps::navmap->new();
+ 	    if ($id=~/\./) {
+ 		my $resource=$navmap->getById($id);
+ 		$symbs{$id}=$resource->symb();
+ 	    } else {
+ 		my $resource=$navmap->getByMapPc($id);
+ 		$symbs{$id}=&Apache::lonnet::declutter($resource->src());
+ 	    }
+ 	    $symbsid=$env{'request.course.id'};
+ 	}
+ 	return $symbs{$id};
+     }
+  }
- sub rulescache {
+ {
-     my $id=shift;
+     my $rulesid;
-     if ($rulesid ne $env{'request.course.id'}
+     my %rules;
- 	&& !defined($rules{$id})) {
+     sub resetrulescache {
- 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	undef($rulesid);
- 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 	undef(%rules);
- 	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+     }
- 	$rulesid=$env{'request.course.id'};
+     sub rulescache {
+ 	my $id=shift;
+ 	if ($rulesid ne $env{'request.course.id'}
+ 	    && !defined($rules{$id})) {
+ 	    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 	    %rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+ 	    $rulesid=$env{'request.course.id'};
+ 	}
+ 	return $rules{$id};
      }
-     return $rules{$id};
  }
  sub preset_defaults {
      my $type=shift;
      if (&rulescache($type.'_action') eq 'default') {
- Line 296  sub preset_defaults {
+ Line 553  sub preset_defaults {
      }
  }
- ##################################################
  sub date_sanity_info {
     my $checkdate=shift;
- Line 305  sub date_sanity_info {
+ Line 563  sub date_sanity_info {
     my $crsprefix='course.'.$env{'request.course.id'}.'.';
     if ($env{$crsprefix.'default_enrollment_end_date'}) {
        if ($checkdate>$env{$crsprefix.'default_enrollment_end_date'}) {
-          $result.='<br />'.&mt('After course enrollment end!');
+          $result.='<div class="LC_warning">'
+                  .&mt('After course enrollment end!')
+                  .'</div>';
        }
     }
     if ($env{$crsprefix.'default_enrollment_start_date'}) {
        if ($checkdate<$env{$crsprefix.'default_enrollment_start_date'}) {
-          $result.='<br />'.&mt('Before course enrollment start!');
+          $result.='<div class="LC_warning">'
+                  .&mt('Before course enrollment start!')
+                  .'</div>';
        }
     }
+ # Preparation for additional warnings about dates in the past/future.
+ # An improved, more context sensitive version is recommended,
+ # e.g. warn for due and answer dates which are defined before the corresponding open date, etc.
+ #   if ($checkdate<time) {
+ #      $result.='<div class="LC_info">'
+ #              .'('.&mt('in the past').')'
+ #              .'</div>';
+ #      }
+ #   if ($checkdate>time) {
+ #      $result.='<div class="LC_info">'
+ #              .'('.&mt('in the future').')'
+ #              .'</div>';
+ #      }
     return $result;
  }
  ##################################################
- Line 334  sub storeparm {
+ Line 609  sub storeparm {
      &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
  }
- #
- # Store a parameter by symb
- #
- # Takes
- # - symb
- # - name of parameter
- # - level
- # - new value
- # - new type
- # - username
- # - userdomain
  my %recstack;
  sub storeparm_by_symb {
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
- Line 407  sub storeparm_by_symb_inner {
+ Line 670  sub storeparm_by_symb_inner {
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
  # ---------------------------------------------------------- Construct prefixes
      $spnam=~s/\_([^\_]+)$/\.$1/;
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
      $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$spnam;
- Line 420  sub storeparm_by_symb_inner {
+ Line 683  sub storeparm_by_symb_inner {
      my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
      my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
      my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
      my $courselevel=$env{'request.course.id'}.'.'.$spnam;
      my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
      my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
      my $storeunder='';
      if (($snum==14) || ($snum==3)) { $storeunder=$courselevel; }
      if (($snum==13) || ($snum==2)) { $storeunder=$courselevelm; }
- Line 436  sub storeparm_by_symb_inner {
+ Line 699  sub storeparm_by_symb_inner {
      if ($snum==5) { $storeunder=$grplevelm; }
      if ($snum==4) { $storeunder=$grplevelr; }
      my $delete;
      if ($nval eq '') { $delete=1;}
      my %storecontent = ($storeunder         => $nval,
- Line 493  sub storeparm_by_symb_inner {
+ Line 756  sub storeparm_by_symb_inner {
  	}
  	&Apache::lonnet::devalidateuserresdata($uname,$udom);
      }
      if ($reply=~/^error\:(.*)/) {
  	return "<span class=\"LC_error\">Write Error: $1</span>";
      }
      return '';
  }
- ##################################################
- ##################################################
- =pod
- =item valout
- Format a value for output.
- Inputs:  $value, $type, $editable
- Returns: $value, formatted for output.  If $type indicates it is a date,
- localtime($value) is returned.
- $editable will return an icon to click on
- =cut
- ##################################################
- ##################################################
  sub valout {
      my ($value,$type,$editable)=@_;
      my $result = '';
- Line 532  sub valout {
+ Line 777  sub valout {
      } else {
          if ($type eq 'date_interval') {
              my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+             my @timer;
              $year=$year-70;
              $mday--;
              if ($year) {
- 		$result.=$year.' yrs ';
+ #               $result.=&mt('[quant,_1,yr]',$year).' ';
+                 push(@timer,&mt('[quant,_1,yr]',$year));
              }
              if ($mon) {
- 		$result.=$mon.' mths ';
+ #               $result.=&mt('[quant,_1,mth]',$mon).' ';
+                 push(@timer,&mt('[quant,_1,mth]',$mon));
              }
              if ($mday) {
- 		$result.=$mday.' days ';
+ #               $result.=&mt('[quant,_1,day]',$mday).' ';
+                 push(@timer,&mt('[quant,_1,day]',$mday));
              }
              if ($hour) {
- 		$result.=$hour.' hrs ';
+ #               $result.=&mt('[quant,_1,hr]',$hour).' ';
+                 push(@timer,&mt('[quant,_1,hr]',$hour));
              }
              if ($min) {
- 		$result.=$min.' mins ';
+ #               $result.=&mt('[quant,_1,min]',$min).' ';
+                 push(@timer,&mt('[quant,_1,min]',$min));
              }
              if ($sec) {
- 		$result.=$sec.' secs ';
+ #               $result.=&mt('[quant,_1,sec]',$sec).' ';
+                 push(@timer,&mt('[quant,_1,sec]',$sec));
              }
-             $result=~s/\s+$//;
+ #           $result=~s/\s+$//;
+             if (!@timer) { # Special case: all entries 0 -> display "0 secs" intead of empty field to keep this field editable
+                 push(@timer,&mt('[quant,_1,sec]',0));
+             }
+             $result.=join(", ",@timer);
          } elsif (&isdateparm($type)) {
-             $result = localtime($value).&date_sanity_info($value);
+             $result = &Apache::lonlocal::locallocaltime($value).
+ 		&date_sanity_info($value);
          } else {
              $result = $value;
+ 	    $result = &HTML::Entities::encode($result,'"<>&');
          }
      }
      return $result;
  }
- ##################################################
- ##################################################
- =pod
- =item plink
- Produces a link anchor.
- Inputs: $type,$dis,$value,$marker,$return,$call
- Returns: scalar with html code for a link which will envoke the
- javascript function 'pjump'.
- =cut
- ##################################################
- ##################################################
  sub plink {
      my ($type,$dis,$value,$marker,$return,$call)=@_;
      my $winvalue=$value;
- Line 593  sub plink {
+ Line 834  sub plink {
      my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
      my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
      unless (defined($winvalue)) { $winvalue=$val; }
-     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$marker.'" /></td></tr><tr><td align="center">'.
+     my $valout = &valout($value,$type,1);
+     my $unencmarker = $marker;
+     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
+ 		      \$hour, \$min, \$sec) {
+ 	$$item = &HTML::Entities::encode($$item,'"<>&');
+ 	$$item =~ s/\'/\\\'/g;
+     }
+     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
  	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
  	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
- 		&valout($value,$type,1).'</a></td></tr></table>';
+ 	    $valout.'</a></td></tr></table>';
  }
  sub page_js {
- Line 656  sub startpage {
+ Line 904  sub startpage {
      my %loaditems = ('onunload' => "pclose()",
  		     'onload'   => "group_or_section('cgroup')",);
-     my $start_page =
+     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+ 	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+ 	&Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+ 	    text=>"Problem Parameters"});
+     } else {
+ 	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+ 	   text=>"Table Mode",
+ 	   help => 'Course_Setting_Parameters'});
+     }
+     my $start_page =
  	&Apache::loncommon::start_page('Set/Modify Course Parameters',
  				       &page_js(),
  				       {'add_entries' => \%loaditems,});
      my $breadcrumbs =
  	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
      $r->print(<<ENDHEAD);
  $start_page
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=settable" name="parmform">
- <input type="hidden" value='' name="pres_value" />
+ <input type="hidden" value="" name="pres_value" />
- <input type="hidden" value='' name="pres_type" />
+ <input type="hidden" value="" name="pres_type" />
- <input type="hidden" value='' name="pres_marker" />
+ <input type="hidden" value="" name="pres_marker" />
- <input type="hidden" value='1' name="prevvisit" />
+ <input type="hidden" value="1" name="prevvisit" />
  ENDHEAD
  }
- Line 692  sub print_row {
+ Line 949  sub print_row {
  # cascade down manually
      my $cascadetype=$$defaulttype{$which};
      for (my $i=14;$i>0;$i--) {
  	 if ($typeoutpar[$i]) {
              $cascadetype=$typeoutpar[$i];
  	} else {
              $typeoutpar[$i]=$cascadetype;
- Line 701  sub print_row {
+ Line 958  sub print_row {
      my $parm=$$display{$which};
      if ($parmlev eq 'full') {
-         $r->print('<td bgcolor='.$defbgtwo.' align="center">'
+         $r->print('<td style="background-color:'.$defbgtwo.';" align="center">'
                    .$$part{$which}.'</td>');
      } else {
          $parm=~s|\[.*\]\s||g;
      }
      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
      if ($automatic) {
  	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
      }
-     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
+     $r->print('<td>'.$parm.'</td>');
      my $thismarker=$which;
      $thismarker=~s/^parameter\_//;
      my $mprefix=$rid.'&'.$thismarker.'&';
- Line 725  sub print_row {
+ Line 982  sub print_row {
          } elsif ($cgroup) {
              &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } elsif ($csec) {
              &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } else {
              &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          }
      } elsif ($parmlev eq 'map') {
- Line 764  sub print_row {
+ Line 1021  sub print_row {
  	&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	if ($csec) {
  	    &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	    &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
- Line 776  sub print_row {
+ Line 1033  sub print_row {
              &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
              &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          }
  	if ($uname) {
              if ($othergrp) {
                  $r->print($othergrp);
- Line 787  sub print_row {
+ Line 1044  sub print_row {
  	}
      } # end of $parmlev if/else
-     $r->print('<td bgcolor="#CCCCFF" align="center">'.$effective_parm.'</td>');
+     $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
      if ($parmlev eq 'full') {
          my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                          '.'.$$name{$which},$$symbp{$rid});
          my $sessionvaltype=$typeoutpar[$result];
          if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
-         $r->print('<td bgcolor="#999999" align="center"><font color="#FFFFFF">'.
+         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
                    &valout($sessionval,$sessionvaltype).'&nbsp;'.
                    '</font></td>');
      }
- Line 804  sub print_row {
+ Line 1061  sub print_row {
  sub print_td {
      my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
-     $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
+     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
-               ' align="center">');
+               ';" align="center">');
-     if ($which<11 || $which > 12) {
+     my $nolink = 0;
- 	$r->print(&plink($$typeoutpar[$which],
+     if ($which == 11 || $which == 12) {
- 			 $$display{$value},$$outpar[$which],
+         $nolink = 1;
- 			 $mprefix."$which",'parmform.pres','psub'));
+     } elsif ($mprefix =~ /availablestudent\&$/) {
+         if ($which > 3) {
+             $nolink = 1;
+         }
+     }
+     if ($nolink) {
+         $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
      } else {
- 	$r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+         $r->print(&plink($$typeoutpar[$which],
+                          $$display{$value},$$outpar[$which],
+                          $mprefix."$which",'parmform.pres','psub'));
      }
      $r->print('</td>'."\n");
  }
- Line 829  sub print_usergroups {
+ Line 1094  sub print_usergroups {
                                                                     $courseopt);
      my $bgcolor = $defbg;
      my $grp_parm;
      if (($coursereply) && ($cgroup ne $resultgroup)) {
          if ($result > 3) {
-             $bgcolor = '"#AAFFAA"';
+             $bgcolor = '#AAFFAA';
              $grp_parm = &valout($coursereply,$resulttype);
          }
          $grp_parm = &valout($coursereply,$resulttype);
-         $output = '<td bgcolor='.$bgcolor.' align="center">';
+         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
          if ($resultgroup && $resultlevel) {
              $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
          } else {
- Line 843  sub print_usergroups {
+ Line 1108  sub print_usergroups {
          }
          $output .= '</td>';
      } else {
-         $output .= '<td bgcolor='.$bgcolor.'>&nbsp;</td>';
+         $output .= '<td style="background-color:'.$bgcolor.';">&nbsp;</td>';
      }
      return ($coursereply,$output,$grp_parm,$resultgroup);
  }
- Line 872  sub parm_control_group {
+ Line 1137  sub parm_control_group {
      return($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
  }
- =pod
- =item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
- Input: See list below:
- =over 4
- =item B<ids>: An array that will contain all of the ids in the course.
- =item B<typep>: hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
- =item B<keyp>: hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
- =item B<allparms>: hash, name of parameter->display value (what is the display value?)
- =item B<allparts>: hash, part identification->text representation of part, where the text representation is "[Part $part]"
- =item B<allkeys>: hash, full key to part->display value (what's display value?)
- =item B<allmaps>: hash, ???
- =item B<fcat>: ???
- =item B<defp>: hash, ???
- =item B<mapp>: ??
- =item B<symbp>: hash, id->full sym?
- =back
- =cut
  sub extractResourceInformation {
      my $ids = shift;
- Line 934  sub extractResourceInformation {
+ Line 1167  sub extractResourceInformation {
  	$$typep{$id}=$1;
  	$$keyp{$id}='';
          $$uris{$id}=$srcf;
- 	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+ 	foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
- 	    if ($_=~/^parameter\_(.*)/) {
+ 	    next if ($key!~/^parameter_/);
- 		my $key=$_;
  # Hidden parameters
- 		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {
+ 	    next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');
- 		    next;
- 		}
- 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
- 		my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
- 		my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
  #
  # allparms is a hash of parameter names
  #
- 		my $parmdis = $display;
+ 	    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
- 		$parmdis =~ s/\[Part.*$//g;
+ 	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
-                 $$allparms{$name}=$parmdis;
+ 		my ($display,$parmdis);
- 		$$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		$display = &standard_parameter_names($name);
+ 		if ($display eq '') {
+ 		    $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+ 		    $parmdis = $display;
+ 		    $parmdis =~ s/\s*\[Part.*$//g;
+ 		} else {
+ 		    $parmdis = $display;
+ 		}
+ 		$$allparms{$name}=$parmdis;
+ 		if (ref($defkeytype)) {
+ 		    $$defkeytype{$name}=
+ 			&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		}
+ 	    }
  #
  # allparts is a hash of all parts
  #
- 		$$allparts{$part} = "Part: $part";
+ 	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+ 	    $$allparts{$part} = &mt('Part: [_1]',$part);
  #
  # Remember all keys going with this resource
  #
- 		if ($$keyp{$id}) {
+ 	    if ($$keyp{$id}) {
- 		    $$keyp{$id}.=','.$key;
+ 		$$keyp{$id}.=','.$key;
- 		} else {
+ 	    } else {
- 		    $$keyp{$id}=$key;
+ 		$$keyp{$id}=$key;
- 		}
+ 	    }
  #
  # Put in order
  #
-                 unless ($$keyorder{$key}) {
+ 	    unless ($$keyorder{$key}) {
-                     $$keyorder{$key}=$keyordercnt;
+ 		$$keyorder{$key}=$keyordercnt;
-                     $keyordercnt++;
+ 		$keyordercnt++;
- 		}
  	    }
  	}
- 	$$mapp{$id}=
- 	    &Apache::lonnet::declutter($resource->enclosing_map_src());
- 	$$mapp{$mapid}=$$mapp{$id};
+ 	if (!exists($$mapp{$mapid})) {
- 	$$allmaps{$mapid}=$$mapp{$id};
+ 	    $$mapp{$id}=
- 	if ($mapid eq '1') {
+ 		&Apache::lonnet::declutter($resource->enclosing_map_src());
- 	    $$maptitles{$mapid}='Main Course Documents';
+ 	    $$mapp{$mapid}=$$mapp{$id};
+ 	    $$allmaps{$mapid}=$$mapp{$id};
+ 	    if ($mapid eq '1') {
+ 		$$maptitles{$mapid}=&mt('Main Course Documents');
+ 	    } else {
+ 		$$maptitles{$mapid}=
+ 		    &Apache::lonnet::gettitle($$mapp{$id});
+ 	    }
+ 	    $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+ 	    $$symbp{$mapid}=$$mapp{$id}.'___(all)';
  	} else {
- 	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+ 	    $$mapp{$id} = $$mapp{$mapid};
  	}
- 	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
  	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
- 	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
      }
  }
- ##################################################
- ##################################################
  sub isdateparm {
      my $type=shift;
- Line 1037  sub parmmenu {
+ Line 1283  sub parmmenu {
  	checkthis('contentopen','pscat');
   	checkthis('contentclose','pscat');
      }
      function checkvisi() {
  	checkthis('hiddenresource','pscat');
- Line 1063  sub parmmenu {
+ Line 1309  sub parmmenu {
  </script>
  ENDSCRIPT
      $r->print();
-     $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
+     $r->print("\n".'<table id="LC_parm_overview_parm_menu"><tr>');
      my $cnt=0;
      foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
- 	$r->print("\n<td><label><input type='checkbox' name='pscat' ");
+ 	$r->print("\n".'<td><label><input type="checkbox" name="pscat" ');
  	$r->print('value="'.$tempkey.'"');
  	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
- 	    $r->print(' checked');
+ 	    $r->print(' checked="checked"');
  	}
- 	$r->print('>'.$$allparms{$tempkey}.'</label></td>');
+         $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                   : $tempkey)
+                   .'</label></td>');
   	$cnt++;
          if ($cnt==3) {
  	    $r->print("</tr>\n<tr>");
  	    $cnt=0;
  	}
      }
-     $r->print('
+     $r->print('</tr>'
- </tr><tr id=\"LC_parm_overview_parm_menu_selectors\"><td>
+              .'<tr id="LC_parm_overview_parm_menu_selectors">'
- <a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
+              .'<td valign="top">'
- <a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
+              .'<fieldset><legend><b>'.&mt('Parameter Selection').'</b></legend>'
- </td><td>
+              .'<span class="LC_nobreak">'
- <a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
+              .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
- <a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
+              .'</span>'
- <a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
+              .'<br />'
- <a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
+              .'<span class="LC_nobreak">'
- <a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
+              .'&bull; <a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>'
- </td><td>
+              .'</span>'
- <a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
+              .'<br />'
- </td>
+              .'<span class="LC_nobreak">'
- ');
+              .'&bull; <a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>'
-     $r->print('</tr></table>');
+              .'</span>'
+              .'</fieldset>'
+              .'</td>'
+              .'<td colspan="2" valign="top">'
+              .'<fieldset><legend><b>'.&mt('Add Selection for...').'</b></legend>'
+              .'<span class="LC_nobreak">'
+              .'&bull; <a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>'
+              .'</span>'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>'
+              .'</span>'
+ #            .'<br />'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>'
+              .'</span>'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>'
+              .'</span>'
+ #            .'<br />'
+              .'<span class="LC_nobreak">'
+              .' &bull; <a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>'
+              .'</span>'
+              .'</fieldset>'
+              .'</td>'
+              .'</tr></table>'
+     );
  }
  sub partmenu {
      my ($r,$allparts,$psprt)=@_;
-     $r->print('<select multiple name="psprt" size="8">');
+     $r->print('<select multiple="multiple" name="psprt" size="8">');
      $r->print('<option value="all"');
-     $r->print(' selected') unless (@{$psprt});
+     $r->print(' selected="selected"') unless (@{$psprt});
      $r->print('>'.&mt('All Parts').'</option>');
      my %temphash=();
      foreach (@{$psprt}) { $temphash{$_}=1; }
- Line 1109  sub partmenu {
+ Line 1384  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 1122  sub usermenu {
+ Line 1397  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 $sections='';
      my %sectionhash = &Apache::loncommon::get_sections();
      my $groups;
      my %grouphash = &Apache::longroup::coursegroups();
+     my $g_s_header='';
+     my $g_s_footer='';
      if (%sectionhash) {
-         $sections=$lt{'se'}.': <select name="csec"';
+         $sections=&mt('Section:').' <select name="csec"';
          if (%grouphash && $parmlev ne 'full') {
              $sections .= qq| onchange="group_or_section('csec')" |;
          }
- Line 1148  sub usermenu {
+ Line 1420  sub usermenu {
          }
          $sections.='</select>';
      }
      if (%sectionhash && %grouphash && $parmlev ne 'full') {
-         $sections .= '&nbsp;or&nbsp;';
+         $sections .= '&nbsp;'.&mt('or').'&nbsp;';
          $sections .= qq|
  <script type="text/javascript">
  function group_or_section(caller) {
- Line 1173  function group_or_section(caller) {
+ Line 1446  function group_or_section(caller) {
  }
  </script>
  |;
      }
      if (%grouphash) {
-         $groups=$lt{'gr'}.': <select name="cgroup"';
+         $groups=&mt('Group:').' <select name="cgroup"';
          if (%sectionhash && $env{'form.action'} eq 'settable') {
              $groups .= qq| onchange="group_or_section('cgroup')" |;
          }
- Line 1198  function group_or_section(caller) {
+ Line 1471  function group_or_section(caller) {
          }
          $groups.='</select>';
      }
-     $r->print(<<ENDMENU);
- <b>
+     if (%sectionhash || %grouphash) {
- $sections
+         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
- $groups
+         $r->print($sections.$groups);
- <br />
+         $r->print(&Apache::lonhtmlcommon::row_closure());
- $lt{'fu'}
+     }
- <input type="text" value="$uname" size="12" name="uname" />
- $lt{'oi'}
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
- <input type="text" value="$id" size="12" name="id" />
+     $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
- $lt{'ad'}
+                  ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
- $chooseopt
+                  ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
- </b>
+                  ,$chooseopt));
- ENDMENU
  }
  sub displaymenu {
      my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
-     $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
+     $r->print(&Apache::lonhtmlcommon::topic_bar (2,&mt('Select Parameters')));
- 	     &mt('Select Parts to View').'</th></tr><tr><td>');
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
      &parmmenu($r,$allparms,$pscat,$keyorder);
-     $r->print('</td><td>');
+     $r->print(&Apache::lonhtmlcommon::row_closure());
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
      &partmenu($r,$allparts,$psprt);
-     $r->print('</td></tr></table>');
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
  }
  sub mapmenu {
      my ($r,$allmaps,$pschp,$maptitles)=@_;
-     $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder')));
      $r->print('<select name="pschp">');
      $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
      foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
  	$r->print('<option value="'.$_.'"');
- 	if (($pschp eq $_)) { $r->print(' selected'); }
+ 	if (($pschp eq $_)) { $r->print(' selected="selected"'); }
  	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
      }
      $r->print("</select>");
  }
  sub levelmenu {
      my ($r,$alllevs,$parmlev)=@_;
-     $r->print('<b>'.&mt('Select Parameter Level').
- 	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
      $r->print('<select name="parmlev">');
      foreach (reverse sort keys %{$alllevs}) {
  	$r->print('<option value="'.$$alllevs{$_}.'"');
  	if ($parmlev eq $$alllevs{$_}) {
- 	    $r->print(' selected');
+ 	    $r->print(' selected="selected"');
  	}
- 	$r->print('>'.$_.'</option>');
+ 	$r->print('>'.&mt($_).'</option>');
      }
      $r->print("</select>");
  }
- Line 1257  sub sectionmenu {
+ Line 1534  sub sectionmenu {
      my %sectionhash = &Apache::loncommon::get_sections();
      return if (!%sectionhash);
-     $r->print('<select name="Section" multiple="true" size="8" >');
+     $r->print('<select name="Section" multiple="multiple" size="8">');
      foreach my $s ('all',sort keys %sectionhash) {
  	$r->print('    <option value="'.$s.'"');
  	foreach (@{$selectedsections}) {
  	    if ($s eq $_) {
- 		$r->print(' selected');
+ 		$r->print(' selected="selected"');
  		last;
  	    }
  	}
- Line 1276  sub groupmenu {
+ Line 1553  sub groupmenu {
      my %grouphash = &Apache::longroup::coursegroups();
      return if (!%grouphash);
-     $r->print('<select name="Group" multiple="true" size="8" >');
+     $r->print('<select name="Group" multiple="multiple" size="8">');
      foreach my $group (sort(keys(%grouphash))) {
  	$r->print('    <option value="'.$group.'"');
  	foreach (@{$selectedgroups}) {
  	    if ($group eq $_) {
- 		$r->print(' selected');
+ 		$r->print(' selected="selected"');
  		last;
  	    }
  	}
- Line 1326  sub sortmenu {
+ Line 1603  sub sortmenu {
      my ($r,$sortorder)=@_;
      $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
      if ($sortorder eq 'realmstudent') {
-        $r->print(' checked="on"');
+        $r->print(' checked="checked"');
      }
      $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
      $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
      if ($sortorder eq 'studentrealm') {
-        $r->print(' checked="on"');
+        $r->print(' checked="checked"');
      }
      $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
  	      '</label>');
- Line 1360  sub standardkeyorder {
+ Line 1637  sub standardkeyorder {
              'parameter_0_discusshide' => 20);
  }
- ##################################################
- ##################################################
- =pod
- =item assessparms
- Show assessment data and parameters.  This is a large routine that should
- be simplified and shortened... someday.
- Inputs: $r
- Returns: nothing
- Variables used (guessed by Jeremy):
- =over 4
- =item B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
- =item B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
- =item B<allmaps>:
- =back
- =cut
- ##################################################
- ##################################################
  sub assessparms {
      my $r=shift;
- Line 1413  sub assessparms {
+ Line 1661  sub assessparms {
      my $csec;
      my $cgroup;
      my @usersgroups = ();
      my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
      $alllevs{'Resource Level'}='full';
- Line 1450  sub assessparms {
+ Line 1698  sub assessparms {
      my $pssymb='';
      my $parmlev='';
      unless ($env{'form.parmlev'}) {
          $parmlev = 'map';
      } else {
- Line 1501  sub assessparms {
+ Line 1749  sub assessparms {
          } else {
  	    $csec=&Apache::lonnet::getsection($udom,$uname,
  					      $env{'request.course.id'});
  	    if ($csec eq '-1') {
  		$message='<span class="LC_error">'.
  		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
- Line 1531  sub assessparms {
+ Line 1779  sub assessparms {
      unless ($cgroup) { $cgroup=''; }
  # --------------------------------------------------------- Get all assessments
      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
  				\%mapp, \%symbp,\%maptitles,\%uris,
  				\%keyorder);
- Line 1544  sub assessparms {
+ Line 1792  sub assessparms {
          my @values=split(/\&\&\&/,$env{'form.pres_value'});
          my @types=split(/\&\&\&/,$env{'form.pres_type'});
  	for (my $i=0;$i<=$#markers;$i++) {
+             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+                 my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 my (@ok_slots,@fail_slots,@del_slots);
+                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+                 my ($level,@all) =
+                     &parmval_by_symb('0.availablestudent',$pssymb,'',$uname,$udom,
+                                      $csec,$cgroup,$courseopt);
+                 foreach my $slot_name (split(/:/,$values[$i])) {
+                     next if ($slot_name eq '');
+                     if (&update_slots($slot_name,$cdom,$cnum,$pssymb,$uname,$udom) eq 'ok') {
+                         push(@ok_slots,$slot_name);
+                     } else {
+                         push(@fail_slots,$slot_name);
+                     }
+                 }
+                 if (@ok_slots) {
+                     $values[$i] = join(':',@ok_slots);
+                 } else {
+                     $values[$i] = '';
+                 }
+                 if ($all[$level] ne '') {
+                     my @existing = split(/:/,$all[$level]);
+                     foreach my $slot_name (@existing) {
+                         if (!grep(/^\Q$slot_name\E$/,split(/:/,$values[$i]))) {
+                             if (&delete_slots($slot_name,$cdom,$cnum,$uname,$udom,$pssymb) eq 'ok') {
+                                 push(@del_slots,$slot_name);
+                             }
+                         }
+                     }
+                 }
+             }
  	    $message.=&storeparm(split(/\&/,$markers[$i]),
  				 $values[$i],
  				 $types[$i],
- Line 1554  sub assessparms {
+ Line 1835  sub assessparms {
      }
  #----------------------------------------------- if all selected, fill in array
      if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
      if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries') };
      if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
  # ------------------------------------------------------------------ Start page
- Line 1563  sub assessparms {
+ Line 1844  sub assessparms {
      foreach ('tolerance','date_default','date_start','date_end',
  	     'date_interval','int','float','string') {
  	$r->print('<input type="hidden" value="'.
- 		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'" />');
+ 		  &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
+ 		  '" name="recent_'.$_.'" />');
      }
      if (!$pssymb) {
-         $r->print('<table border="1"><tr><td>');
+         $r->print(&Apache::lonhtmlcommon::topic_bar (1,&mt('General Parameters')));
+         $r->print(&Apache::lonhtmlcommon::start_pick_box());
          &levelmenu($r,\%alllevs,$parmlev);
  	if ($parmlev ne 'general') {
-             $r->print('<td>');
+             $r->print(&Apache::lonhtmlcommon::row_closure());
  	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
- 	    $r->print('</td>');
  	}
-         $r->print('</td></tr></table>');
+         $r->print(&Apache::lonhtmlcommon::row_closure(1));
+         $r->print(&Apache::lonhtmlcommon::end_pick_box());
  	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
      } else {
          my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
- Line 1584  sub assessparms {
+ Line 1871  sub assessparms {
  		  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
  		  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
      }
-     &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+     $r->print(&Apache::lonhtmlcommon::topic_bar (3,&mt('User Selection')));
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
+     &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
      $r->print('<p>'.$message.'</p>');
- Line 1609  sub assessparms {
+ Line 1901  sub assessparms {
             my $userspan=3;
             if ($cgroup ne '') {
                $coursespan += 3;
             }
-            $r->print('<p><table border=2>');
+            $r->print('<p><table border="2">');
-            $r->print('<tr><td colspan=5></td>');
+            $r->print('<tr><td colspan="5"></td>');
-            $r->print('<th colspan='.($coursespan).'>'.&mt('Any User').'</th>');
+            $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
             if ($uname) {
                 if (@usersgroups > 1) {
                     $userspan ++;
- Line 1639  sub assessparms {
+ Line 1931  sub assessparms {
  				  'fr'     => 'for Resource'
  					      );
             $r->print(<<ENDTABLETWO);
- <th rowspan=3>$lt{'pie'}</th>
+ <th rowspan="3">$lt{'pie'}</th>
- <th rowspan=3>$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
+ <th rowspan="3">$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
- </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
+ </tr><tr><td colspan="5"></td><th colspan="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
- <th colspan=1>$lt{'ic'}</th>
+ <th colspan="1">$lt{'ic'}</th>
  ENDTABLETWO
             if ($csec) {
-                 $r->print("<th colspan=3>".
+                 $r->print('<th colspan="3">'.
  			  &mt("in Section")." $csec</th>");
             }
             if ($cgroup) {
-                 $r->print("<th colspan=3>".
+                 $r->print('<th colspan="3">'.
                            &mt("in Group")." $cgroup</th>");
             }
             $r->print(<<ENDTABLEHEADFOUR);
- Line 1686  ENDTABLEHEADFOUR
+ Line 1978  ENDTABLEHEADFOUR
                  my $rid=$_;
                  my ($inmapid)=($rid=~/\.(\d+)$/);
                  if ((!$pssymb &&
  		     (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
  		    ||
  		    ($pssymb && $pssymb eq $symbp{$rid})) {
  # ------------------------------------------------------ Entry for one resource
-                     if ($defbgone eq '"#E0E099"') {
+                     if ($defbgone eq '#E0E099') {
-                         $defbgone='"#E0E0DD"';
+                         $defbgone='#E0E0DD';
                      } else {
-                         $defbgone='"#E0E099"';
+                         $defbgone='#E0E099';
                      }
-                     if ($defbgtwo eq '"#FFFF99"') {
+                     if ($defbgtwo eq '#FFFF99') {
-                         $defbgtwo='"#FFFFDD"';
+                         $defbgtwo='#FFFFDD';
                      } else {
-                         $defbgtwo='"#FFFF99"';
+                         $defbgtwo='#FFFF99';
                      }
-                     if ($defbgthree eq '"#FFBB99"') {
+                     if ($defbgthree eq '#FFBB99') {
-                         $defbgthree='"#FFBBDD"';
+                         $defbgthree='#FFBBDD';
                      } else {
-                         $defbgthree='"#FFBB99"';
+                         $defbgthree='#FFBB99';
                      }
                      my $thistitle='';
- Line 1721  ENDTABLEHEADFOUR
+ Line 2013  ENDTABLEHEADFOUR
                          if (grep $_ eq $tempkeyp, @catmarker) {
                            $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
                            $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
-                           $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
+                           my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
+                           if ($allparms{$name{$_}} ne '') {
+                               my $identifier;
+                               if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                   $identifier = $1;
+                               }
+                               $display{$_} = $allparms{$name{$_}}.$identifier;
+                           } else {
+                               $display{$_} = $parmdis;
+                           }
                            unless ($display{$_}) { $display{$_}=''; }
                            $display{$_}.=' ('.$name{$_}.')';
                            $default{$_}=&Apache::lonnet::metadata($uri,$_);
- Line 1733  ENDTABLEHEADFOUR
+ Line 2034  ENDTABLEHEADFOUR
                      if ($totalparms>0) {
                          my $firstrow=1;
  			my $title=&Apache::lonnet::gettitle($symbp{$rid});
-                         $r->print('<tr><td bgcolor='.$defbgone.
+                         $r->print('<tr><td style="background-color:'.$defbgone.';"'.
                               ' rowspan='.$totalparms.
-                              '><tt><font size=-1>'.
+                              '><tt><font size="-1">'.
                               join(' / ',split(/\//,$uri)).
                               '</font></tt><p><b>'.
                               "<a href=\"javascript:openWindow('".
- Line 1748  ENDTABLEHEADFOUR
+ Line 2049  ENDTABLEHEADFOUR
                              $r->print(' ('.$thistitle.')');
                          }
                          $r->print('</a></b></td>');
-                         $r->print('<td bgcolor='.$defbgtwo.
+                         $r->print('<td style="background-color:'.$defbgtwo.';"'.
                                        ' rowspan='.$totalparms.'>'.$typep{$rid}.
                                        '</td>');
-                         $r->print('<td bgcolor='.$defbgone.
+                         $r->print('<td style="background-color:'.$defbgone.';"'.
                                        ' rowspan='.$totalparms.
                                        '>'.$maptitles{$mapp{$rid}}.'</td>');
- Line 1775  ENDTABLEHEADFOUR
+ Line 2076  ENDTABLEHEADFOUR
          } # end of  full
  #--------------------------------------------------- Entry for parm level map
          if ($parmlev eq 'map') {
-             my $defbgone = '"E0E099"';
+             my $defbgone = '#E0E099';
-             my $defbgtwo = '"FFFF99"';
+             my $defbgtwo = '#FFFF99';
-             my $defbgthree = '"FFBB99"';
+             my $defbgthree = '#FFBB99';
              my %maplist;
              if ($pschp eq 'all') {
                  %maplist = %allmaps;
              } else {
                  %maplist = ($pschp => $mapp{$pschp});
              }
- Line 1802  ENDTABLEHEADFOUR
+ Line 2103  ENDTABLEHEADFOUR
                  my $map = 0;
  #		$r->print("Catmarker: @catmarker<br />\n");
                  foreach (@ids) {
                    ($map)=(/([\d]*?)\./);
                    my $rid = $_;
  #                  $r->print("$mapid:$map:   $rid <br /> \n");
                    if ($map eq $mapid) {
- Line 1824  ENDTABLEHEADFOUR
+ Line 2125  ENDTABLEHEADFOUR
                        my $tempkeyp = $_;
                        my $fullkeyp = $tempkeyp;
                        $tempkeyp =~ s/_\w+_/_0_/;
                        if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                          $part{$tempkeyp}="0";
                          $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                         $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                         my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                         if ($allparms{$name{$tempkeyp}} ne '') {
+                             my $identifier;
+                             if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                 $identifier = $1;
+                             }
+                             $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                         } else {
+                             $display{$tempkeyp} = $parmdis;
+                         }
                          unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                          $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
                          $display{$tempkeyp} =~ s/_\w+_/_0_/;
- Line 1838  ENDTABLEHEADFOUR
+ Line 2148  ENDTABLEHEADFOUR
                      } # end loop through keys
                    }
                  } # end loop through ids
  #---------------------------------------------------- print header information
                  my $foldermap=&mt($maptitle=~/^uploaded/?'Folder':'Map');
                  my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
-                 $r->print(<<ENDMAPONE);
+                 my $tmp="";
- <center><h4>
- Set Defaults for All Resources in $foldermap<br />
- <font color="red"><i>$showtitle</i></font><br />
- Specifically for
- ENDMAPONE
                  if ($uname) {
  		    my $person=&Apache::loncommon::plainname($uname,$udom);
-                     $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
+                     $tmp.=&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
-                         &mt('in')." \n");
+                         &mt('in')." \n";
                  } else {
-                     $r->print("<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n");
+                     $tmp.="<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n";
                  }
                  if ($cgroup) {
-                     $r->print(&mt("Group")." <font color=\"red\"><i>$cgroup".
+                     $tmp.=&mt("Group")." <font color=\"red\"><i>$cgroup".
-                               "</i></font> ".&mt('of')." \n");
+                               "</i></font> ".&mt('of')." \n";
                      $csec = '';
                  } elsif ($csec) {
-                     $r->print(&mt("Section")." <font color=\"red\"><i>$csec".
+                     $tmp.=&mt("Section")." <font color=\"red\"><i>$csec".
-                               "</i></font> ".&mt('of')." \n");
+                               "</i></font> ".&mt('of')." \n";
                  }
-                 $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
+                 $r->print('<div align="center"><h4>'
-                 $r->print("</h4>\n");
+                          .&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
+                              ,$foldermap.'<br /><font color="red"><i>'.$showtitle.'</i></font><br />'
+                              ,$tmp
+                              ,'<font color="red"><i>'.$coursename.'</i></font>'
+                              )
+                          ."<br /></h4>\n"
+                 );
  #---------------------------------------------------------------- print table
-                 $r->print('<p><table border="2">');
+                 $r->print('<p>'.&Apache::loncommon::start_data_table()
-                 $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
+                          .&Apache::loncommon::start_data_table_header_row()
-                 $r->print('<th>'.&mt('Default Value').'</th>');
+                          .'<th>'.&mt('Parameter Name').'</th>'
-                 $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+                          .'<th>'.&mt('Default Value').'</th>'
+                          .'<th>'.&mt('Parameter in Effect').'</th>'
+                          .&Apache::loncommon::end_data_table_header_row()
+                 );
  	        foreach (&keysinorder(\%name,\%keyorder)) {
-                     $r->print('<tr>');
+                     $r->print(&Apache::loncommon::start_data_table_row());
                      &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                             \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                             $parmlev,$uname,$udom,$csec,$cgroup);
                  }
-                 $r->print("</table></center>");
+                 $r->print(&Apache::loncommon::end_data_table().'</p>'
+                          .'</div>'
+                 );
              } # end each map
          } # end of $parmlev eq map
  #--------------------------------- Entry for parm level general (Course level)
          if ($parmlev eq 'general') {
-             my $defbgone = '"E0E099"';
+             my $defbgone = '#E0E099';
-             my $defbgtwo = '"FFFF99"';
+             my $defbgtwo = '#FFFF99';
-             my $defbgthree = '"FFBB99"';
+             my $defbgthree = '#FFBB99';
  #-------------------------------------------- for each map, gather information
              my $mapid="0.0";
- Line 1895  ENDMAPONE
+ Line 2211  ENDMAPONE
              my %display = ();
              my %type = ();
              my %default = ();
              foreach (@ids) {
                  my $rid = $_;
                  my $uri=&Apache::lonnet::declutter($uris{$rid});
  #--------------------------------------------------------------------
- Line 1915  ENDMAPONE
+ Line 2231  ENDMAPONE
                    if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                      $part{$tempkeyp}="0";
                      $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                     $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                     my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                     if ($allparms{$name{$tempkeyp}} ne '') {
+                         my $identifier;
+                         if ($parmdis =~ /(\s*\[Part.*)$/) {
+                             $identifier = $1;
+                         }
+                         $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                     } else {
+                         $display{$tempkeyp} = $parmdis;
+                     }
                      unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                      $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
                      $display{$tempkeyp} =~ s/_\w+_/_0_/;
- Line 1924  ENDMAPONE
+ Line 2249  ENDMAPONE
                    }
                  } # end loop through keys
              } # end loop through ids
  #---------------------------------------------------- print header information
  	    my $setdef=&mt("Set Defaults for All Resources in Course");
              $r->print(<<ENDMAPONE);
- <center><h4>$setdef
+ <center>
+ <h4>$setdef
  <font color="red"><i>$coursename</i></font><br />
  ENDMAPONE
              if ($uname) {
- Line 1937  ENDMAPONE
+ Line 2263  ENDMAPONE
              } else {
                  $r->print("<i><font color=\"red\"> ".&mt("ALL")."</i> ".&mt("USERS")."</font> \n");
              }
              if ($csec) {$r->print(&mt("Section")."<font color=\"red\"> <i>$csec</i></font>\n")};
              if ($cgroup) {$r->print(&mt("Group")."<font color=\"red\"> <i>$cgroup</i></font>\n")};
              $r->print("</h4>\n");
  #---------------------------------------------------------------- print table
-             $r->print('<p><table border="2">');
+             $r->print('<p>'.&Apache::loncommon::start_data_table()
-             $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
+                      .&Apache::loncommon::start_data_table_header_row()
-             $r->print('<th>'.&mt('Default Value').'</th>');
+                      .'<th>'.&mt('Parameter Name').'</th>'
-             $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+                      .'<th>'.&mt('Default Value').'</th>'
+                      .'<th>'.&mt('Parameter in Effect').'</th>'
+                      .&Apache::loncommon::end_data_table_header_row()
+             );
  	    foreach (&keysinorder(\%name,\%keyorder)) {
-                 $r->print('<tr>');
+                 $r->print(&Apache::loncommon::start_data_table_row());
                  &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                         \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                                     $parmlev,$uname,$udom,$csec,$cgroup);
              }
-             $r->print("</table></center>");
+             $r->print(&Apache::loncommon::end_data_table()
+                      .'</p>'
+                      .'</center>'
+             );
          } # end of $parmlev eq general
      }
      $r->print('</form>'.&Apache::loncommon::end_page());
  } # end sub assessparms
- ##################################################
- ##################################################
- =pod
- =item crsenv
- Show and set course data and parameters.  This is a large routine that should
- be simplified and shortened... someday.
- Inputs: $r
- Returns: nothing
- =cut
- ##################################################
- ##################################################
- sub crsenv {
-     my $r=shift;
-     my $setoutput='';
-     my $breadcrumbs =
- 	&Apache::lonhtmlcommon::breadcrumbs('Edit Course Environment');
-     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-     #
-     # Go through list of changes
-     foreach (keys %env) {
-         next if ($_!~/^form\.(.+)\_setparmval$/);
-         my $name  = $1;
-         my $value = $env{'form.'.$name.'_value'};
-         if ($name eq 'newp') {
-             $name = $env{'form.newp_name'};
-         }
-         if ($name eq 'url') {
-             $value=~s/^\/res\///;
-             my $bkuptime=time;
-             my @tmp = &Apache::lonnet::get
-                 ('environment',['url'],$dom,$crs);
-             $setoutput.=&mt('Backing up previous URL').': '.
-                 &Apache::lonnet::put
-                 ('environment',
-                  {'top level map backup '.$bkuptime => $tmp[1] },
-                  $dom,$crs).
-                      '<br />';
-         }
-         #
-         # Deal with modified default spreadsheets
-         if ($name =~ /^spreadsheet_default_(classcalc|
-                                             studentcalc|
-                                             assesscalc)$/x) {
-             my $sheettype = $1;
-             if ($sheettype eq 'classcalc') {
-                 # no need to do anything since viewing the sheet will
-                 # cause it to be updated.
-             } elsif ($sheettype eq 'studentcalc') {
-                 # expire all the student spreadsheets
-                 &Apache::lonnet::expirespread('','','studentcalc');
-             } else {
-                 # expire all the assessment spreadsheets
-                 #    this includes non-default spreadsheets, but better to
-                 #    be safe than sorry.
-                 &Apache::lonnet::expirespread('','','assesscalc');
-                 # expire all the student spreadsheets
-                 &Apache::lonnet::expirespread('','','studentcalc');
-             }
-         }
-         #
-         # Deal with the enrollment dates
-         if ($name =~ /^default_enrollment_(start|end)_date$/) {
-             $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
-         }
-         # Get existing cloners
-         my @oldcloner = ();
-         if ($name eq 'cloners') {
-             my %clonenames=&Apache::lonnet::dump('environment',$dom,$crs,'cloners');
-             if ($clonenames{'cloners'} =~ /,/) {
-                 @oldcloner = split/,/,$clonenames{'cloners'};
-             } else {
-                 $oldcloner[0] = $clonenames{'cloners'};
-             }
-         }
-         #
-         # Let the user know we made the changes
-         if ($name && defined($value)) {
-             my $failed_cloners;
-             if ($name eq 'cloners') {
-                 $value =~ s/\s//g;
-                 $value =~ s/^,//;
-                 $value =~ s/,$//;
-                 # check requested clones are valid users.
-                 $failed_cloners = &check_cloners(\$value,\@oldcloner);
-             }
-             my $put_result = &Apache::lonnet::put('environment',
-                                                   {$name=>$value},$dom,$crs);
-             if ($put_result eq 'ok') {
-                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
-                 if ($name eq 'cloners') {
-                     &change_clone($value,\@oldcloner);
-                 }
-                 # Flush the course logs so course description is immediately updated
-                 if ($name eq 'description' && defined($value)) {
-                     &Apache::lonnet::flushcourselogs();
-                 }
-             } else {
-                 $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
- 		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
-             }
-             if (($name eq 'cloners') && ($failed_cloners)) {
-                 $setoutput.= &mt('Unable to include').' - <b>'.$failed_cloners.'</b>, '.
-                  &mt('reason').' - '.&mt('LON-CAPA user(s) do(es) not exist').
-                  '.<br />'.&mt('Please ').
-                  ' <a href="/adm/createuser">'.
-                  &mt('add the user(s)').'</a>, '.
-                  &mt('and then return to the ').
-                  '<a href="/admparmset?action=crsenv">'.
-                  &mt('Course Parameters page').'</a> '.
-                  &mt('to add the new user(s) to the list of possible cloners').
-                  '.<br />';
-             }
-         }
-     }
-     my $start_table     =&Apache::loncommon::start_data_table();
-     my $start_header_row=&Apache::loncommon::start_data_table_header_row();
-     my $end_header_row  =&Apache::loncommon::end_data_table_header_row();
- # ------------------------- Re-init course environment entries for this session
-     &Apache::lonnet::coursedescription($env{'request.course.id'},
- 				       {'freshen_cache' => 1});
- # -------------------------------------------------------- Get parameters again
-     my %values=&Apache::lonnet::dump('environment',$dom,$crs);
-     my $SelectStyleFile=&mt('Select Style File');
-     my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
-     my $output='';
-     if (! exists($values{'con_lost'})) {
-         my %descriptions=
- 	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
-                                  '<a href="javascript:openbrowser'.
-                                  "('envform','url','sequence')\">".
-                                  &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                                  &mt('Modification may make assessment data inaccessible').
-                                  '</span>',
-              'description'    => '<b>'.&mt('Course Description').'</b>',
-              'courseid'       => '<b>'.&mt('Course ID or number').
-                                  '</b><br />'.
-                                  '('.&mt('internal').', '.&mt('optional').')',
-              'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain)</tt><br />'.&mt('Users with active Course Coordinator role in the course automatically have the right to clone it, and can be omitted from list.'),
-              'grading'        => '<b>'.&mt('Grading').'</b><br />'.
-                                  '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
-              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
-                     '<a href="javascript:openbrowser'.
-                     "('envform','default_xml_style'".
-                     ",'sty')\">$SelectStyleFile</a><br />",
-              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
-                                  '</b><br />(<tt>user:domain,'.
-                                  'user:domain(section;section;...;*;...),...</tt>)',
-              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
-                                  '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
-              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
-                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
-              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
-                                  '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
-              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
-                                  '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
-                                  &mt('changes will not show until next login').')',
-              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b>'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.'),
-              'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
-                                   '</b><br />"<tt>st</tt>": '.
-                                   &mt('student').', "<tt>ta</tt>": '.
-                                   'TA, "<tt>in</tt>": '.
-                                   &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
- 	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-              'plc.users.denied' =>
-                           '<b>'.&mt('Disallow live chatroom use for Users').'</b><br />'.
-                                  '(<tt>user:domain,user:domain,...</tt>)',
-              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
-                                   '</b><br />"<tt>st</tt>": '.
-                                   'student, "<tt>ta</tt>": '.
-                                   'TA, "<tt>in</tt>": '.
-                                   'instructor;<br /><tt>role,role,...</tt>) '.
- 	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-              'pch.users.denied' =>
-                           '<b>'.&mt('Disallow Resource Discussion for Users').'</b><br />'.
-                                  '(<tt>user:domain,user:domain,...</tt>)',
-              'spreadsheet_default_classcalc'
-                  => '<b>'.&mt('Default Course Spreadsheet').'</b> '.
-                     '<a href="javascript:openbrowser'.
-                     "('envform','spreadsheet_default_classcalc'".
-                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
-              'spreadsheet_default_studentcalc'
-                  => '<b>'.&mt('Default Student Spreadsheet').'</b> '.
-                     '<a href="javascript:openbrowser'.
-                     "('envform','spreadsheet_default_calc'".
-                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
-              'spreadsheet_default_assesscalc'
-                  => '<b>'.&mt('Default Assessment Spreadsheet').'</b> '.
-                     '<a href="javascript:openbrowser'.
-                     "('envform','spreadsheet_default_assesscalc'".
-                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
- 	     'allow_limited_html_in_feedback'
- 	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
- 	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
-              'allow_discussion_post_editing'
-                  => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />"<tt>st</tt>": '.
-                                   &mt('student').', "<tt>ta</tt>": '.
-                                   'TA, "<tt>in</tt>": '.
-                                   &mt('instructor').';&nbsp;(<tt>'.&mt('role:section,role:section,..., e.g., st:001,st:002,in,cc would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').'</tt>)<br />'.
-                     '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
- 	     'rndseed'
- 	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
-                     '<span class="LC_error">'.&mt('Modifying this will make problems').' '.
-                     &mt('have different numbers and answers').'</span>',
- 	     'receiptalg'
- 	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
-                     &mt('This controls how receipt numbers are generated.'),
-              'suppress_tries'
-                  => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
-                     ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
-              'problem_stream_switch'
-                  => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
-                     ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
-              'default_paper_size'
-                  => '<b>'.&mt('Default paper type').'</b><br />'.
-                     ' ('.&mt('supported types').': Letter [8 1/2x11 in], Legal [8 1/2x14 in],'.
-                     ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'.
-                     ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
- 	     'print_header_format'
- 	         => '<b>Print header format; substitutions</b>:  %n student name %c course id %a assignment note, numbers after the % limit the field size',
-              'anonymous_quiz'
-                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
-                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
-              'default_enrollment_start_date' => '<b>'.&mt('Default beginning date for student access.').'</b>',
-              'default_enrollment_end_date'   => '<b>'.&mt('Default ending date for student access.').'</b>',
-              'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b>'.
-                                  '<br />(<tt>user:domain,user:domain,...</tt>)',
-              'languages' => '<b>'.&mt('Languages used').'</b>',
-              'disable_receipt_display'
-                  => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
-                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
- 	     'task_messages'
- 	         => '<b>'.&mt('Send message to student when clicking Done on Tasks. [_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').'</b>',
- 	     'disablesigfigs'
- 	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
-                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
- 	     'disableexampointprint'
- 	         => '<b>'.&mt('Disable automatically printing point values onto exams.').'</b><br />'.
-                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
-              'externalsyllabus'
-                  => '<b>'.&mt('URL of Syllabus (not using internal handler)').'</b>',
- 	     'tthoptions'
- 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
-              );
-         my @Display_Order = ('url','description','courseid','cloners','grading',
-                              'externalsyllabus',
-                              'default_xml_style','pageseparators',
-                              'question.email','comment.email','policy.email',
-                              'student_classlist_view',
-                              'plc.roles.denied','plc.users.denied',
-                              'pch.roles.denied','pch.users.denied',
-                              'allow_limited_html_in_feedback',
-                              'allow_discussion_post_editing',
-                              'languages',
- 			     'nothideprivileged',
-                              'rndseed',
-                              'receiptalg',
-                              'problem_stream_switch',
- 			     'suppress_tries',
-                              'default_paper_size',
- 			     'print_header_format',
-                              'disable_receipt_display',
-                              'spreadsheet_default_classcalc',
-                              'spreadsheet_default_studentcalc',
-                              'spreadsheet_default_assesscalc',
-                              'hideemptyrows',
-                              'default_enrollment_start_date',
-                              'default_enrollment_end_date',
- 			     'tthoptions',
- 			     'disablesigfigs',
- 			     'disableexampointprint',
- 			     'task_messages'
-                              );
- 	foreach my $parameter (sort(keys(%values))) {
-             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
-                 if (! $descriptions{$parameter}) {
-                     $descriptions{$parameter}=$parameter;
-                     push(@Display_Order,$parameter);
-                 }
-             }
- 	}
-         foreach my $parameter (@Display_Order) {
-             my $description = $descriptions{$parameter};
-             # onchange is javascript to automatically check the 'Set' button.
-             my $onchange = 'onFocus="javascript:window.document.forms'.
-                 "['envform'].elements['".$parameter."_setparmval']".
-                 '.checked=true;"';
-             $output .= &Apache::loncommon::start_data_table_row().
- 		'<td>'.$description.'</td>';
-             if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
-                 $output .= '<td>'.
-                     &Apache::lonhtmlcommon::date_setter('envform',
-                                                         $parameter.'_value',
-                                                         $values{$parameter},
-                                                         $onchange).
-                                                         '</td>';
-             } else {
-                 $output .= '<td>'.
-                     &Apache::lonhtmlcommon::textbox($parameter.'_value',
-                                                     $values{$parameter},
-,$onchange).'</td>';
-             }
-             $output .= '<td>'.
-                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
-                 '</td>';
-             $output .= &Apache::loncommon::end_data_table_row()."\n";
- 	}
-         my $onchange = 'onFocus="javascript:window.document.forms'.
-             '[\'envform\'].elements[\'newp_setparmval\']'.
-             '.checked=true;"';
- 	$output.=&Apache::loncommon::start_data_table_row().
- 	    '<td><i>'.&mt('Create New Environment Variable').'</i><br />'.
- 	    '<input type="text" size=40 name="newp_name" '.
-                 $onchange.' /></td><td>'.
-             '<input type="text" size=40 name="newp_value" '.
-                 $onchange.' /></td><td>'.
- 	    '<input type="checkbox" name="newp_setparmval" /></td>'.
- 	    &Apache::loncommon::end_data_table_row()."\n";
-     }
-     my %lt=&Apache::lonlocal::texthash(
- 		    'par'   => 'Parameter',
- 		    'val'   => 'Value',
- 		    'set'   => 'Set',
- 		    'sce'   => 'Set Course Environment'
- 				       );
-     my $Parameter=&mt('Parameter');
-     my $Value=&mt('Value');
-     my $Set=&mt('Set');
-     my $browse_js=
- 	'<script type="text/javascript" language="Javascript">'.
- 	&Apache::loncommon::browser_and_searcher_javascript('parmset').
- 	'</script>';
-     my $start_page =
- 	&Apache::loncommon::start_page('Set Course Environment',
- 				       $browse_js);
-     my $end_page =
- 	&Apache::loncommon::end_page();
-     my $end_table=&Apache::loncommon::end_data_table();
-     $r->print(<<ENDENV);
- $start_page
- $breadcrumbs
- <form method="post" action="/adm/parmset?action=crsenv" name="envform">
- $setoutput
- $start_table
- $start_header_row
- <th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th>
- $end_header_row
- $output
- $end_table
- <input type="submit" name="crsenv" value="$lt{'sce'}">
- </form>
- $end_page
- ENDENV
- }
  ##################################################
  # Overview mode
  ##################################################
- Line 2400  sub storedata {
+ Line 2359  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('<div class="LC_error">'.
- 				      &mt('Error storing parameters').'</div>');
+ 				      &mt('Error saving parameters').'</div>');
  			}
  			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
  		    } else {
  			$newdata{$thiskey}=$data;
   			$newdata{$thiskey.'.type'}=$typeof;
                     }
  		}
  	    } elsif ($cmd eq 'del') {
  		if ($tuname) {
- Line 2434  sub storedata {
+ Line 2405  sub storedata {
  		} else {
  		    push (@deldata,$thiskey,$thiskey.'.type');
  		}
- 	    } elsif ($cmd eq 'datepointer') {
- 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-                 my $typeof=$env{'form.typeof_'.$thiskey};
- 		if (defined($data) and $$olddata{$thiskey} ne $data) {
- 		    if ($tuname) {
- 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
- 								 $tkey.'.type' => $typeof},
- 						 $tudom,$tuname) eq 'ok') {
- 			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
- 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
- 			} else {
- 			    $r->print('<div class="LC_error">'.
- 				      &mt('Error storing parameters').'</div>');
- 			}
- 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
- 		    } else {
- 			$newdata{$thiskey}=$data;
- 			$newdata{$thiskey.'.type'}=$typeof;
- 		    }
- 		}
  	    }
  	}
      }
- Line 2475  sub storedata {
+ Line 2426  sub storedata {
      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('<div class="LC_error">'.
- 		      &mt('Error storing parameters').'</div>');
+ 		      &mt('Error saving parameters').'</div>');
  	}
  	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
- Line 2489  sub extractuser {
+ Line 2440  sub extractuser {
      return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
  }
+ sub parse_listdata_key {
+     my ($key,$listdata) = @_;
+     # split into student/section affected, and
+     # the realm (folder/resource part and parameter
+     my ($student,$realm) =
+ 	($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
+     # if course wide student would be undefined
+     if (!defined($student)) {
+ 	($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+     }
+     # strip off the .type if it's not the Question type parameter
+     if ($realm=~/\.type$/ && !exists($listdata->{$key.'.type'})) {
+ 	$realm=~s/\.type//;
+     }
+     # split into resource+part and parameter name
+     my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
+        ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
+     return ($student,$res,$part,$parm);
+ }
  sub listdata {
      my ($r,$resourcedata,$listdata,$sortorder)=@_;
  # Start list output
- Line 2500  sub listdata {
+ Line 2471  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 2585  sub listdata {
+ Line 2564  sub listdata {
  	    }
  	    if ($part ne $oldpart) {
  		$r->print(&tableend().
- 			  "\n<span class=\"LC_parm_part\">".&mt('Part').": $part</span>");
+ 			  "\n".'<span class="LC_parm_part">'.&mt('Part').": $part</span>");
  		$oldpart=$part;
  	    }
  #
- Line 2606  sub listdata {
+ Line 2585  sub listdata {
  						      $$resourcedata{$thiskey},
  							      '',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/) {
- 		}
+ 		$r->print(&string_selector($thistype,$thiskey,
- 		$r->print('<label><input type="radio" name="set_'.$thiskey.
+ 					   $$resourcedata{$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};
- 		}
- 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
- 			  $showval.'">');
  	    }
  	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
- 		      $thistype.'">');
+ 		      $thistype.'" />');
  	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
  	}
      }
      return $foundkeys;
  }
+ sub date_interval_selector {
+     my ($thiskey, $showval) = @_;
+     my $result;
+     foreach my $which (['days', 86400, 31],
+ 		       ['hours', 3600, 23],
+ 		       ['minutes', 60, 59],
+ 		       ['seconds',  1, 59]) {
+ 	my ($name, $factor, $max) = @{ $which };
+ 	my $amount = int($showval/$factor);
+ 	$showval  %= $factor;
+ 	my %select = ((map {$_ => $_} (0..$max)),
+ 		      'select_form_order' => [0..$max]);
+ 	$result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+ 						   %select);
+ 	$result .= ' '.&mt($name);
+     }
+     $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+     return $result;
+ }
+ sub get_date_interval_from_form {
+     my ($key) = @_;
+     my $seconds = 0;
+     foreach my $which (['days', 86400],
+ 		       ['hours', 3600],
+ 		       ['minutes', 60],
+ 		       ['seconds',  1]) {
+ 	my ($name, $factor) = @{ $which };
+ 	if (defined($env{'form.'.$name.'_'.$key})) {
+ 	    $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+ 	}
+     }
+     return $seconds;
+ }
+ sub default_selector {
+     my ($thiskey, $showval) = @_;
+     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+ }
+ my %strings =
+     (
+      'string_yesno'
+              => [[ 'yes', 'Yes' ],
+ 		 [ 'no', 'No' ]],
+      'string_problemstatus'
+              => [[ 'yes', 'Yes' ],
+ 		 [ 'answer', 'Yes, and show correct answer if they exceed the maximum number of tries.' ],
+ 		 [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
+ 		 [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
+      );
+ sub string_selector {
+     my ($thistype, $thiskey, $showval) = @_;
+     if (!exists($strings{$thistype})) {
+ 	return &default_selector($thiskey,$showval);
+     }
+     my $result;
+     foreach my $possibilities (@{ $strings{$thistype} }) {
+ 	my ($name, $description) = @{ $possibilities };
+ 	$result .= '<label><input type="radio" name="set_'.$thiskey.
+ 		  '" value="'.$name.'"';
+ 	if ($showval eq $name) {
+ 	    $result .= ' checked="checked"';
+ 	}
+ 	$result .= ' />'.&mt($description).'</label> ';
+     }
+     return $result;
+ }
+ #
+ # Shift all start and end dates by $shift
+ #
+ sub dateshift {
+     my ($shift)=@_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+ # ugly retro fix for broken version of types
+     foreach my $key (keys %data) {
+         if ($key=~/\wtype$/) {
+             my $newkey=$key;
+             $newkey=~s/type$/\.type/;
+             $data{$newkey}=$data{$key};
+             delete $data{$key};
+         }
+     }
+     my %storecontent=();
+ # go through all parameters and look for dates
+     foreach my $key (keys %data) {
+        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+           my $newdate=$data{$key}+$shift;
+           $storecontent{$key}=$newdate;
+        }
+     }
+     my $reply=&Apache::lonnet::cput
+                 ('resourcedata',\%storecontent,$dom,$crs);
+     if ($reply eq 'ok') {
+        &log_parmset(\%storecontent);
+     }
+     &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+     return $reply;
+ }
  sub newoverview {
      my ($r) = @_;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+     	text=>"Overview Mode"});
      my $start_page = &Apache::loncommon::start_page('Set Parameters');
      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
- Line 2679  ENDOVER
+ Line 2757  ENDOVER
      my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
      if (!@psprt) { $psprt[0]='0'; }
      my @selected_sections =
  	&Apache::loncommon::get_env_multiple('form.Section');
      @selected_sections = ('all') if (! @selected_sections);
-     foreach (@selected_sections) {
+     foreach my $sec (@selected_sections) {
-         if ($_ eq 'all') {
+         if ($sec eq 'all') {
              @selected_sections = ('all');
          }
      }
- Line 2692  ENDOVER
+ Line 2770  ENDOVER
      my $pssymb='';
      my $parmlev='';
      unless ($env{'form.parmlev'}) {
          $parmlev = 'map';
      } else {
          $parmlev = $env{'form.parmlev'};
      }
      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
  				\%mapp, \%symbp,\%maptitles,\%uris,
  				\%keyorder,\%defkeytype);
+     if (grep {$_ eq 'all'} (@psprt)) {
+ 	@psprt = keys(%allparts);
+     }
  # Menu to select levels, etc
-     $r->print('<table id="LC_parm_overview_scope">
+     #$r->print('<table id="LC_parm_overview_scope">
-                <tr><td class="LC_parm_overview_level_menu">');
+     #           <tr><td class="LC_parm_overview_level_menu">');
+     $r->print('<div class="LC_ContentBoxSpecial">');
+     #$r->print('<h2 class="LC_hcell">Step 1</h2>');
+     $r->print('<div>');
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
      &levelmenu($r,\%alllevs,$parmlev);
      if ($parmlev ne 'general') {
- 	$r->print('<td class="LC_parm_overview_map_menu">');
+ 	#$r->print('<td class="LC_parm_overview_map_menu">');
+         $r->print(&Apache::lonhtmlcommon::row_closure());
  	&mapmenu($r,\%allmaps,$pschp,\%maptitles);
- 	$r->print('</td>');
+ 	#$r->print('</td>');
      }
-     $r->print('</td></tr></table>');
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
-     $r->print('<table id="LC_parm_overview_controls">
+     $r->print('</div></div>');
-                <tr><td class="LC_parm_overview_parm_selectors">');
+     #$r->print('</td></tr></table>');
+     #$r->print('<table id="LC_parm_overview_controls">
+     #           <tr><td class="LC_parm_overview_parm_selectors">');
+     $r->print('<div class="LC_ContentBoxSpecial">');
+     $r->print('<div>');
+     $r->print(&Apache::lonhtmlcommon::start_pick_box());
      &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-     $r->print('</td><td class="LC_parm_overview_restrictions">
+     $r->print(&Apache::lonhtmlcommon::row_closure());
-                 <table class="LC_parm_overview_restrictions">'.
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
+     #$r->print('</td><td class="LC_parm_overview_restrictions">'.
+      $r->print('<table>'.
                '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
                '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
      &partmenu($r,\%allparts,\@psprt);
- Line 2728  ENDOVER
+ Line 2823  ENDOVER
      $r->print('</td><td>');
      &groupmenu($r,\@selected_groups);
      $r->print('</td></tr></table>');
-     $r->print('</td></tr></table>');
+     #$r->print('</td></tr></table>');
+     $r->print(&Apache::lonhtmlcommon::row_closure(1));
+     $r->print(&Apache::lonhtmlcommon::end_pick_box());
+     $r->print('</div></div>');
+     $r->print('<div class="LC_ContentBoxSpecial">');
+     $r->print('<div>');
      my $sortorder=$env{'form.sortorder'};
      unless ($sortorder) { $sortorder='realmstudent'; }
      &sortmenu($r,$sortorder);
+     $r->print('</div></div>');
      $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
- Line 2759  ENDOVER
+ Line 2860  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 2803  sub overview {
+ Line 2904  sub overview {
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+ 	text=>"Overview Mode"});
      my $start_page=&Apache::loncommon::start_page('Modify Parameters');
      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
- Line 2828  ENDOVER
+ Line 2931  ENDOVER
      my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
      $r->print(&tableend().'<p>'.
- 	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form>'.
+ 	($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
  	      &Apache::loncommon::end_page());
  }
- Line 2837  sub clean_parameters {
+ Line 2940  sub clean_parameters {
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
+     	text=>"Clean Parameters"});
      my $start_page=&Apache::loncommon::start_page('Clean Parameters');
      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
      $r->print(<<ENDOVER);
- Line 2857  ENDOVER
+ Line 2962  ENDOVER
      $r->print('<h3>'.
  	      &mt('These parameters refer to resources that do not exist.').
  	      '</h3>'.
- 	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.'<br />'.
+ 	      '<input type="submit" value="'.&mt('Delete Selected').'" />'.'<br />'.
  	      '<br />');
      $r->print(&Apache::loncommon::start_data_table().
  	      '<tr>'.
- Line 2868  ENDOVER
+ Line 2973  ENDOVER
  	next if (!exists($resourcedata->{$thiskey.'.type'})
  		 && $thiskey=~/\.type$/);
  	my %data = &parse_key($thiskey);
- 	if (exists($data{'realm_exists'})
+ 	if (1) { #exists($data{'realm_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}));
- Line 2899  ENDOVER
+ Line 3009  ENDOVER
  		$r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
  			      $url,$resid,$map));
  	    }
- 	    $r->print(&mt('Part: [_1]',$data{'parameter_part'}));
+ 	    $r->print(' <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').'" />'.
+ 	      '<input type="submit" value="'.&mt('Delete Selected').'" />'.
  	      '</p></form>'.
  	      &Apache::loncommon::end_page());
  }
+ sub date_shift_one {
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+     	text=>"Shifting Dates"});
+     my $start_page=&Apache::loncommon::start_page('Shift Dates');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+     $r->print(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ ENDOVER
+     $r->print('<form name="shiftform" method="post">'.
+               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
+               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
+               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
+                     &Apache::lonhtmlcommon::date_setter('shiftform',
+                                                         'timeshifted',
+                                                         $env{'form.timebase'},,
+                                                         '').
+               '</td></tr></table>'.
+               '<input type="hidden" name="action" value="dateshift2" />'.
+               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
+               '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+     $r->print(&Apache::loncommon::end_page());
+ }
+ sub date_shift_two {
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+     	text=>"Shifting Dates"});
+     my $start_page=&Apache::loncommon::start_page('Shift Dates');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+     $r->print(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ ENDOVER
+     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
+     $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+               &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+               &Apache::lonlocal::locallocaltime($timeshifted)));
+     my $delta=$timeshifted-$env{'form.timebase'};
+     &dateshift($delta);
+     $r->print(&Apache::loncommon::end_page());
+ }
  sub parse_key {
      my ($key) = @_;
      my %data;
- Line 2935  sub parse_key {
+ Line 3094  sub parse_key {
  	$data{'realm_type'} = 'folder';
  	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
  	($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
- 	&Apache::lonnet::logthis($1." siad ".	$data{'realm_exists'} );
      } elsif ($middle) {
  	$data{'realm'} = $middle;
  	$data{'realm_type'} = 'symb';
- Line 2943  sub parse_key {
+ Line 3101  sub parse_key {
  	my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
  	$data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
      }
      $data{'parameter_part'} = $part;
      $data{'parameter_name'} = $name;
      return %data;
  }
- ##################################################
- ##################################################
- =pod
- =item check_cloners
- Checks if new users included in list of allowed cloners
- are valid users.  Replaces supplied list with
- cleaned list containing only users with valid usernames
- and domains.
- Inputs: $clonelist, $oldcloner
- where $clonelist is ref to array of requested cloners,
- and $oldcloner is ref to array of currently allowed
- cloners.
- Returns: string - comma separated list of requested
- cloners (username:domain) who do not exist in system.
- =item change_clone
- Modifies the list of courses a user can clone (stored
- in the user's environment.db file), called when a
- change is made to the list of users allowed to clone
- a course.
- Inputs: $action,$cloner
- where $action is add or drop, and $cloner is identity of
- user for whom cloning ability is to be changed in course.
- =cut
- ##################################################
- ##################################################
  sub extract_cloners {
      my ($clonelist,$allowclone) = @_;
      if ($clonelist =~ /,/) {
-         @{$allowclone} = split/,/,$clonelist;
+         @{$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 3031  sub change_clone {
+ Line 3170  sub change_clone {
      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $clone_crs = $cnum.':'.$cdom;
      if ($cnum && $cdom) {
          my @allowclone;
          &extract_cloners($clonelist,\@allowclone);
          foreach my $currclone (@allowclone) {
-             if (!grep/^$currclone$/,@$oldcloner) {
+             if (!grep(/^$currclone$/,@$oldcloner)) {
-                 ($uname,$udom) = split/:/,$currclone;
+                 if ($currclone ne '*') {
-                 if ($uname && $udom) {
+                     ($uname,$udom) = split(/:/,$currclone);
-                     unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                     if ($uname && $udom && $uname ne '*') {
-                         my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                         if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                             if ($currclonecrs{'cloneable'} eq '') {
+                             if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
-                                 $currclonecrs{'cloneable'} = $clone_crs;
+                                 if ($currclonecrs{'cloneable'} eq '') {
-                             } else {
+                                     $currclonecrs{'cloneable'} = $clone_crs;
-                                 $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                 } else {
+                                     $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                 }
+                                 &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                              }
-                             &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                          }
                      }
                  }
              }
          }
          foreach my $oldclone (@$oldcloner) {
-             if (!grep/^$oldclone$/,@allowclone) {
+             if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
-                 ($uname,$udom) = split/:/,$oldclone;
+                 if ($oldclone ne '*') {
-                 if ($uname && $udom) {
+                     ($uname,$udom) = split(/:/,$oldclone);
-                     unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                     if ($uname && $udom && $uname ne '*' ) {
-                         my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                         my %newclonecrs = ();
+                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                         if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+                             my %newclonecrs = ();
-                             if ($currclonecrs{'cloneable'} =~ /,/) {
+                             if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
-                                 my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+                                 if ($currclonecrs{'cloneable'} =~ /,/) {
-                                 foreach (@currclonecrs) {
+                                     my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
-                                     unless ($_ eq $clone_crs) {
+                                     foreach my $crs (@currclonecrs) {
-                                         $newclonecrs{'cloneable'} .= $_.',';
+                                         if ($crs ne $clone_crs) {
+                                             $newclonecrs{'cloneable'} .= $crs.',';
+                                         }
                                      }
+                                     $newclonecrs{'cloneable'} =~ s/,$//;
+                                 } else {
+                                     $newclonecrs{'cloneable'} = '';
                                  }
-                                 $newclonecrs{'cloneable'} =~ s/,$//;
+                                 &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
-                             } else {
-                                 $newclonecrs{'cloneable'} = '';
                              }
-                             &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                          }
                      }
                  }
- Line 3082  sub change_clone {
+ Line 3225  sub change_clone {
  }
- ##################################################
- ##################################################
- =pod
- =item * header
- Output html header for page
- =cut
- ##################################################
- ##################################################
  sub header {
      return &Apache::loncommon::start_page('Parameter Manager');
  }
- ##################################################
- ##################################################
  sub print_main_menu {
      my ($r,$parm_permission)=@_;
      #
+     $r->print(&header());
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
      $r->print(<<ENDMAINFORMHEAD);
  <form method="post" enctype="multipart/form-data"
        action="/adm/parmset" name="studentform">
- Line 3111  ENDMAINFORMHEAD
+ Line 3245  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',
+         ( { categorytitle=>'Settings for this Course',
- 	  },
+ 	    items => [
-           { text => 'Set Course Environment',
+ 		  { linktext => 'Course Configuration',
- 	    action => 'crsenv',
+ 		    url => '/adm/courseprefs?origin=params',
-             permission => $parm_permission,
+ 		    permission => $parm_permission,
-             help => 'Course_Environment',
+ 		    linktitle =>'Edit course configuration.'  ,
-             },
+ 		    icon => 'preferences-desktop-remote-desktop.png'  ,
-           { text => 'Set Portfolio Metadata',
+ 		    #help => 'Course_Environment',
- 	    action => 'setrestrictmeta',
+ 		    },
-             permission => $parm_permission,
+ 		  { linktext => 'Portfolio Metadata',
-             },
+ 		    url => '/adm/parmset?action=setrestrictmeta',
- 	  { text => 'Manage Course Slots',
+ 		    permission => $parm_permission,
- 	    url => '/adm/slotrequest?command=showslots',
+ 		    linktitle => 'Restrict metadata for this course.' ,
- 	    permission => $vgr,
+ 		    icon =>'contact-new.png'   ,
-             },
+ 		    },
-           { text => 'Set Parameter Setting Default Actions',
+ 		  { linktext => 'Manage Course Slots',
-             action => 'setdefaults',
+ 		    url => '/adm/slotrequest?command=showslots',
-             permission => $parm_permission,
+ 		    permission => $vgr,
-             },
+ 		    linktitle =>'Manage slots for this course.'  ,
- 	  { divider => 'New and Existing Parameter Settings for Your Resources',
+ 		    icon => 'format-justify-fill.png'  ,
- 	    },
+ 		    },
-           { text => 'Set/Modify Resource Parameters - Helper Mode',
+ 		  { linktext => 'Reset Student Access Times',
-             url => '/adm/helper/parameter.helper',
+ 		    url => '/adm/helper/resettimes.helper',
-             permission => $parm_permission,
+ 		    permission => $mgr,
-             help => 'Parameter_Helper',
+ 		    linktitle =>'Reset access times for folders/maps, resources or the course.'  ,
-             },
+ 		    icon => 'start-here.png'  ,
-  	  { text => 'Set/Modify Resource Parameters - Overview Mode',
+ 		    },
-             action => 'newoverview',
-             permission => $parm_permission,
+ 		  { linktext => 'Set Parameter Setting Default Actions',
-             help => 'Parameter_Overview',
+ 		    url => '/adm/parmset?action=setdefaults',
-             },
+ 		    permission => $parm_permission,
-           { text => 'Set/Modify Resource Parameters - Table Mode',
+ 		    linktitle =>'Set default actions for parameters.'  ,
-             action => 'settable',
+ 		    icon => 'folder-new.png'  ,
-             permission => $parm_permission,
+ 		    }]},
-             help => 'Table_Mode',
+ 	  { categorytitle => 'New and Existing Parameter Settings for Resources',
-             },
+ 	    items => [
-            { divider => 'Existing Parameter Settings for Your Resources',
+ 		  { linktext => 'Edit Resource Parameters - Helper Mode',
- 	  },
+ 		    url => '/adm/helper/parameter.helper',
- 	  { text => 'Modify Resource Parameters - Overview Mode',
+ 		    permission => $parm_permission,
-             action => 'setoverview',
+ 		    linktitle =>'Set/Modify resource parameters in helper mode.'  ,
-             permission => $parm_permission,
+ 		    icon => 'dialog-information.png'  ,
-             help => 'Parameter_Overview',
+ 		    #help => 'Parameter_Helper',
-  	    },
+ 		    },
- 	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
+ 		  { linktext => 'Edit Resource Parameters - Overview Mode',
-             action => 'parameterchangelog',
+ 		    url => '/adm/parmset?action=newoverview',
-             permission => $parm_permission,
+ 		    permission => $parm_permission,
-             },
+ 		    linktitle =>'Set/Modify resource parameters in overview mode.'  ,
+ 		    icon => 'edit-find.png'  ,
+ 		    #help => 'Parameter_Overview',
+ 		    },
+ 		  { linktext => 'Edit Resource Parameters - Table Mode',
+ 		    url => '/adm/parmset?action=settable',
+ 		    permission => $parm_permission,
+ 		    linktitle =>'Set/Modify resource parameters in table mode.'  ,
+ 		    icon => 'edit-copy.png'  ,
+ 		    #help => 'Table_Mode',
+ 		    }]},
+            { categorytitle => 'Existing Parameter Settings for Resources',
+ 	     items => [
+ 		  { linktext => 'Modify Resource Parameters - Overview Mode',
+ 		    url => '/adm/parmset?action=setoverview',
+ 		    permission => $parm_permission,
+ 		    linktitle =>'Set/Modify existing resource parameters in overview mode.'  ,
+ 		    icon => 'preferences-desktop-wallpaper.png'  ,
+ 		    #help => 'Parameter_Overview',
+ 		    },
+ 		  { linktext => 'Change Log',
+ 		    url => '/adm/parmset?action=parameterchangelog',
+ 		    permission => $parm_permission,
+ 		    linktitle =>'View parameter and course blog posting/user notification change log.'  ,
+ 		    icon => 'emblem-system.png'   ,
+ 		    }]}
            );
-     my $menu_html = '';
+     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-     foreach my $menu_item (@menu) {
- 	if ($menu_item->{'divider'}) {
- 	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
- 	    next;
- 	}
-         next if (! $menu_item->{'permission'});
-         $menu_html.='<p>';
-         $menu_html.='<span class="LC_parm_menu_item">';
-         if (exists($menu_item->{'url'})) {
-             $menu_html.=qq{<a href="$menu_item->{'url'}">};
-         } else {
-             $menu_html.=
-                 qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
-         }
-         $menu_html.= &mt($menu_item->{'text'}).'</a></span>';
-         if (exists($menu_item->{'help'})) {
-             $menu_html.=
-                 &Apache::loncommon::help_open_topic($menu_item->{'help'});
-         }
-         $menu_html.='</p>'.$/;
-     }
-     $r->print($menu_html);
      return;
  }
- ### Set portfolio metadata
  sub output_row {
      my ($r, $field_name, $field_text, $added_flag) = @_;
-     my $row_class;
      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'};
- Line 3198  sub output_row {
+ Line 3338  sub output_row {
          $values = '';
      }
      if (!($options =~ /deleted/)) {
-         $output = &Apache::loncommon::start_data_table_row();
-         $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
-         # $output .= '<td><strong>'.$field_text.':</strong></td>';
-         $output .= '<td><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 @options= ( ['active', 'Show to student'],
- 		   ['onlyone','Student may select only one choice'],
+                     ['stuadd', 'Provide text area for students to type metadata'],
- 		   ['stuadd', 'Student may type choices']);
+                     ['choices','Provide choices for students to select from']);
+ #		   ['onlyone','Student may select only one choice']);
          if ($added_flag) {
              push @options,['deleted', 'Delete Metadata Field'];
          }
+        $output = &Apache::loncommon::start_data_table_row();
+         $output .= '<td><strong>'.$field_text.':</strong></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
          foreach my $opt (@options) {
  	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
  	    $output .= &Apache::loncommon::continue_data_table_row();
- 	    $output .= '<td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
+ 	    $output .= '<td>'.('&nbsp;' x 5).'<label>
- 	        $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+ 	               <input type="checkbox" name="'.
- 	        &mt($opt->[1]).'</label></span> </td>';
+ 	               $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+ 	               &mt($opt->[1]).'</label></td>';
  	    $output .= &Apache::loncommon::end_data_table_row();
  	}
+         $output .= &Apache::loncommon::continue_data_table_row();
+         $output .= '<td>'.('&nbsp;' x 10).'<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
+         my $multiple_checked;
+         my $single_checked;
+         if ($options =~ m/onlyone/) {
+             $multiple_checked = '';
+             $single_checked = ' checked="checked"';
+         } else {
+             $multiple_checked = ' checked="checked"';
+             $single_checked = '';
+         }
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'
+ 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
+ 	            '.&mt('Student may select multiple choices from list').'</td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'
+ 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
+ 	            '.&mt('Student may select only one choice from list').'</td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
      }
      return ($output);
  }
  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=addmetadata',
+     	text=>"Add Metadata Field"});
      &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"/adm/parmset?action=setrestrictmeta",
                text=>"Restrict Metadata"},
- Line 3265  sub order_meta_fields {
+ Line 3431  sub order_meta_fields {
          }
  	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);
+ 	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
      }
-     my $fields = &get_added_meta_fieldnames();
+     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) {
- Line 3278  sub order_meta_fields {
+ Line 3444  sub order_meta_fields {
              $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) {
- Line 3303  sub order_meta_fields {
+ Line 3469  sub order_meta_fields {
      $r->print('</table>');
      return 'ok';
  }
  sub continue {
      my $output;
      $output .= '<form action="" method="post">';
- Line 3310  sub continue {
+ Line 3478  sub continue {
      $output .= '<input type="submit" value="Continue" />';
      return ($output);
  }
  sub addmetafield {
      my ($r)=@_;
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+     	text=>"Add Metadata Field"});
      $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 3324  sub addmetafield {
+ Line 3496  sub addmetafield {
              $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());
- Line 3340  sub addmetafield {
+ Line 3512  sub addmetafield {
          $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();
+         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="">');
- Line 3353  sub addmetafield {
+ Line 3525  sub addmetafield {
          $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
          $r->print('<input type="text" name="fieldname" /><br />');
          $r->print('<input type="submit" value="Add Metadata Field" />');
-         $r->print('</form>');
      }
+     $r->print('</form>');
  }
  sub setrestrictmeta {
      my ($r)=@_;
      my $next_meta;
      my $output;
      my $item_num;
      my $put_result;
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+     	text=>"Restrict Metadata"});
      $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 3378  sub setrestrictmeta {
+ Line 3555  sub setrestrictmeta {
                      $save_field = $meta_field;
              	    if ($env{'form.'.$meta_field.'_stuadd'}) {
              	        $options.='stuadd,';
              	    }
-             	    if ($env{'form.'.$meta_field.'_onlyone'}) {
+             	    if ($env{'form.'.$meta_field.'_choices'}) {
+             	        $options.='choices,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
              	        $options.='onlyone,';
              	    }
              	    if ($env{'form.'.$meta_field.'_active'}) {
              	        $options.='active,';
              	    }
              	    if ($env{'form.'.$meta_field.'_deleted'}) {
              	        $options.='deleted,';
              	    }
                      my $name = $save_field;
                       $put_result = &Apache::lonnet::put('environment',
                                                    {'metadata.'.$meta_field.'.options'=>$options,
- Line 3403  sub setrestrictmeta {
+ Line 3582  sub setrestrictmeta {
      # Get the default metadata fields
      my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
      # Now get possible added metadata fields
-     my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
+     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
      my $row_alt = 1;
      $output .= &Apache::loncommon::start_data_table();
      foreach my $field (sort(keys(%metadata_fields))) {
- Line 3412  sub setrestrictmeta {
+ Line 3591  sub setrestrictmeta {
  	    $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">
          $output
-         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions" />
+         $buttons
-         </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" />
          </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/\.metadata\.(.+)\.added$/) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
              my $field_name = $1;
              my ($display_field_name) = $env{$key};
              $fields{$field_name} = $display_field_name;
- Line 3446  sub get_added_meta_fieldnames {
+ Line 3631  sub get_added_meta_fieldnames {
      }
      return \%fields;
  }
  sub get_deleted_meta_fieldnames {
+     my ($cid) = @_;
      my %fields;
-     my ($default_fields) = @_;
      foreach my $key(%env) {
-         if ($key =~ m/\.metadata\.(.+)\.added$/) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
              my $field_name = $1;
              if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
                  my ($display_field_name) = $env{$key};
- Line 3463  sub get_deleted_meta_fieldnames {
+ Line 3651  sub get_deleted_meta_fieldnames {
  sub defaultsetter {
      my ($r) = @_;
-     my $start_page =
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
+     	text=>"Set Defaults"});
+     my $start_page =
  	&Apache::loncommon::start_page('Parameter Setting Default Actions');
      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
      $r->print(<<ENDDEFHEAD);
- Line 3487  ENDDEFHEAD
+ Line 3677  ENDDEFHEAD
      my %keyorder=&standardkeyorder();
      my %defkeytype=();
      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
  				\%mapp, \%symbp,\%maptitles,\%uris,
  				\%keyorder,\%defkeytype);
      if ($env{'form.storerules'}) {
- Line 3550  ENDDEFHEAD
+ Line 3740  ENDDEFHEAD
  	    push @datedisplay,&mt('Automatically set later than ').$tempkey;
  	    push @dateoptions,'earlier_than_'.$tempkey;
  	    push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
  	}
      }
  $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
  	  &mt('Automatic setting rules apply to table mode interfaces only.'));
- Line 3601  ENDINPUTDATE
+ Line 3791  ENDINPUTDATE
  	} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
              my $yeschecked='';
              my $nochecked='';
-             if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
+             if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
-             if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='checked="checked"'; }
+             if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
  	    $r->print(<<ENDYESNO);
- <label><input type="radio" name="$tempkey\_value" value="yes" $yeschecked /> $lt{'yes'}</label><br />
+ <label><input type="radio" name="$tempkey\_value" value="yes"$yeschecked /> $lt{'yes'}</label><br />
- <label><input type="radio" name="$tempkey\_value" value="no" $nochecked /> $lt{'no'}</label>
+ <label><input type="radio" name="$tempkey\_value" value="no"$nochecked /> $lt{'no'}</label>
  ENDYESNO
          } else {
  	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
- Line 3614  ENDYESNO
+ Line 3804  ENDYESNO
          $r->print('</td>'.&Apache::loncommon::end_data_table_row());
      }
      $r->print(&Apache::loncommon::end_data_table().
- 	      "\n<input type='submit' name='storerules' value='".
+ 	      "\n".'<input type="submit" name="storerules" value="'.
- 	      &mt('Store Rules')."' /></form>\n".
+ 	      &mt('Save').'" /></form>'."\n".
  	      &Apache::loncommon::end_page());
      return;
  }
- Line 3644  sub components {
+ Line 3834  sub components {
  	$issection='';
      }
      my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
      my $realmdescription=&mt('all resources');
      if ($middle=~/^(.+)\_\_\_\(all\)$/) {
  	$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
   	$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
- Line 3659  sub components {
+ Line 3849  sub components {
  }
  my %standard_parms;
  sub load_parameter_names {
      open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
      while (my $configline=<$config>) {
- Line 3673  sub load_parameter_names {
+ Line 3865  sub load_parameter_names {
      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 {
- Line 3682  sub standard_parameter_names {
+ Line 3874  sub standard_parameter_names {
  	&load_parameter_names();
      }
      if ($standard_parms{$name}) {
  	return $standard_parms{$name};
      } else {
  	return $name;
      }
  }
- #
- # Parameter Change Log
- #
  sub parm_change_log {
      my ($r)=@_;
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+ 	text=>"Parameter Change Log"});
      $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
- Line 3706  sub parm_change_log {
+ Line 3897  sub parm_change_log {
      $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);
- Line 3734  sub parm_change_log {
+ Line 3925  sub parm_change_log {
  	}
  	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'}
- Line 3747  sub parm_change_log {
+ Line 3938  sub parm_change_log {
  	my $count = 0;
  	my $time =
  	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
  	my $plainname =
  	    &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
  					  $parmlog{$id}{'exe_udom'});
  	my $about_me_link =
  	    &Apache::loncommon::aboutmewrapper($plainname,
  					       $parmlog{$id}{'exe_uname'},
  					       $parmlog{$id}{'exe_udom'});
  	my $send_msg_link='';
  	if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
  	     || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
  	    $send_msg_link ='<br />'.
  		&Apache::loncommon::messagewrapper(&mt('Send message'),
- Line 3778  sub parm_change_log {
+ Line 3969  sub parm_change_log {
  		}
  	    }
  	    if ($typeflag) {
  		$istype{$parmname}=$value;
  		if (!$env{'form.includetypes'}) { next; }
  	    }
  	    $count++;
  	    if ($makenewrow) {
- Line 3817  sub parm_change_log {
+ Line 4008  sub parm_change_log {
                  my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
  				    (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
  		if (($uname) && ($udom)) {
  		    $output .=
  			&Apache::loncommon::messagewrapper('Notify User',
  							   $uname,$udom,$title,
  							   $description);
  		} else {
  		    $output .=
  			&Apache::lonrss::course_blog_link($id,$title,
  							  $description);
  		}
- Line 3833  sub parm_change_log {
+ Line 4024  sub parm_change_log {
  	    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>
- Line 3843  sub parm_change_log {
+ Line 4034  sub parm_change_log {
  		  $send_msg_link.'</td>'.$output);
  	    $shown++;
  	}
  	if (!($env{'form.show'} eq &mt('all')
  	      || $shown<=$env{'form.show'})) { last; }
      }
      $r->print(&Apache::loncommon::end_data_table());
      $r->print(&Apache::loncommon::end_page());
  }
+ sub update_slots {
+     my ($slot_name,$cdom,$cnum,$symb,$uname,$udom) = @_;
+     my %slot=&Apache::lonnet::get_slot($slot_name);
+     if (!keys(%slot)) {
+         return 'error: slot does not exist';
+     }
+     my $max=$slot{'maxspace'};
+     if (!defined($max)) { $max=99999; }
+     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+                                        "^$slot_name\0");
+     my ($tmp)=%consumed;
+     if ($tmp=~/^error: 2 / ) {
+         return 'error: unable to determine current slot status';
+     }
+     my $last=0;
+     foreach my $key (keys(%consumed)) {
+         my $num=(split('\0',$key))[1];
+         if ($num > $last) { $last=$num; }
+         if ($consumed{$key}->{'name'} eq $uname.':'.$udom) {
+             return 'ok';
+         }
+     }
+     if (scalar(keys(%consumed)) >= $max) {
+         return 'error: no space left in slot';
+     }
+     my $wanted=$last+1;
+     my %reservation=('name'      => $uname.':'.$udom,
+                      'timestamp' => time,
+                      'symb'      => $symb);
+     my $success=&Apache::lonnet::newput('slot_reservations',
+                                         {"$slot_name\0$wanted" =>
+                                              \%reservation},
+                                         $cdom, $cnum);
+     if ($success eq 'ok') {
+         my %storehash = (
+                           symb    => $symb,
+                           slot    => $slot_name,
+                           action  => 'reserve',
+                           context => 'parameter',
+                         );
+         &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+                                         '',$uname,$udom,$cnum,$cdom);
+         &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                         '',$uname,$udom,$uname,$udom);
+     }
+     return $success;
+ }
+ sub delete_slots {
+     my ($slot_name,$cdom,$cnum,$uname,$udom,$symb) = @_;
+     my $delresult;
+     my %consumed = &Apache::lonnet::dump('slot_reservations',$cdom,
+                                          $cnum, "^$slot_name\0");
+     if (&Apache::lonnet::error(%consumed)) {
+         return 'error: unable to determine current slot status';
+     }
+     my ($tmp)=%consumed;
+     if ($tmp=~/^error: 2 /) {
+         return 'error: unable to determine current slot status';
+     }
+     foreach my $key (keys(%consumed)) {
+         if ($consumed{$key}->{'name'} eq $uname.':'.$udom) {
+             my $num=(split('\0',$key))[1];
+             my $entry = $slot_name.'\0'.$num;
+             $delresult = &Apache::lonnet::del('slot_reservations',[$entry],
+                                               $cdom,$cnum);
+             if ($delresult eq 'ok') {
+                 my %storehash = (
+                                   symb    => $symb,
+                                   slot    => $slot_name,
+                                   action  => 'release',
+                                   context => 'parameter',
+                                 );
+                 &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+,$uname,$udom,$cnum,$cdom);
+                 &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+,$uname,$udom,$uname,$udom);
+             }
+         }
+     }
+     return $delresult;
+ }
  sub check_for_course_info {
      my $navmap = Apache::lonnavmaps::navmap->new();
      return 1 if ($navmap);
      return 0;
  }
- ##################################################
- ##################################################
- =pod
- =item * handler
- Main handler.  Calls &assessparms and &crsenv subroutines.
- =cut
- ##################################################
- ##################################################
- #    use Data::Dumper;
  sub handler {
      my $r=shift;
-     if ($r->header_only) {
+     &reset_caches();
- 	&Apache::loncommon::content_type($r,'text/html');
- 	$r->send_http_header;
+     &Apache::loncommon::content_type($r,'text/html');
- 	return OK;
+     $r->send_http_header;
-     }
+     return OK if $r->header_only;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  					    ['action','state',
                                               'pres_marker',
                                               'pres_value',
                                               'pres_type',
-                                              'udom','uname','symb','serial']);
+                                              'udom','uname','symb','serial','timebase']);
      &Apache::lonhtmlcommon::clear_breadcrumbs();
- Line 3892  sub handler {
+ Line 4158  sub handler {
  					    text=>"Parameter Manager",
  					    faq=>10,
  					    bug=>'Instructor Interface',
-                                             help => 'Parameter_Manager'});
+                                             help =>
+                                             'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});
  # ----------------------------------------------------- Needs to be in a course
      my $parm_permission =
- Line 3902  sub handler {
+ Line 4169  sub handler {
      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 3919  sub handler {
+ Line 4176  sub handler {
          #  the table mode
          if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
  	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
-             &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
- 						    text=>"Problem Parameters"});
  	    &assessparms($r);
          } elsif (! exists($env{'form.action'})) {
-             $r->print(&header());
-             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
              &print_main_menu($r,$parm_permission);
-         } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'setoverview') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
- 						    text=>"Course Environment"});
-             &crsenv($r);
-         } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
- 						    text=>"Overview Mode"});
  	    &overview($r);
- 	} elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
+ 	} elsif ($env{'form.action'} eq 'addmetadata') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
- 						    text=>"Add Metadata Field"});
  	    &addmetafield($r);
- 	} elsif ($env{'form.action'} eq 'ordermetadata' && $parm_permission) {
+ 	} elsif ($env{'form.action'} eq 'ordermetadata') {
-             &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) {
+         } elsif ($env{'form.action'} eq 'setrestrictmeta') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
- 						    text=>"Restrict Metadata"});
  	    &setrestrictmeta($r);
-         } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'newoverview') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
- 						    text=>"Overview Mode"});
  	    &newoverview($r);
-         }  elsif ($env{'form.action'} eq 'setdefaults' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'setdefaults') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
- 						    text=>"Set Defaults"});
  	    &defaultsetter($r);
- 	} elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
+ 	} elsif ($env{'form.action'} eq 'settable') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
- 						    text=>"Table Mode",
- 						    help => 'Course_Setting_Parameters'});
  	    &assessparms($r);
-         } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'parameterchangelog') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
- 						    text=>"Parameter Change Log"});
  	    &parm_change_log($r);
-         } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'cleanparameters') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
- 						    text=>"Clean Parameters"});
  	    &clean_parameters($r);
- 	}
+         } elsif ($env{'form.action'} eq 'dateshift1') {
+             &date_shift_one($r);
+         } elsif ($env{'form.action'} eq 'dateshift2') {
+             &date_shift_two($r);
+ 	} elsif ($env{'form.action'} eq 'categorizecourse') {
+             &assign_course_categories($r);
+         }
      } else {
  # ----------------------------- Not in a course, or not allowed to modify parms
  	if ($exists) {
- Line 3980  sub handler {
+ Line 4215  sub handler {
  	}
  	return HTTP_NOT_ACCEPTABLE;
      }
+     &reset_caches();
      return OK;
  }
 ;
  __END__
- =pod
- =back
- =cut

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

Removed from v.1.350.2.6
changed lines
	Added in v.1.452