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

-version 1.384, 2007/11/02 23:29:49
+version 1.442, 2009/04/05 17:31:04
  Line 44  This module sets coursewide and assessme
  =head1 INTERNAL SUBROUTINES
- =over 4
+ =over
- =cut
- ###################################################################
- ###################################################################
- package Apache::lonparmset;
- use strict;
- use Apache::lonnet;
- use Apache::Constants qw(:common :http REDIRECT);
- use Apache::lonhtmlcommon();
- use Apache::loncommon;
- use GDBM_File;
- use Apache::lonhomework;
- use Apache::lonxml;
- use Apache::lonlocal;
- use Apache::lonnavmaps;
- use Apache::longroup;
- use Apache::lonrss;
- use LONCAPA qw(:DEFAULT :match);
- ##################################################
- ##################################################
  =pod
- =item parmval
+ =item parmval()
  Figure out a cascading parameter.
- Line 98  Returns:  A list, the first item is the
+ Line 73  Returns:  A list, the first item is the
 - Map or Folder level for specific student
 - resource level for specific student
+ =item parmval_by_symb()
+ =item reset_caches()
+ =item cacheparmhash()
+ =item parmhash()
+ =item symbcache()
+ =item preset_defaults()
+ =item date_sanity_info()
+ =item storeparm()
+ Store a parameter by symb
+     Takes
+     - symb
+     - name of parameter
+     - level
+     - new value
+     - new type
+     - username
+     - userdomain
+ =item log_parmset()
+ =item storeparm_by_symb_inner()
+ =item valout()
+ Format a value for output.
+ Inputs:  $value, $type, $editable
+ Returns: $value, formatted for output.  If $type indicates it is a date,
+ localtime($value) is returned.
+ $editable will return an icon to click on
+ =item plink()
+ Produces a link anchor.
+ Inputs: $type,$dis,$value,$marker,$return,$call
+ Returns: scalar with html code for a link which will envoke the
+ javascript function 'pjump'.
+ =item page_js()
+ =item startpage()
+ =item print_row()
+ =item print_td()
+ =item print_usergroups()
+ =item parm_control_group()
+ =item extractResourceInformation() :
+ Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
+ Input: See list below:
+ =item * B<ids> : An array that will contain all of the ids in the course.
+ =item * B<typep> : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
+ =item * B<keyp> : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
+ =item * B<allparms> : hash, name of parameter->display value (what is the display value?)
+ =item * B<allparts> : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+ =item * B<allkeys> : hash, full key to part->display value (what's display value?)
+ =item * B<allmaps> : hash, ???
+ =item * B<fcat> : ???
+ =item * B<defp> : hash, ???
+ =item * B<mapp> : ??
+ =item * B<symbp> : hash, id->full sym?
+ =item isdateparm()
+ =item parmmenu()
+ =item partmenu()
+ =item usermenu()
+ =item displaymenu()
+ =item mapmenu()
+ =item levelmenu()
+ =item sectionmenu()
+ =item keysplit()
+ =item keysinorder()
+ =item keysinorder_bytype()
+ =item keysindisplayorder()
+ =item standardkeyorder()
+ =item assessparms() :
+ Show assessment data and parameters.  This is a large routine that should
+ be simplified and shortened... someday.
+ Inputs: $r
+ Returns: nothing
+ Variables used (guessed by Jeremy):
+ =item * B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
+ =item * B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
+ =item * B<@catmarker> contains list of all possible parameters including part #s
+ =item * B<$fullkeyp> contains the full part/id # for the extraction of proper parameters
+ =item * B<$tempkeyp> contains part 0 only (no ids - ie, subparts)
+         When storing information, store as part 0
+         When requesting information, request from full part
+ =item crsenv()
+ Show and set course data and parameters.  This is a large routine that should
+ be simplified and shortened... someday.
+ Inputs: $r
+ Returns: nothing
+ =item can_modify_catsettings()
+ =item assign_course_categories()
+ =item tablestart()
+ =item tableend()
+ =item extractuser()
+ =item parse_listdata_key()
+ =item listdata()
+ =item date_interval_selector()
+ =item get_date_interval_from_form()
+ =item default_selector()
+ =item string_selector()
+ =item dateshift()
+ =item newoverview()
+ =item secgroup_lister()
+ =item overview()
+ =item clean_parameters()
+ =item date_shift_one()
+ =item date_shift_two()
+ =item parse_key()
+ =item check_cloners() :
+ Checks if new users included in list of allowed cloners
+ are valid users.  Replaces supplied list with
+ cleaned list containing only users with valid usernames
+ and domains.
+ Inputs: $clonelist, $oldcloner
+ where $clonelist is ref to array of requested cloners,
+ and $oldcloner is ref to array of currently allowed
+ cloners.
+ Returns: string - comma separated list of requested
+ cloners (username:domain) who do not exist in system.
+ =item change_clone() :
+ Modifies the list of courses a user can clone (stored
+ in the user's environment.db file), called when a
+ change is made to the list of users allowed to clone
+ a course.
+ Inputs: $action,$cloner
+ where $action is add or drop, and $cloner is identity of
+ user for whom cloning ability is to be changed in course.
+ =item check_cloners()
+ =item change_clone()
+ =item header()
+ Output html header for page
+ =item print_main_menu()
+ =item output_row()
+ Set portfolio metadata
+ =item order_meta_fields()
+ =item addmetafield()
+ =item setrestrictmeta()
+ =item get_added_meta_fieldnames()
+ =item get_deleted_meta_fieldnames()
+ =item defaultsetter()
+ =item components()
+ =item load_parameter_names()
+ =item parm_change_log()
+ =item handler() :
+ Main handler.  Calls &assessparms and &crsenv subroutines.
+ =back
  =cut
- ##################################################
+ ###################################################################
+ ###################################################################
+ package Apache::lonparmset;
+ use strict;
+ use Apache::lonnet;
+ use Apache::Constants qw(:common :http REDIRECT);
+ use Apache::lonhtmlcommon();
+ use Apache::loncommon;
+ use GDBM_File;
+ use Apache::lonhomework;
+ use Apache::lonxml;
+ use Apache::lonlocal;
+ use Apache::lonnavmaps;
+ use Apache::longroup;
+ use Apache::lonrss;
+ use LONCAPA qw(:DEFAULT :match);
  sub parmval {
      my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
      return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
- Line 302  sub reset_caches {
+ Line 550  sub reset_caches {
      }
  }
  sub preset_defaults {
      my $type=shift;
      if (&rulescache($type.'_action') eq 'default') {
- Line 316  sub preset_defaults {
+ Line 566  sub preset_defaults {
      }
  }
- ##################################################
  sub date_sanity_info {
     my $checkdate=shift;
- Line 325  sub date_sanity_info {
+ Line 576  sub date_sanity_info {
     my $crsprefix='course.'.$env{'request.course.id'}.'.';
     if ($env{$crsprefix.'default_enrollment_end_date'}) {
        if ($checkdate>$env{$crsprefix.'default_enrollment_end_date'}) {
-          $result.='<br />'.&mt('After course enrollment end!');
+          $result.='<div class="LC_warning">'
+                  .&mt('After course enrollment end!')
+                  .'</div>';
        }
     }
     if ($env{$crsprefix.'default_enrollment_start_date'}) {
        if ($checkdate<$env{$crsprefix.'default_enrollment_start_date'}) {
-          $result.='<br />'.&mt('Before course enrollment start!');
+          $result.='<div class="LC_warning">'
+                  .&mt('Before course enrollment start!')
+                  .'</div>';
        }
     }
+ # Preparation for additional warnings about dates in the past/future.
+ # An improved, more context sensitive version is recommended,
+ # e.g. warn for due and answer dates which are defined before the corresponding open date, etc.
+ #   if ($checkdate<time) {
+ #      $result.='<div class="LC_info">'
+ #              .'('.&mt('in the past').')'
+ #              .'</div>';
+ #      }
+ #   if ($checkdate>time) {
+ #      $result.='<div class="LC_info">'
+ #              .'('.&mt('in the future').')'
+ #              .'</div>';
+ #      }
     return $result;
  }
  ##################################################
- Line 354  sub storeparm {
+ Line 622  sub storeparm {
      &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
  }
- #
- # Store a parameter by symb
- #
- # Takes
- # - symb
- # - name of parameter
- # - level
- # - new value
- # - new type
- # - username
- # - userdomain
  my %recstack;
  sub storeparm_by_symb {
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
- Line 519  sub storeparm_by_symb_inner {
+ Line 776  sub storeparm_by_symb_inner {
      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 551  sub valout {
+ Line 790  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+$//;
+             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=~s/\s+$//;
+             $result.=join(", ",@timer);
          } elsif (&isdateparm($type)) {
              $result = &Apache::lonlocal::locallocaltime($value).
  		&date_sanity_info($value);
- Line 583  sub valout {
+ Line 833  sub valout {
      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 615  sub plink {
+ Line 848  sub plink {
      my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
      unless (defined($winvalue)) { $winvalue=$val; }
      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="'.$marker.'" /></td></tr><tr><td align="center">'.
+     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
  	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
  	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
  	    $valout.'</a></td></tr></table>';
- Line 683  sub startpage {
+ Line 917  sub startpage {
      my %loaditems = ('onunload' => "pclose()",
  		     'onload'   => "group_or_section('cgroup')",);
+     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+ 	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+ 	&Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+ 	    text=>"Problem Parameters"});
+     } else {
+ 	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+ 	   text=>"Table Mode",
+ 	   help => 'Course_Setting_Parameters'});
+     }
      my $start_page =
  	&Apache::loncommon::start_page('Set/Modify Course Parameters',
  				       &page_js(),
- Line 693  sub startpage {
+ Line 936  sub startpage {
  $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 728  sub print_row {
+ Line 971  sub print_row {
      my $parm=$$display{$which};
      if ($parmlev eq 'full') {
-         $r->print('<td bgcolor='.$defbgtwo.' align="center">'
+         $r->print('<td style="background-color:'.$defbgtwo.';" align="center">'
                    .$$part{$which}.'</td>');
      } else {
          $parm=~s|\[.*\]\s||g;
      }
      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
      if ($automatic) {
  	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
      }
-     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
+     $r->print('<td>'.$parm.'</td>');
      my $thismarker=$which;
      $thismarker=~s/^parameter\_//;
- Line 814  sub print_row {
+ Line 1057  sub print_row {
  	}
      } # end of $parmlev if/else
-     $r->print('<td bgcolor="#CCCCFF" align="center">'.$effective_parm.'</td>');
+     $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
      if ($parmlev eq 'full') {
          my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                          '.'.$$name{$which},$$symbp{$rid});
          my $sessionvaltype=$typeoutpar[$result];
          if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
-         $r->print('<td bgcolor="#999999" align="center"><font color="#FFFFFF">'.
+         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
                    &valout($sessionval,$sessionvaltype).'&nbsp;'.
                    '</font></td>');
      }
- Line 831  sub print_row {
+ Line 1074  sub print_row {
  sub print_td {
      my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
-     $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
+     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
-               ' align="center">');
+               ';" align="center">');
-     if ($which<11 || $which > 12) {
+     my $nolink = 0;
- 	$r->print(&plink($$typeoutpar[$which],
+     if ($which == 11 || $which == 12) {
- 			 $$display{$value},$$outpar[$which],
+         $nolink = 1;
- 			 $mprefix."$which",'parmform.pres','psub'));
+     } elsif ($mprefix =~ /availablestudent\&$/) {
+         if ($which > 3) {
+             $nolink = 1;
+         }
+     }
+     if ($nolink) {
+         $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
      } else {
- 	$r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+         $r->print(&plink($$typeoutpar[$which],
+                          $$display{$value},$$outpar[$which],
+                          $mprefix."$which",'parmform.pres','psub'));
      }
      $r->print('</td>'."\n");
  }
- Line 858  sub print_usergroups {
+ Line 1109  sub print_usergroups {
      my $grp_parm;
      if (($coursereply) && ($cgroup ne $resultgroup)) {
          if ($result > 3) {
-             $bgcolor = '"#AAFFAA"';
+             $bgcolor = '#AAFFAA';
              $grp_parm = &valout($coursereply,$resulttype);
          }
          $grp_parm = &valout($coursereply,$resulttype);
-         $output = '<td bgcolor='.$bgcolor.' align="center">';
+         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
          if ($resultgroup && $resultlevel) {
              $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
          } else {
- Line 870  sub print_usergroups {
+ Line 1121  sub print_usergroups {
          }
          $output .= '</td>';
      } else {
-         $output .= '<td bgcolor='.$bgcolor.'>&nbsp;</td>';
+         $output .= '<td style="background-color:'.$bgcolor.';">&nbsp;</td>';
      }
      return ($coursereply,$output,$grp_parm,$resultgroup);
  }
- Line 899  sub parm_control_group {
+ Line 1150  sub parm_control_group {
      return($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
  }
- =pod
- =item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
- Input: See list below:
- =over 4
- =item B<ids>: An array that will contain all of the ids in the course.
- =item B<typep>: hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
- =item B<keyp>: hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
- =item B<allparms>: hash, name of parameter->display value (what is the display value?)
- =item B<allparts>: hash, part identification->text representation of part, where the text representation is "[Part $part]"
- =item B<allkeys>: hash, full key to part->display value (what's display value?)
- =item B<allmaps>: hash, ???
- =item B<fcat>: ???
- =item B<defp>: hash, ???
- =item B<mapp>: ??
- =item B<symbp>: hash, id->full sym?
- =back
- =cut
  sub extractResourceInformation {
      my $ids = shift;
- Line 971  sub extractResourceInformation {
+ Line 1190  sub extractResourceInformation {
  #
  	    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
  	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
- 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+ 		my ($display,$parmdis);
- 		my $parmdis = $display;
+ 		$display = &standard_parameter_names($name);
- 		$parmdis =~ s/\[Part.*$//g;
+ 		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}=
- Line 985  sub extractResourceInformation {
+ Line 1210  sub extractResourceInformation {
  # allparts is a hash of all parts
  #
  	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
- 	    $$allparts{$part} = "Part: $part";
+ 	    $$allparts{$part} = &mt('Part: [_1]',$part);
  #
  # Remember all keys going with this resource
  #
- Line 1010  sub extractResourceInformation {
+ Line 1235  sub extractResourceInformation {
  	    $$mapp{$mapid}=$$mapp{$id};
  	    $$allmaps{$mapid}=$$mapp{$id};
  	    if ($mapid eq '1') {
- 		$$maptitles{$mapid}='Main Course Documents';
+ 		$$maptitles{$mapid}=&mt('Main Course Documents');
  	    } else {
  		$$maptitles{$mapid}=
  		    &Apache::lonnet::gettitle($$mapp{$id});
- Line 1025  sub extractResourceInformation {
+ Line 1250  sub extractResourceInformation {
  }
- ##################################################
- ##################################################
  sub isdateparm {
      my $type=shift;
- Line 1099  sub parmmenu {
+ Line 1322  sub parmmenu {
  </script>
  ENDSCRIPT
      $r->print();
-     $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
+     $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}=~/\S/ ? $$allparms{$tempkey}
+         $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
- 		                                  : $tempkey)
+                                                   : $tempkey)
- 		  .'</label></td>');
+                   .'</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 1147  sub partmenu {
+ Line 1395  sub partmenu {
  	unless ($tempkey =~ /\./) {
  	    $r->print('<option value="'.$tempkey.'"');
  	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
- 		$r->print(' selected');
+ 		$r->print(' selected="selected"');
  	    }
  	    $r->print('>'.$$allparts{$tempkey}.'</option>');
  	}
- Line 1160  sub usermenu {
+ Line 1408  sub usermenu {
      my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
          &Apache::loncommon::selectstudent_link('parmform','uname','udom');
      my $selscript=&Apache::loncommon::studentbrowser_javascript();
-     my %lt=&Apache::lonlocal::texthash(
- 		    'se'    => "Section",
-                     'gr'    => "Group",
- 		    'fu'    => "For User",
- 		    'oi'    => "or ID",
- 		    'ad'    => "at Domain"
- 				       );
      my $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 1186  sub usermenu {
+ Line 1431  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 1214  function group_or_section(caller) {
+ Line 1460  function group_or_section(caller) {
      }
      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 1236  function group_or_section(caller) {
+ Line 1482  function group_or_section(caller) {
          }
          $groups.='</select>';
      }
-     $r->print(<<ENDMENU);
- <b>
+     if (%sectionhash || %grouphash) {
- $sections
+         $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
- $groups
+         $g_s_footer='</div></fieldset>';
- <br />
+     }
- $lt{'fu'}
- <input type="text" value="$uname" size="12" name="uname" />
+     $r->print('<b>'
- $lt{'oi'}
+              .$g_s_header
- <input type="text" value="$id" size="12" name="id" />
+              .$sections
- $lt{'ad'}
+              .$groups
- $chooseopt
+              .$g_s_footer
- </b>
+              .'<fieldset><legend>'.&mt('User').'</legend><div>'
- ENDMENU
+              .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+                  ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+                  ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
+                  ,$chooseopt)
+              .'</div></fieldset>'
+              .'</b>'
+     );
  }
  sub displaymenu {
- Line 1256  sub displaymenu {
+ Line 1508  sub displaymenu {
      $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
  	     &mt('Select Parts to View').'</th></tr><tr><td>');
      &parmmenu($r,$allparms,$pscat,$keyorder);
-     $r->print('</td><td>');
+     $r->print('</td><td valign="top" align="center">');
      &partmenu($r,$allparts,$psprt);
      $r->print('</td></tr></table>');
  }
- Line 1268  sub mapmenu {
+ Line 1520  sub mapmenu {
      $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
      foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
  	$r->print('<option value="'.$_.'"');
- 	if (($pschp eq $_)) { $r->print(' selected'); }
+ 	if (($pschp eq $_)) { $r->print(' selected="selected"'); }
  	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
      }
      $r->print("</select>");
- Line 1282  sub levelmenu {
+ Line 1534  sub levelmenu {
      foreach (reverse sort keys %{$alllevs}) {
  	$r->print('<option value="'.$$alllevs{$_}.'"');
  	if ($parmlev eq $$alllevs{$_}) {
- 	    $r->print(' selected');
+ 	    $r->print(' selected="selected"');
  	}
- 	$r->print('>'.$_.'</option>');
+ 	$r->print('>'.&mt($_).'</option>');
      }
      $r->print("</select>");
  }
- Line 1295  sub sectionmenu {
+ Line 1547  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 1314  sub groupmenu {
+ Line 1566  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 1364  sub sortmenu {
+ Line 1616  sub sortmenu {
      my ($r,$sortorder)=@_;
      $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
      if ($sortorder eq 'realmstudent') {
-        $r->print(' checked="on"');
+        $r->print(' checked="checked"');
      }
      $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
      $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
      if ($sortorder eq 'studentrealm') {
-        $r->print(' checked="on"');
+        $r->print(' checked="checked"');
      }
      $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
  	      '</label>');
- Line 1398  sub standardkeyorder {
+ Line 1650  sub standardkeyorder {
              'parameter_0_discusshide' => 20);
  }
- ##################################################
- ##################################################
- =pod
- =item assessparms
- Show assessment data and parameters.  This is a large routine that should
- be simplified and shortened... someday.
- Inputs: $r
- Returns: nothing
- Variables used (guessed by Jeremy):
- =over 4
- =item B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
- =item B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
- =item B<allmaps>:
- =back
- =cut
- ##################################################
- ##################################################
  sub assessparms {
      my $r=shift;
- Line 1582  sub assessparms {
+ Line 1805  sub assessparms {
          my @values=split(/\&\&\&/,$env{'form.pres_value'});
          my @types=split(/\&\&\&/,$env{'form.pres_type'});
  	for (my $i=0;$i<=$#markers;$i++) {
+             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+                 my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 my (@ok_slots,@fail_slots,@del_slots);
+                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+                 my ($level,@all) =
+                     &parmval_by_symb('0.availablestudent',$pssymb,'',$uname,$udom,
+                                      $csec,$cgroup,$courseopt);
+                 foreach my $slot_name (split(/:/,$values[$i])) {
+                     next if ($slot_name eq '');
+                     if (&update_slots($slot_name,$cdom,$cnum,$pssymb,$uname,$udom) eq 'ok') {
+                         push(@ok_slots,$slot_name);
+                     } else {
+                         push(@fail_slots,$slot_name);
+                     }
+                 }
+                 if (@ok_slots) {
+                     $values[$i] = join(':',@ok_slots);
+                 } else {
+                     $values[$i] = '';
+                 }
+                 if ($all[$level] ne '') {
+                     my @existing = split(/:/,$all[$level]);
+                     foreach my $slot_name (@existing) {
+                         if (!grep(/^\Q$slot_name\E$/,split(/:/,$values[$i]))) {
+                             if (&delete_slots($slot_name,$cdom,$cnum,$uname,$udom,$pssymb) eq 'ok') {
+                                 push(@del_slots,$slot_name);
+                             }
+                         }
+                     }
+                 }
+             }
  	    $message.=&storeparm(split(/\&/,$markers[$i]),
  				 $values[$i],
  				 $types[$i],
- Line 1608  sub assessparms {
+ Line 1864  sub assessparms {
      if (!$pssymb) {
          $r->print('<table border="1"><tr><td>');
          &levelmenu($r,\%alllevs,$parmlev);
+         $r->print('</td>');
  	if ($parmlev ne 'general') {
              $r->print('<td>');
  	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
  	    $r->print('</td>');
  	}
-         $r->print('</td></tr></table>');
+         $r->print('</tr></table>');
  	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
      } else {
          my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
- Line 1650  sub assessparms {
+ Line 1907  sub assessparms {
                $coursespan += 3;
             }
-            $r->print('<p><table border=2>');
+            $r->print('<p><table border="2">');
-            $r->print('<tr><td colspan=5></td>');
+            $r->print('<tr><td colspan="5"></td>');
-            $r->print('<th colspan='.($coursespan).'>'.&mt('Any User').'</th>');
+            $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
             if ($uname) {
                 if (@usersgroups > 1) {
                     $userspan ++;
- Line 1678  sub assessparms {
+ Line 1935  sub assessparms {
  				  'fr'     => 'for Resource'
  					      );
             $r->print(<<ENDTABLETWO);
- <th rowspan=3>$lt{'pie'}</th>
+ <th rowspan="3">$lt{'pie'}</th>
- <th rowspan=3>$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
+ <th rowspan="3">$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
- </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
+ </tr><tr><td colspan="5"></td><th colspan="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
- <th colspan=1>$lt{'ic'}</th>
+ <th colspan="1">$lt{'ic'}</th>
  ENDTABLETWO
             if ($csec) {
-                 $r->print("<th colspan=3>".
+                 $r->print('<th colspan="3">'.
  			  &mt("in Section")." $csec</th>");
             }
             if ($cgroup) {
-                 $r->print("<th colspan=3>".
+                 $r->print('<th colspan="3">'.
                            &mt("in Group")." $cgroup</th>");
             }
             $r->print(<<ENDTABLEHEADFOUR);
- Line 1730  ENDTABLEHEADFOUR
+ Line 1987  ENDTABLEHEADFOUR
  		    ||
  		    ($pssymb && $pssymb eq $symbp{$rid})) {
  # ------------------------------------------------------ Entry for one resource
-                     if ($defbgone eq '"#E0E099"') {
+                     if ($defbgone eq '#E0E099') {
-                         $defbgone='"#E0E0DD"';
+                         $defbgone='#E0E0DD';
                      } else {
-                         $defbgone='"#E0E099"';
+                         $defbgone='#E0E099';
                      }
-                     if ($defbgtwo eq '"#FFFF99"') {
+                     if ($defbgtwo eq '#FFFF99') {
-                         $defbgtwo='"#FFFFDD"';
+                         $defbgtwo='#FFFFDD';
                      } else {
-                         $defbgtwo='"#FFFF99"';
+                         $defbgtwo='#FFFF99';
                      }
-                     if ($defbgthree eq '"#FFBB99"') {
+                     if ($defbgthree eq '#FFBB99') {
-                         $defbgthree='"#FFBBDD"';
+                         $defbgthree='#FFBBDD';
                      } else {
-                         $defbgthree='"#FFBB99"';
+                         $defbgthree='#FFBB99';
                      }
                      my $thistitle='';
- Line 1760  ENDTABLEHEADFOUR
+ Line 2017  ENDTABLEHEADFOUR
                          if (grep $_ eq $tempkeyp, @catmarker) {
                            $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
                            $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
-                           $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
+                           my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
+                           if ($allparms{$name{$_}} ne '') {
+                               my $identifier;
+                               if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                   $identifier = $1;
+                               }
+                               $display{$_} = $allparms{$name{$_}}.$identifier;
+                           } else {
+                               $display{$_} = $parmdis;
+                           }
                            unless ($display{$_}) { $display{$_}=''; }
                            $display{$_}.=' ('.$name{$_}.')';
                            $default{$_}=&Apache::lonnet::metadata($uri,$_);
- Line 1772  ENDTABLEHEADFOUR
+ Line 2038  ENDTABLEHEADFOUR
                      if ($totalparms>0) {
                          my $firstrow=1;
  			my $title=&Apache::lonnet::gettitle($symbp{$rid});
-                         $r->print('<tr><td bgcolor='.$defbgone.
+                         $r->print('<tr><td style="background-color:'.$defbgone.';"'.
                               ' rowspan='.$totalparms.
-                              '><tt><font size=-1>'.
+                              '><tt><font size="-1">'.
                               join(' / ',split(/\//,$uri)).
                               '</font></tt><p><b>'.
                               "<a href=\"javascript:openWindow('".
- Line 1787  ENDTABLEHEADFOUR
+ Line 2053  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 1814  ENDTABLEHEADFOUR
+ Line 2080  ENDTABLEHEADFOUR
          } # end of  full
  #--------------------------------------------------- Entry for parm level map
          if ($parmlev eq 'map') {
-             my $defbgone = '"E0E099"';
+             my $defbgone = '#E0E099';
-             my $defbgtwo = '"FFFF99"';
+             my $defbgtwo = '#FFFF99';
-             my $defbgthree = '"FFBB99"';
+             my $defbgthree = '#FFBB99';
              my %maplist;
- Line 1867  ENDTABLEHEADFOUR
+ Line 2133  ENDTABLEHEADFOUR
                        if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                          $part{$tempkeyp}="0";
                          $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                         $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                         my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                         if ($allparms{$name{$tempkeyp}} ne '') {
+                             my $identifier;
+                             if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                 $identifier = $1;
+                             }
+                             $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                         } else {
+                             $display{$tempkeyp} = $parmdis;
+                         }
                          unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                          $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
                          $display{$tempkeyp} =~ s/_\w+_/_0_/;
- Line 1881  ENDTABLEHEADFOUR
+ Line 2156  ENDTABLEHEADFOUR
  #---------------------------------------------------- print header information
                  my $foldermap=&mt($maptitle=~/^uploaded/?'Folder':'Map');
                  my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
-                 $r->print(<<ENDMAPONE);
+                 my $tmp="";
- <center><h4>
- Set Defaults for All Resources in $foldermap<br />
- <font color="red"><i>$showtitle</i></font><br />
- Specifically for
- ENDMAPONE
                  if ($uname) {
  		    my $person=&Apache::loncommon::plainname($uname,$udom);
-                     $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
+                     $tmp.=&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
-                         &mt('in')." \n");
+                         &mt('in')." \n";
                  } else {
-                     $r->print("<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n");
+                     $tmp.="<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n";
                  }
                  if ($cgroup) {
-                     $r->print(&mt("Group")." <font color=\"red\"><i>$cgroup".
+                     $tmp.=&mt("Group")." <font color=\"red\"><i>$cgroup".
-                               "</i></font> ".&mt('of')." \n");
+                               "</i></font> ".&mt('of')." \n";
                      $csec = '';
                  } elsif ($csec) {
-                     $r->print(&mt("Section")." <font color=\"red\"><i>$csec".
+                     $tmp.=&mt("Section")." <font color=\"red\"><i>$csec".
-                               "</i></font> ".&mt('of')." \n");
+                               "</i></font> ".&mt('of')." \n";
                  }
-                 $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
+                 $r->print('<div align="center"><h4>'
-                 $r->print("</h4>\n");
+                          .&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
+                              ,$foldermap.'<br /><font color="red"><i>'.$showtitle.'</i></font><br />'
+                              ,$tmp
+                              ,'<font color="red"><i>'.$coursename.'</i></font>'
+                              )
+                          ."<br /></h4>\n"
+                 );
  #---------------------------------------------------------------- print table
-                 $r->print('<p><table border="2">');
+                 $r->print('<p>'.&Apache::loncommon::start_data_table()
-                 $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
+                          .&Apache::loncommon::start_data_table_header_row()
-                 $r->print('<th>'.&mt('Default Value').'</th>');
+                          .'<th>'.&mt('Parameter Name').'</th>'
-                 $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+                          .'<th>'.&mt('Default Value').'</th>'
+                          .'<th>'.&mt('Parameter in Effect').'</th>'
+                          .&Apache::loncommon::end_data_table_header_row()
+                 );
  	        foreach (&keysinorder(\%name,\%keyorder)) {
-                     $r->print('<tr>');
+                     $r->print(&Apache::loncommon::start_data_table_row());
                      &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                             \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                             $parmlev,$uname,$udom,$csec,$cgroup);
                  }
-                 $r->print("</table></center>");
+                 $r->print(&Apache::loncommon::end_data_table().'</p>'
+                          .'</div>'
+                 );
              } # end each map
          } # end of $parmlev eq map
  #--------------------------------- Entry for parm level general (Course level)
          if ($parmlev eq 'general') {
-             my $defbgone = '"E0E099"';
+             my $defbgone = '#E0E099';
-             my $defbgtwo = '"FFFF99"';
+             my $defbgtwo = '#FFFF99';
-             my $defbgthree = '"FFBB99"';
+             my $defbgthree = '#FFBB99';
  #-------------------------------------------- for each map, gather information
              my $mapid="0.0";
- Line 1954  ENDMAPONE
+ Line 2235  ENDMAPONE
                    if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                      $part{$tempkeyp}="0";
                      $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                     $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                     my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                     if ($allparms{$name{$tempkeyp}} ne '') {
+                         my $identifier;
+                         if ($parmdis =~ /(\s*\[Part.*)$/) {
+                             $identifier = $1;
+                         }
+                         $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                     } else {
+                         $display{$tempkeyp} = $parmdis;
+                     }
                      unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                      $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
                      $display{$tempkeyp} =~ s/_\w+_/_0_/;
- Line 1967  ENDMAPONE
+ Line 2257  ENDMAPONE
  #---------------------------------------------------- print header information
  	    my $setdef=&mt("Set Defaults for All Resources in Course");
              $r->print(<<ENDMAPONE);
- <center><h4>$setdef
+ <center>
+ <h4>$setdef
  <font color="red"><i>$coursename</i></font><br />
  ENDMAPONE
              if ($uname) {
- Line 1981  ENDMAPONE
+ Line 2272  ENDMAPONE
              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='';
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
+ 	text=>"Course Environment"});
      my $breadcrumbs =
  	&Apache::lonhtmlcommon::breadcrumbs('Edit Course Environment');
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my (%crsinfo,$chome);
+     my $crstype = &Apache::loncommon::course_type();
      #
      # Go through list of changes
      foreach (keys %env) {
- Line 2035  sub crsenv {
+ Line 2320  sub crsenv {
          if ($name eq 'newp') {
              $name = $env{'form.newp_name'};
          }
+         if ($name =~ /^rolenames_([^_]+)$/) {
+             $name = $1.'.plaintext';
+             my $standardtitle =
+                 &Apache::lonnet::plaintext($1,$crstype,$env{'request.course.id'},1);
+             my %adv_roles =
+                 &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
+             if ($value ne '') {
+                 foreach my $role (keys(%adv_roles)) {
+                     if ($role =~ m{^cr/$match_domain/$match_name/\Q$value\E$}) {
+                         $setoutput.= '<span class="LC_error">'.
+                                      &mt('Requested replacement title for [_1] role is already used as the name of a custom role ([_2]).',$standardtitle,$value).
+                                      '</span><br />';
+                         undef($value);
+                     }
+                 }
+             }
+         }
          if ($name eq 'url') {
              $value=~s/^\/res\///;
              my $bkuptime=time;
- Line 2085  sub crsenv {
+ Line 2387  sub crsenv {
  		my ($name,$domain) = split(':',$user);
  		if (!defined($user) || !defined($domain)) {
  		    $setoutput.= '<br /> <span class="LC_error">'.
- 			&mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ 			&mt("Invalid e-mail address specified, address must be of the form username:domain what was specified was ([_1])",$user).
  			'</span>';
  		    undef($value);
  		} elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
  		    $setoutput.= '<br /> <span class="LC_error">'.
- 			&mt("Invalid email address specified, user [_1] is unknown.",$name).
+ 			&mt("Invalid e-mail address specified, user [_1] is unknown.",$name).
  			'</span>';
  		    undef($value);
  		}
- Line 2120  sub crsenv {
+ Line 2422  sub crsenv {
              my $put_result = &Apache::lonnet::put('environment',
                                                    {$name=>$value},$dom,$crs);
              if ($put_result eq 'ok') {
-                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
+                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>';
+                 if ($name =~ /^default_enrollment_(start|end)_date$/) {
+                     $setoutput .= &Apache::lonlocal::locallocaltime($value);
+                 } elsif ($name eq 'categories') {
+                     $setoutput .= $env{'form.categories_display'};
+                 } else {
+                     $setoutput .= $value;
+                 }
+                 $setoutput .= '</b>.<br />';
                  if ($name eq 'cloners') {
                      &change_clone($value,\@oldcloner);
                  }
                  # Update environment and nohist_courseids.db
+                 if (($name eq 'description') || ($name eq 'cloners') ||
+                     ($name eq 'hidefromcat') || ($name eq 'categories')) {
+                     if ($chome eq '') {
+                         %crsinfo =
+                             &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
+                                                  $crs,undef,undef,'.');
+                         $chome = &Apache::lonnet::homeserver($crs,$dom);
+                     }
+                 }
                  if ($name eq 'description' && defined($value)) {
-                     my %crsinfo =
+                     &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.description' => $value});
-                         &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
-                                                  $crs,undef,undef,'Course');
-                     &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.description' => $value);
                      if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
                          $crsinfo{$env{'request.course.id'}}{'description'} = $value;
-                         my $chome = &Apache::lonnet::homeserver($crs,$dom);
+                         my $putresult =
+                             &Apache::lonnet::courseidput($dom,\%crsinfo,
+                                                          $chome,'notime');
+                     }
+                 }
+                 if (($name eq 'cloners') || ($name eq 'hidefromcat') || ($name eq 'categories')) {
+                     if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                         &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$name => $value});
+                         $crsinfo{$env{'request.course.id'}}{$name} = $value;
                          my $putresult =
                              &Apache::lonnet::courseidput($dom,\%crsinfo,
                                                           $chome,'notime');
- Line 2174  sub crsenv {
+ Line 2498  sub crsenv {
          }
      }
-     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'},
- Line 2188  sub crsenv {
+ Line 2509  sub crsenv {
      my $SelectStyleFile=&mt('Select Style File');
      my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
      my $output='';
+     my $output_SB = ''; # will be replaced by "$output" when all changes are done
+     my $can_categorize;
+     my %lt=&Apache::lonlocal::texthash(
+                'par'   => 'Parameter',
+                'val'   => 'Value',
+                'set'   => 'Set?',
+                'sav'   => 'Save',
+            );
      if (! exists($values{'con_lost'})) {
          my %descriptions=
- 	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
+ 	    ('url'            => '<b>'.&mt('Top Level Map').'</b><br />'.
                                   '<a href="javascript:openbrowser'.
                                   "('envform','url','sequence')\">".
                                   &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                                  &mt('Modification may make assessment data inaccessible').
+                                  &mt('Modification may make assessment data inaccessible!').
                                   '</span>',
-              'description'    => '<b>'.&mt('Course Description').'</b>',
+              'description'    => '<b>'.&mt('Course Title').'</b>',
               'courseid'       => '<b>'.&mt('Course ID or number').
                                   '</b><br />'.
-                                  '('.&mt('internal').', '.&mt('optional').')',
+                                  '('.&mt('internal, optional').')',
-              'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain,*:domain)</tt><br />'.&mt('Users with active Course Coordinator role in course are permitted to clone and need not be included.<br />
+              'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br />'
- Use *:domain to allow course to be cloned by anyone in the specified domain.<br />
+                                 .'("<tt>'.&mt('user:domain,user:domain,*:domain').'</tt>")<br />'
- Use * to allow unrestricted cloning in all domains.'),
+                                 .&mt('Users with active Course Coordinator role in this course are permitted to clone and need not be included.').'<br />'
+                                 .&mt('Use [_1] to allow course to be cloned by anyone in the specified domain.','"<tt>*:domain</tt>"').'<br />'
+                                 .&mt('Use [_1] to allow unrestricted cloning in all domains.','"<tt>*</tt>"'),
               'grading'        => '<b>'.&mt('Grading').'</b><br />'.
-                                  '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
+                                  &mt('[_1], [_2], or [_3]','"<tt>standard</tt>"','"<tt>external</tt>"','"<tt>spreadsheet</tt>"').&Apache::loncommon::help_open_topic('GradingOptions'),
- 	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'.
+ 	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'
-                                  &mt('Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections, "[_1]" they are allowed (this is the default), "[_2]" no, they can only grade their own section','<tt>any</tt>','<tt>section</tt>'),
+                                 .&mt('Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections.').'<br />'
-              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
+                                 .'('.&mt('[_1]: they are allowed (this is the default). [_2]: no, they can only grade their own section.','"<tt>any</tt>"','"<tt>section</tt>"').')',
+              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b><br />'.
                      '<a href="javascript:openbrowser'.
                      "('envform','default_xml_style'".
                      ",'sty')\">$SelectStyleFile</a><br />",
-              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
+              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').'</b><br />'
-                                  '</b><br />(<tt>user:domain,'.
+                                 .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
-                                  'user:domain(section;section;...;*;...),...</tt>)',
+              'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').'</b>',
-              'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
+              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'
-                                  '</b>',
+                                 .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
-              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
+              'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').'</b>',
-                                  '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b><br />'
-              'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
+                                  .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
-                                  '</b>',
+              'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').'</b>',
-              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
+              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'
-                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+                                 .'('.&mt('[_1] for default hiding','"<tt>yes</tt>"').')',
-              'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
+              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'
-                                  '</b>',
+                                  .'('.&mt('[_1] for visible separation.','"<tt>yes</tt>"').' '
-              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
+                                  .&mt('Changes will not show until next login.').')',
-                                  '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
+              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'
-              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
+                                         .'('.&mt('[_1]: students can view all sections. [_2]: students can only view their own section. blank or [_3] prevents student view.','"<tt>all</tt>"','"<tt>section</tt>"','"<tt>disabled</tt>"').')',
-                                  '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
+              'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'
-                                  &mt('changes will not show until next login').')',
+                                              .'('.&mt("[_1] for link to each a listing of each student's files.",'"<tt>yes</tt>"').')',
-              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.)'),
+              'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'
-              'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'.&mt('"[_1]" for link to each a listing of each student\'s files.','<tt>yes</tt>'),
+                                            .'('.&mt('[_1] to require students to opt-in to listing in the roster (on the roster page).','"<tt>yes</tt>"').')',
-              'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'.&mt('"[_1]" to require students to opt-in to listing in the roster (on the roster page).','<tt>yes</tt>'),
+              'plc.roles.denied'=> '<b>'.&mt('Disallow chat room use for Roles').'</b><br />'
-              'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
+                                  .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<br />'
-                                   '</b><br />("<tt>st</tt>": '.
+                                  .'("<tt>'.&mt('role,role,...').'</tt>") '
-                                   &mt('student').', "<tt>ta</tt>": '.
+ 	                         .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-                                   '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 />'.
+                           '<b>'.&mt('Disallow chat room use for Users').'</b><br />'.
-                                  '(<tt>user:domain,user:domain,...</tt>)',
+                                   '("<tt>'.&mt('user:domain,user:domain,...').'</tt>")',
-              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
+              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').'</b><br />'
-                                   '</b><br />("<tt>st</tt>": '.
+                                  .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"')
-                                   'student, "<tt>ta</tt>": '.
+                                  .'("<tt>'.&mt('role,role,...').'</tt>") '
-                                   'TA, "<tt>in</tt>": '.
+                                  .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
-                                   'instructor;<br /><tt>role,role,...</tt>) '.
- 	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
               'pch.users.denied' =>
                            '<b>'.&mt('Disallow Resource Discussion for Users').'</b><br />'.
-                                  '(<tt>user:domain,user:domain,...</tt>)',
+                                  '("<tt>'.&mt('user:domain,user:domain,...').'</tt>")',
               'spreadsheet_default_classcalc'
                   => '<b>'.&mt('Default Course Spreadsheet').'</b> '.
                      '<a href="javascript:openbrowser'.
                      "('envform','spreadsheet_default_classcalc'".
                      ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
               'spreadsheet_default_studentcalc'
-                  => '<b>'.&mt('Default Student Spreadsheet').'</b> '.
+                  => '<b>'.&mt('Default Student Spreadsheet').'</b><br />'.
                      '<a href="javascript:openbrowser'.
                      "('envform','spreadsheet_default_calc'".
                      ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
- Line 2268  Use * to allow unrestricted cloning in a
+ Line 2595  Use * to allow unrestricted cloning in a
                      ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
  	     'allow_limited_html_in_feedback'
  	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
- 	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
+ 	            '('.&mt('Set value to [_1] to allow.','"<tt>yes</tt>"').')',
               'allow_discussion_post_editing'
-                  => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />"<tt>st</tt>": '.
+                  => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />'
-                                   &mt('student').', "<tt>ta</tt>": '.
+                    .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<br />'
-                                   'TA, "<tt>in</tt>": '.
+                    .'('.&mt('Set value to [_1] to allow all roles.','"<tt>yes</tt>"').')'
-                                   &mt('instructor').';&nbsp;(<tt>'.&mt('role:section,role:section,..., e.g., st:001,st:002,in,cc would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').'</tt>)<br />'.
+                    .'("<tt>'.&mt('role:section,role:section,...').'</tt>")<br />'
-                     '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
+                    .'('.&mt('Example: "<tt>st:001,st:002,in,cc</tt>" would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').')',
  	     'rndseed'
- 	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
+ 	         => '<b>'.&mt('Randomization algorithm used').'</b><br />'
-                     '<span class="LC_error">'.&mt('Modifying this will make problems').' '.
+                    .'<span class="LC_error">'
-                     &mt('have different numbers and answers').'</span>',
+                    .&mt('Modifying this will make problems have different numbers and answers!')
+                    .'</span>',
  	     'receiptalg'
  	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
                      &mt('This controls how receipt numbers are generated.'),
               'suppress_tries'
                   => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
-                     ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
+                     ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',
               'problem_stream_switch'
                   => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
-                     ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
+                     ' ('.&mt('[_1] if allowed, anything else if not','"<tt>yes</tt>"').')',
               'default_paper_size'
                   => '<b>'.&mt('Default paper type').'</b><br />'.
                      ' ('.&mt('supported types').': Letter [8 1/2x11 in], Legal [8 1/2x14 in],'.
                      ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'.
                      ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
  	     'print_header_format'
- 	         => &mtn('<b> Print header format; substitutions </b>:  %n student name %c course id %a assignment note, numbers after the % limit the field size.').'</b>',
+ 	         => ' <b>'.&mt('Print header format').'</b><br />'
+                    .&mt('Substitutions:<br />[_1]: student name, [_2]: course id, [_3]: assignment note. Numbers after the <tt>%</tt> limit the field size.','"<tt>%n</tt>"','"<tt>%c</tt>"','"<tt>%a</tt>"'),
               'default_enrollment_start_date' => '<b>'.&mt('Default beginning date for student access.').'</b>',
               'default_enrollment_end_date'   => '<b>'.&mt('Default ending date for student access.').'</b>',
-              'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b>'.
+              'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b><br />'
-                                  '<br />(<tt>user:domain,user:domain,...</tt>)',
+                                      .'("<tt>'.&mt('user:domain,user:domain,*:domain').'</tt>")',
               'languages' => '<b>'.&mt('Languages used').'</b>',
               'disable_receipt_display'
                   => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
  	     'task_messages'
- 	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
+ 	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','"<tt>only_student</tt>"','"<tt>student_and_user_notes_screen</tt>"').')',
  	     'disablesigfigs'
  	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
- Line 2314  Use * to allow unrestricted cloning in a
+ Line 2643  Use * to allow unrestricted cloning in a
               'externalsyllabus'
                   => '<b>'.&mt('URL of Syllabus (not using internal handler)').'</b>',
  	     'tthoptions'
- 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>',
+ 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting TeX').'</b>',
  	     'texengine'
- 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'.&mt('(Valid options are [_1].)','"tth", "jsMath", "mimetex"').'</b>',
+ 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'
-              );
+                    .'('.&mt("[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student's preference",'"<tt>jsMath</tt>"','"<tt>mimetex</tt>"','"<tt>tth</tt>"').')',
-         my @Display_Order = ('url','description','courseid','cloners','grading',
+              'timezone'
-                              'externalsyllabus',
+                  => '<b>'.&mt('Timezone in which the course takes place').'</b>',
-                              'default_xml_style','pageseparators',
-                              'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
+              'suppress_embed_prompt'
-                              'student_classlist_view',
+                  => '<b>'.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').'</b><br />'.
-                              'student_classlist_opt_in',
+                     ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',
-                              'student_classlist_portfiles',
+              'hidefromcat'
-                              'plc.roles.denied','plc.users.denied',
+                  => '<b>'.&mt('Exclude from course catalog').'</b><br />'.
-                              'pch.roles.denied','pch.users.denied',
+                     ' ('.&mt('[_1] to exclude, anything else to include - included if assigned an institutional code, or manually catagorized','"<tt>yes</tt>"').')',
-                              'allow_limited_html_in_feedback',
+              'categories'
-                              'allow_discussion_post_editing',
+                  => '<b>'.&mt('Categorize course').'</b> <a href="javascript:catsbrowser()">'.
-                              'languages',
+                     &mt('Display Categories').'</a>',
- 			     'nothideprivileged',
+              'datelocale'
-                              'rndseed',
+                  => '<b>'.&mt('Locale used for course calendar').'</b>',
-                              'receiptalg',
+              'rolenames'
-                              'problem_stream_switch',
+                  => '<b>'.&mt('Replacement titles for standard course roles').'</b><br />'.
- 			     'suppress_tries',
+                     '('.&mt('To replace the standard title for a course role, enter the title you wish to use, otherwise leave blank.').')',
-                              'default_paper_size',
+              );
- 			     'print_header_format',
-                              'disable_receipt_display',
-                              'spreadsheet_default_classcalc',
+ # ----------------------------------------------------------------
-                              'spreadsheet_default_studentcalc',
+ # Begin: New Version with Parameter Categories
-                              'spreadsheet_default_assesscalc',
-                              'hideemptyrows',
+     sub parameter_row {
-                              'default_enrollment_start_date',
+         # Create parameter row for course environment screen
-                              'default_enrollment_end_date',
- 			     'tthoptions',
+         my ($parameter, $description) = @_;
- 			     'texengine',
- 			     'disablesigfigs',
+         # Start Parameter Row
- 			     'disableexampointprint',
+         my $output = &Apache::loncommon::start_data_table_row();
- 			     'task_messages','task_grading',
-                              );
+         # Column 1/3: Descriptive text of current parameter
- 	foreach my $parameter (sort(keys(%values))) {
+         $output .= '<td>'.$description.'</td>';
-             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
-                 if (! $descriptions{$parameter}) {
+         # Column 2/3: Input field (Sometimes special field(s), depending on parameter)
-                     $descriptions{$parameter}=$parameter;
-                     push(@Display_Order,$parameter);
+         # onchange is javascript to automatically check the 'Set' button.
-                 }
+         my $onchange = 'onFocus="javascript:window.document.forms'
-             }
+                       ."['envform'].elements['".$parameter."_setparmval']"
- 	}
+                       .'.checked=true;"';
-         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',
- Line 2375  Use * to allow unrestricted cloning in a
+ Line 2695  Use * to allow unrestricted cloning in a
                                                          $values{$parameter},
                                                          $onchange).
                                                          '</td>';
-             } else {
+             } elsif ($parameter eq 'timezone') {
+                 my $includeempty = 1;
+                 my $timezone = &Apache::lonlocal::gettimezone();
+                 $output .= '<td>'.
+                     &Apache::loncommon::select_timezone($parameter.'_value',
+                                                         $timezone,
+                                                         $onchange,$includeempty).'</td>';
+             } elsif ($parameter eq 'datelocale') {
+                 my $includeempty = 1;
+                 my $locale_obj = &Apache::lonlocal::getdatelocale();
+                 my $currdatelocale;
+                 if (ref($locale_obj)) {
+                     $currdatelocale = $locale_obj->id();
+                 }
+                 $output .= '<td>'.
+                     &Apache::loncommon::select_datelocale($parameter.'_value',
+                                                           $currdatelocale,
+                                                           $onchange,$includeempty).'</td>';
+             } elsif ($parameter eq 'rolenames') {
+                 $output.= '<td><table>';
+                 foreach my $role ('cc','in','ta','ep','ad','st') {
+                     my $onchange = 'onFocus="javascript:window.document.forms'.
+                                    "['envform'].elements['".
+                                    $parameter.'_'.$role."_setparmval']".
+                                    '.checked=true;"';
+                     $output.= '<tr><td>'.&Apache::lonnet::plaintext($role,$crstype,undef,1).
+                               '</td><td>'.
+                               &Apache::lonhtmlcommon::textbox($parameter.'_'.$role.'_value',
+                                                     $values{$role.'.plaintext'},
+,$onchange).
+                               '</td></tr>';
+                 }
+                 $output .= '</table></td><td><table>';
+                 foreach my $role ('cc','in','ta','ep','ad','st') {
+                     $output .= '<tr><td>'.&Apache::lonhtmlcommon::checkbox($parameter.'_'.$role.'_setparmval').
+                               '</td></tr>';
+                 }
+                 $output .= '</table></td>';
+             } elsif ($parameter eq 'categories') {
+                 my $catdisplay;
+                 if ($values{'categories'} ne '') {
+                     my @curritems = split(/\&/,$values{'categories'});
+                     foreach my $item (@curritems) {
+                         my ($name,$parent,$pos) = split(/:/,$item);
+                         $catdisplay .= &unescape($name).'&';
+                     }
+                     $catdisplay =~ s/\&$//;
+                 }
                  $output .= '<td>'.
-                     &Apache::lonhtmlcommon::textbox($parameter.'_value',
+                            '<input type="hidden" name="categories_value" value="'.
-                                                     $values{$parameter},
+                            $values{'categories'}.'" />'.
-,$onchange).'</td>';
+                            '<input type="textbox" name="categories_display" value="'.
-             }
+                            $catdisplay.'" readonly="readonly" size="40" /></td>';
-             $output .= '<td>'.
+             } else { # Display default textbox in all other cases
-                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+                 $output .= '<td>'
-                 '</td>';
+                           .&Apache::lonhtmlcommon::textbox($parameter.'_value',
-             $output .= &Apache::loncommon::end_data_table_row()."\n";
+                                                            $values{$parameter},
- 	}
+,
-         my $onchange = 'onFocus="javascript:window.document.forms'.
+                                                            $onchange)
-             '[\'envform\'].elements[\'newp_setparmval\']'.
+                           .'</td>';
-             '.checked=true;"';
+             }
- 	$output.=&Apache::loncommon::start_data_table_row().
- 	    '<td><i>'.&mt('Create New Environment Variable').'</i><br />'.
+         # Column 3/3: Check Box (in most cases)
- 	    '<input type="text" size=40 name="newp_name" '.
+         unless ($parameter eq 'rolenames') {
-                 $onchange.' /></td><td>'.
+             $output .= '<td>'
-             '<input type="text" size=40 name="newp_value" '.
+                       .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval')
-                 $onchange.' /></td><td>'.
+                       .'</td>';
- 	    '<input type="checkbox" name="newp_setparmval" /></td>'.
+         }
- 	    &Apache::loncommon::end_data_table_row()."\n";
+         # End Parameter Row
+         $output .= &Apache::loncommon::end_data_table_row();
+         return $output;
+     } # End sub parameter_row
+     # Parameter Category Names
+     my %parm_cat_names = &Apache::lonlocal::texthash (
+         'cat_0'      => 'Parameter Category Zero',
+         'cat_1'      => 'Parameter Category One',
+         'cat_2'      => 'Parameter Category Two',
+         'cat_3'      => 'Parameter Category Three',
+         'cat_4'      => 'Parameter Category Four',
+         'cat_5'      => 'Parameter Category Five',
+         'cat_6'      => 'Parameter Category Six',
+         'cat_7'      => 'Parameter Category Seven',
+         'cat_can'    => 'Parameter Category Can',
+         'cat_custom' => 'Parameter Category Custom',
+     );
+     # Display Order of Parameter Categories
+     my @Display_Order = (
+         'cat_0',
+         'cat_1',
+         'cat_2',
+         'cat_3',
+         'cat_4',
+         'cat_5',
+         'cat_6',
+         'cat_7',
+         'cat_can',
+         'cat_custom',
+     );
+     # Link Parameter Categories with Parameters
+     # Order of parameters is display order
+     my %parm_cat_parms = (
+         'cat_0' => [
+             'url',
+             'description',
+             'courseid',
+             'cloners'
+         ],
+         'cat_1' => [
+             'grading',
+             'externalsyllabus',
+             'default_xml_style',
+             'pageseparators'
+         ],
+         'cat_2' => [
+             'question.email',
+             'question.email.text',
+             'comment.email',
+             'comment.email.text',
+             'policy.email',
+             'policy.email.text',
+         ],
+         'cat_3' => [
+             'student_classlist_view',
+             'student_classlist_opt_in',
+             'student_classlist_portfiles',
+             'plc.roles.denied',
+             'plc.users.denied',
+             'pch.roles.denied',
+             'pch.users.denied',
+             'allow_limited_html_in_feedback',
+             'allow_discussion_post_editing',
+         ],
+         'cat_4' => [
+             'languages',
+             'timezone',
+             'datelocale',
+             'rolenames',
+             'nothideprivileged',
+             'rndseed',
+             'receiptalg',
+             'problem_stream_switch',
+             'suppress_tries',
+             'suppress_embed_prompt',
+             'default_paper_size',
+             'print_header_format',
+             'disable_receipt_display',
+         ],
+         'cat_5' => [
+             'spreadsheet_default_classcalc',
+             'spreadsheet_default_studentcalc',
+             'spreadsheet_default_assesscalc',
+             'hideemptyrows',
+         ],
+         'cat_6' => [
+             'default_enrollment_start_date',
+             'default_enrollment_end_date',
+         ],
+         'cat_7' => [
+             'tthoptions',
+             'texengine',
+             'disablesigfigs',
+             'disableexampointprint',
+             'task_messages',
+             'task_grading',
+         ],
+     );
+     # Add special parameters depending on special context to parameter categories hash
+     my @can_cats;
+     (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+     if ($can_toggle_cat) {
+         push(@can_cats,'hidefromcat');
+     }
+     if ($can_categorize) {
+         push(@can_cats,'categories');
+     }
+     $parm_cat_parms{'cat_can'} = [@can_cats];
+     # Add custom parameters to custom parameter category
+     my @custom_cats;
+     foreach my $parameter (sort(keys(%values))) {
+         unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+                 ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+                 || ($parameter eq 'type') ||
+                 ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) {
+             if (! $descriptions{$parameter}) {
+                 $descriptions{$parameter}=$parameter;
+                 push(@custom_cats,$parameter);
+             }
+         }
      }
-     my %lt=&Apache::lonlocal::texthash(
+     $parm_cat_parms{'cat_custom'} = [@custom_cats];
- 		    'par'   => 'Parameter',
- 		    'val'   => 'Value',
- 		    'set'   => 'Set',
+ # Display Course Parameter Overview
- 		    'sce'   => 'Set Course Environment'
+ # Provide hyperlinks to detailed parameter settings
- 				       );
+ $output_SB .= '<a name="parmlist" />'
+              .'<div class="LC_ContentBoxSpecial">'
-     my $Parameter=&mt('Parameter');
+              .'<h2 class="LC_hcell">'.&mt('Course Parameter Overview').'</h2>'
-     my $Value=&mt('Value');
+              .'<ul>';
-     my $Set=&mt('Set');
+ foreach my $catkey (@Display_Order) {
-     my $browse_js=
+     if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories
- 	'<script type="text/javascript" language="Javascript">'.
+     $output_SB .= '<li>'
- 	&Apache::loncommon::browser_and_searcher_javascript('parmset').
+                  .'<a href="#parmlist_'.$catkey.'">'
- 	'</script>';
+                  .$parm_cat_names{$catkey}
+                  .'</a>'
+                  .'</li>';
+ }
+ $output_SB .= '</ul>'
+             .'</div>';
+ my $buttons='<div align="right">'
+            .'<input type="submit" name="crsenv" value="'.&mt('Save All').'" />'
+            .'<br /><a href="#parmlist">'.&mt('Back to Course Parameter Overview').'</a>'
+            .'</div>';
+ # Display all Parameters grouped by categories
+ $output_SB .= '<h2>'.&mt('Course Parameters').'</h2>';
+ foreach my $catkey (@Display_Order) {
+     if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories
+     $output_SB .= &Apache::loncommon::start_data_table();
+     $output_SB .= &Apache::loncommon::start_data_table_empty_row()
+                  .'<td colspan="3">'
+                  .'<a name="parmlist_'.$catkey.'" />'
+                  .'<h3>'.$parm_cat_names{$catkey}.'</h3>'
+                  .'</td>'
+                  .&Apache::loncommon::end_data_table_empty_row
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.$lt{'par'}.'</th><th>'.$lt{'val'}.'</th><th>'.$lt{'set'}.'</th>'
+                  .&Apache::loncommon::end_data_table_header_row();
+     foreach my $parameter (@{$parm_cat_parms{$catkey}}) {
+         my $description = $descriptions{$parameter};
+         $output_SB .= &parameter_row($parameter, $description);
+     }
+     # Add special row to custom category
+     # Offer possibilty to create a new environment variable
+     if ($catkey eq 'cat_custom') {
+         my $onchange = 'onFocus="javascript:window.document.forms'
+                       .'[\'envform\'].elements[\'newp_setparmval\']'
+                       .'.checked=true;"';
+         $output_SB .= &Apache::loncommon::start_data_table_row()
+                    .'<td>'
+                    .'<i>'.&mt('Create New Environment Variable').'</i><br />'
+                    .'<input type="text" size="40" name="newp_name" '.$onchange.' />'
+                    .'</td><td>'
+                    .'<input type="text" size="40" name="newp_value" '.$onchange.' />'
+                    .'</td><td>'
+                    .'<input type="checkbox" name="newp_setparmval" /></td>'
+                    .&Apache::loncommon::end_data_table_row();
+     }
+     # Add buttons row at end of each category
+     $output_SB .= &Apache::loncommon::start_data_table_empty_row()
+                  .'<td colspan="3">'
+                  .$buttons
+                  .'</td>'
+                  .&Apache::loncommon::end_data_table_empty_row;
+     $output_SB .= &Apache::loncommon::end_data_table()
+                 . '<br />';
+ }
+ # End: New Version with Parameter Categories
+ # ----------------------------------------------------------------
+     }
+     my ($jscript,$categorize_js);
+     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
+     if ($can_categorize) {
+         $categorize_js = <<ENDSCRIPT;
+ function catsbrowser() {
+     var catswin = null;
+     var url = '/adm/parmset?action=categorizecourse';
+     if (!catswin || catswin.closed) {
+         catswin=window.open(url,'categorieswin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+     } else {
+         catswin.focus();
+     }
+ }
+ ENDSCRIPT
+     }
+     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
+                $browse_js."\n".$categorize_js."\n".'</script>';
      my $start_page =
  	&Apache::loncommon::start_page('Set Course Environment',
- 				       $browse_js);
+ 				       $jscript);
      my $end_page =
  	&Apache::loncommon::end_page();
-     my $end_table=&Apache::loncommon::end_data_table();
      $r->print(<<ENDENV);
  $start_page
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=crsenv" name="envform">
  $setoutput
- $start_table
+ $output_SB
- $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
  }
+ sub can_modify_catsettings {
+     my ($dom) = @_;
+     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+     my ($can_toggle_cat,$can_categorize);
+     if (ref($domconf{'coursecategories'}) eq 'HASH') {
+         if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+             $can_toggle_cat = 1;
+         }
+         if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+             $can_categorize = 1;
+         }
+     }
+     return ($can_toggle_cat,$can_categorize);
+ }
+ sub assign_course_categories {
+     my ($r) = @_;
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $hascats = 0;
+     my $cathash;
+     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+     if (ref($domconf{'coursecategories'}) eq 'HASH') {
+         $cathash = $domconf{'coursecategories'}{'cats'};
+         if (ref($cathash) eq 'HASH') {
+             $hascats = 1;
+         }
+     }
+     my $catwin_js;
+     if ($hascats) {
+         my $alert = &mt('Use \"Save\" in the main window to save course categories');
+         $catwin_js = <<ENDSCRIPT;
+ <script type="text/javascript">
+ function updateCategories() {
+     var newcategories = '';
+     var unescapedcats = '';
+     if (document.chgcats.usecategory.length) {
+         for (var i=0; i<document.chgcats.usecategory.length; i++) {
+             if (document.chgcats.usecategory[i].checked == true) {
+                 newcategories = newcategories + document.chgcats.usecategory[i].value + '&';
+                 unescapedcats = unescapedcats + document.chgcats.catname[i].value + ' & ';
+             }
+         }
+         if (newcategories.length > 0) {
+             newcategories = newcategories.slice(0,-1);
+         }
+         if (unescapedcats.length > 0) {
+             unescapedcats = unescapedcats.slice(0,-3);
+         }
+     } else {
+          if (document.chgcats.usecategory.checked == true) {
+              newcategories = document.chgcats.usecategory.value;
+              unescapedcats = document.chgcats.catname.value;
+          }
+     }
+     opener.document.envform.categories_value.value = newcategories;
+     opener.document.envform.categories_display.value = unescapedcats;
+     opener.document.envform.categories_setparmval.checked = true;
+     alert("$alert");
+     self.close();
+     return;
+ }
+ </script>
+ ENDSCRIPT
+     } else {
+         my $onload;
+     }
+     my $start_page =
+         &Apache::loncommon::start_page('Course Categories',$catwin_js,
+                                        {'only_body'      => 1,});
+     my $end_page = &Apache::loncommon::end_page();
+     my $categoriesform = '<h3>'.&mt('Categorize Course').'</h3>';
+     if ($hascats) {
+         my %currsettings =
+             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
+         $categoriesform .= &mt('Assign one or more categories to this course.').'<br /><br />'.
+                                '<form name="chgcats" action="/adm/parmset" method="post">'."\n"
+                                .&Apache::loncommon::assign_categories_table($cathash,
+                                                        $currsettings{'categories'})."\n"
+                                .'<br /><input type="button" name="changes" value="'
+                                .&mt('Copy to main window').'" '
+                                .'onclick="javascript:updateCategories()" /></form><br />';
+     } else {
+         $categoriesform .= &mt('No categories defined for this domain');
+     }
+     $r->print($start_page.$categoriesform.$end_page);
+     return;
+ }
  ##################################################
  # Overview mode
  ##################################################
- Line 2503  sub storedata {
+ Line 3163  sub storedata {
              if ($tuname) {
  		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
  	    }
- 	    if ($cmd eq 'set' || $cmd eq 'datepointer') {
+ 	    if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
  		my ($data, $typeof, $text);
  		if ($cmd eq 'set') {
  		    $data=$env{$_};
- Line 2513  sub storedata {
+ Line 3173  sub storedata {
  		    $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) {
- Line 2595  sub parse_listdata_key {
+ Line 3259  sub parse_listdata_key {
  	$realm=~s/\.type//;
      }
      # split into resource+part and parameter name
-     my ($res, $parm) = ($realm=~/^(.*)\.(.*)$/);
+     my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
-     my ($res, $part) = ($res  =~/^(.*)\.(.*)$/);
+        ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
      return ($student,$res,$part,$parm);
  }
- Line 2704  sub listdata {
+ Line 3368  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 2725  sub listdata {
+ Line 3389  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 'date_interval') {
+ 		$r->print(&date_interval_selector($thiskey,
+ 						  $$resourcedata{$thiskey}));
  	    } elsif ($thistype =~ m/^string/) {
  		$r->print(&string_selector($thistype,$thiskey,
  					   $$resourcedata{$thiskey}));
- Line 2734  sub listdata {
+ Line 3403  sub listdata {
  		$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
  	    }
  	    $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.'">' ;
+     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
  }
  my %strings =
- Line 2753  my %strings =
+ Line 3460  my %strings =
  		 [ '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.' ]],
       );
- Line 2778  sub string_selector {
+ Line 3486  sub string_selector {
      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 2943  sub overview {
+ Line 3688  sub overview {
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+ 	text=>"Overview Mode"});
      my $start_page=&Apache::loncommon::start_page('Modify Parameters');
      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
- Line 2968  ENDOVER
+ Line 3715  ENDOVER
      my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
      $r->print(&tableend().'<p>'.
- 	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form>'.
+ 	($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
  	      &Apache::loncommon::end_page());
  }
- Line 2977  sub clean_parameters {
+ Line 3724  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 2997  ENDOVER
+ Line 3746  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 3050  ENDOVER
+ Line 3799  ENDOVER
  	}
      }
      $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 3094  sub parse_key {
+ Line 3892  sub parse_key {
      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) = @_;
- Line 3245  sub change_clone {
+ Line 4009  sub change_clone {
  }
- ##################################################
- ##################################################
- =pod
- =item * header
- Output html header for page
- =cut
- ##################################################
- ##################################################
  sub header {
      return &Apache::loncommon::start_page('Parameter Manager');
  }
- ##################################################
- ##################################################
  sub print_main_menu {
      my ($r,$parm_permission)=@_;
      #
+     $r->print(&header());
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
      $r->print(<<ENDMAINFORMHEAD);
  <form method="post" enctype="multipart/form-data"
        action="/adm/parmset" name="studentform">
- Line 3276  ENDMAINFORMHEAD
+ Line 4031  ENDMAINFORMHEAD
      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 Environment',
- 	    action => 'crsenv',
+ 		    url => '/adm/parmset?action=crsenv',
-             permission => $parm_permission,
+ 		    permission => $parm_permission,
-             help => 'Course_Environment',
+ 		    linktitle =>'Edit environment settings for this course.'  ,
-             },
+ 		    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 => 'Reset Student Access Times',
+ 		  { linktext => 'Manage Course Slots',
- 	    url => '/adm/helper/resettimes.helper',
+ 		    url => '/adm/slotrequest?command=showslots',
- 	    permission => $mgr,
+ 		    permission => $vgr,
-             },
+ 		    linktitle =>'Manage slots for this course.'  ,
+ 		    icon => 'format-justify-fill.png'  ,
-           { text => 'Set Parameter Setting Default Actions',
+ 		    },
-             action => 'setdefaults',
+ 		  { linktext => 'Reset Student Access Times',
-             permission => $parm_permission,
+ 		    url => '/adm/helper/resettimes.helper',
-             },
+ 		    permission => $mgr,
- 	  { divider => 'New and Existing Parameter Settings for Your Resources',
+ 		    linktitle =>'Reset access times for folders/maps, resources or the course.'  ,
- 	    },
+ 		    icon => 'start-here.png'  ,
-           { text => 'Set/Modify Resource Parameters - Helper Mode',
+ 		    },
-             url => '/adm/helper/parameter.helper',
-             permission => $parm_permission,
+ 		  { linktext => 'Set Parameter Setting Default Actions',
-             help => 'Parameter_Helper',
+ 		    url => '/adm/parmset?action=setdefaults',
-             },
+ 		    permission => $parm_permission,
-  	  { text => 'Set/Modify Resource Parameters - Overview Mode',
+ 		    linktitle =>'Set default actions for parameters.'  ,
-             action => 'newoverview',
+ 		    icon => 'folder-new.png'  ,
-             permission => $parm_permission,
+ 		    }]},
-             help => 'Parameter_Overview',
+ 	  { categorytitle => 'New and Existing Parameter Settings for Resources',
-             },
+ 	    items => [
-           { text => 'Set/Modify Resource Parameters - Table Mode',
+ 		  { linktext => 'Edit Resource Parameters - Helper Mode',
-             action => 'settable',
+ 		    url => '/adm/helper/parameter.helper',
-             permission => $parm_permission,
+ 		    permission => $parm_permission,
-             help => 'Table_Mode',
+ 		    linktitle =>'Set/Modify resource parameters in helper mode.'  ,
-             },
+ 		    icon => 'dialog-information.png'  ,
-            { divider => 'Existing Parameter Settings for Your Resources',
+ 		    #help => 'Parameter_Helper',
- 	  },
+ 		    },
- 	  { text => 'Modify Resource Parameters - Overview Mode',
+ 		  { linktext => 'Edit Resource Parameters - Overview Mode',
-             action => 'setoverview',
+ 		    url => '/adm/parmset?action=newoverview',
-             permission => $parm_permission,
+ 		    permission => $parm_permission,
-             help => 'Parameter_Overview',
+ 		    linktitle =>'Set/Modify resource parameters in overview mode.'  ,
-  	    },
+ 		    icon => 'edit-find.png'  ,
- 	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
+ 		    #help => 'Parameter_Overview',
-             action => 'parameterchangelog',
+ 		    },
-             permission => $parm_permission,
+ 		  { 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 $output;
- Line 3367  sub output_row {
+ Line 4123  sub output_row {
      }
      if (!($options =~ /deleted/)) {
          my @options= ( ['active', 'Show to student'],
-                     ['stuadd', 'Provide text area for students to type catalog information'],
+                     ['stuadd', 'Provide text area for students to type metadata'],
                      ['choices','Provide choices for students to select from']);
  #		   ['onlyone','Student may select only one choice']);
          if ($added_flag) {
- Line 3391  sub output_row {
+ Line 4147  sub output_row {
          my $multiple_checked;
          my $single_checked;
          if ($options =~ m/onlyone/) {
-             $multiple_checked = "";
+             $multiple_checked = '';
-             $single_checked = " CHECKED ";
+             $single_checked = ' checked="checked"';
          } else {
-             $multiple_checked = " CHECKED ";
+             $multiple_checked = ' checked="checked"';
-             $single_checked = "";
+             $single_checked = '';
          }
  	$output .= &Apache::loncommon::continue_data_table_row();
  	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
- 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
+ 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
- 	            Student may select multiple choices from list</span></td>';
+ 	            '.&mt('Student may select multiple choices from list').'</span></td>';
  	$output .= &Apache::loncommon::end_data_table_row();
  	$output .= &Apache::loncommon::continue_data_table_row();
  	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
- 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
+ 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
- 	            Student may select only one choice from list</span></td>';
+ 	            '.&mt('Student may select only one choice from list').'</span></td>';
  	$output .= &Apache::loncommon::end_data_table_row();
      }
      return ($output);
  }
  sub order_meta_fields {
      my ($r)=@_;
      my $idx = 1;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
      $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+     	text=>"Add Metadata Field"});
      &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"/adm/parmset?action=setrestrictmeta",
                text=>"Restrict Metadata"},
- Line 3455  sub order_meta_fields {
+ Line 4216  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($env{'request.course.id'});
      my $ordered_fields;
- Line 3492  sub order_meta_fields {
+ Line 4253  sub order_meta_fields {
      $r->print('</table>');
      return 'ok';
  }
  sub continue {
      my $output;
      $output .= '<form action="" method="post">';
- Line 3499  sub continue {
+ Line 4262  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 3545  sub addmetafield {
+ Line 4312  sub addmetafield {
      }
      $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 3628  ENDenv
+ Line 4400  ENDenv
      $r->print(&Apache::loncommon::end_page());
      return 'ok';
  }
- ##################################################
  sub get_added_meta_fieldnames {
      my ($cid) = @_;
      my %fields;
- Line 3641  sub get_added_meta_fieldnames {
+ Line 4415  sub get_added_meta_fieldnames {
      }
      return \%fields;
  }
  sub get_deleted_meta_fieldnames {
      my ($cid) = @_;
      my %fields;
- Line 3658  sub get_deleted_meta_fieldnames {
+ Line 4435  sub get_deleted_meta_fieldnames {
  sub defaultsetter {
      my ($r) = @_;
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
+     	text=>"Set Defaults"});
      my $start_page =
  	&Apache::loncommon::start_page('Parameter Setting Default Actions');
      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
- Line 3809  ENDYESNO
+ Line 4588  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('Save Rules')."' /></form>\n".
+ 	      &mt('Save').'" /></form>'."\n".
  	      &Apache::loncommon::end_page());
      return;
  }
- Line 3854  sub components {
+ Line 4633  sub components {
  }
  my %standard_parms;
  sub load_parameter_names {
      open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
      while (my $configline=<$config>) {
- Line 3883  sub standard_parameter_names {
+ Line 4664  sub standard_parameter_names {
      }
  }
- #
- # 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 4045  sub parm_change_log {
+ Line 4825  sub parm_change_log {
      $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
- ##################################################
- ##################################################
  sub handler {
      my $r=shift;
      &reset_caches();
-     if ($r->header_only) {
+     &Apache::loncommon::content_type($r,'text/html');
- 	&Apache::loncommon::content_type($r,'text/html');
+     $r->send_http_header;
- 	$r->send_http_header;
+     return OK if $r->header_only;
- 	return OK;
-     }
      &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 4088  sub handler {
+ Line 4942  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 4098  sub handler {
+ Line 4953  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;
          #
          # Main switch on form.action and form.state, as appropriate
          #
- Line 4111  sub handler {
+ Line 4960  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 'crsenv') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
- 						    text=>"Course Environment"});
              &crsenv($r);
-         } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
+         } elsif ($env{'form.action'} eq 'setoverview') {
-             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
- 						    text=>"Overview Mode"});
  	    &overview($r);
- 	} elsif ($env{'form.action'} eq '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 4180  sub handler {
+ Line 5009  sub handler {
 ;
  __END__
- =pod
- =back
- =cut

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

Removed from v.1.384
changed lines
	Added in v.1.442