--- loncom/interface/lonparmset.pm	2008/12/03 21:20:57	1.418
+++ loncom/interface/lonparmset.pm	2009/05/06 16:19:34	1.444
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.418 2008/12/03 21:20:57 schafran Exp $
+# $Id: lonparmset.pm,v 1.444 2009/05/06 16:19:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -848,12 +848,13 @@ 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>';
@@ -935,10 +936,10 @@ 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_type" />
-<input type="hidden" value='' name="pres_marker" />
-<input type="hidden" value='1' name="prevvisit" />
+<input type="hidden" value="" name="pres_value" />
+<input type="hidden" value="" name="pres_type" />
+<input type="hidden" value="" name="pres_marker" />
+<input type="hidden" value="1" name="prevvisit" />
 ENDHEAD
 }
 
@@ -970,16 +971,16 @@ 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 {    
+    } 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\_//;
@@ -1056,14 +1057,14 @@ 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>');
     }
@@ -1073,14 +1074,22 @@ sub print_row {
 
 sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
-    $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
-              ' align="center">');
-    if ($which<11 || $which > 12) {
-	$r->print(&plink($$typeoutpar[$which],
-			 $$display{$value},$$outpar[$which],
-			 $mprefix."$which",'parmform.pres','psub'));
+    $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
+              ';" align="center">');
+    my $nolink = 0;
+    if ($which == 11 || $which == 12) {
+        $nolink = 1;
+    } 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");
 }
@@ -1100,11 +1109,11 @@ 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 {
@@ -1112,7 +1121,7 @@ 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);
 }
@@ -1181,9 +1190,15 @@ 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 $parmdis = $display;
-		$parmdis =~ s/\s*\[Part.*$//g;
+		my ($display,$parmdis);
+		$display = &standard_parameter_names($name);
+		if ($display eq '') {
+		    $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+		    $parmdis = $display;
+		    $parmdis =~ s/\s*\[Part.*$//g;
+		} else {
+		    $parmdis = $display;
+		}
 		$$allparms{$name}=$parmdis;
 		if (ref($defkeytype)) {
 		    $$defkeytype{$name}=
@@ -1307,17 +1322,22 @@ sub parmmenu {
 </script>
 ENDSCRIPT
     $r->print();
-    $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
+    $r->print('<tr>');
+    $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+    $r->print('<blockquote>'.&mt('Select Parameters to View').'</blockquote>');
+    $r->print('</td>');                  
+    $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>'); 
+    $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/ ? &mt($$allparms{$tempkey})
-		                                  : &mt($tempkey))
-		  .'</label></td>');
+        $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                  : $tempkey)
+                  .'</label></td>');
  	$cnt++;
         if ($cnt==3) {
 	    $r->print("</tr>\n<tr>");
@@ -1325,7 +1345,7 @@ ENDSCRIPT
 	}
     }
     $r->print('</tr>'
-             .'<tr id=\"LC_parm_overview_parm_menu_selectors\">'
+             .'<tr id="LC_parm_overview_parm_menu_selectors">'
              .'<td valign="top">'
              .'<fieldset><legend><b>'.&mt('Parameter Selection').'</b></legend>'
              .'<span class="LC_nobreak">'
@@ -1364,11 +1384,17 @@ ENDSCRIPT
              .'</td>'
              .'</tr></table>'
     );
+    $r->print('</blockquote></td></tr>');
 }
 
 sub partmenu {
     my ($r,$allparts,$psprt)=@_;
-    $r->print('<select multiple name="psprt" size="8">');
+    $r->print('<tr>');
+    $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+    $r->print('<blockquote>'. &mt('Select Parts to View').'</blockquote>');
+    $r->print('</td>');                  
+    $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>'); 
+    $r->print('<select multiple="multiple" name="psprt" size="8">');
     $r->print('<option value="all"');
     $r->print(' selected="selected"') unless (@{$psprt});
     $r->print('>'.&mt('All Parts').'</option>');
@@ -1386,6 +1412,7 @@ sub partmenu {
 	}
     }
     $r->print('</select>');
+     $r->print('</blockquote></td></tr>');
 }
 
 sub usermenu {
@@ -1402,7 +1429,7 @@ sub usermenu {
 
     my $g_s_header='';
     my $g_s_footer='';
-
+    
     if (%sectionhash) {
         $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
@@ -1468,39 +1495,50 @@ function group_or_section(caller) {
         $groups.='</select>';
     }
 
-    if (%sectionhash || %grouphash) {
-        $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
-        $g_s_footer='</div></fieldset>';
-    }
-
-    $r->print('<b>'
-             .$g_s_header
-             .$sections
-             .$groups
-             .$g_s_footer
-             .'<fieldset><legend>'.&mt('User').'</legend><div>'
-             .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+    if (%sectionhash || %grouphash) {   
+        $r->print('<tr>');
+        $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+        $r->print('<blockquote>'.&mt('Group/Section').'</blockquote>');
+        $r->print('</td>');                  
+        $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
+        $r->print($sections.$groups);
+        $r->print('</blockquote></td></tr>'); 
+    }
+    $r->print('<tr>');
+    $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+    $r->print('<blockquote>'. &mt('User').'</blockquote>');
+    $r->print('</td>');                  
+    $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
+             
+    $r->print(&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>'
-    );
+                 ,$chooseopt));        
+   
+   $r->print('</blockquote></td></tr>'); 
 }
 
 sub displaymenu {
     my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
-    $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
-	     &mt('Select Parts to View').'</th></tr><tr><td>');  
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<h2 class="LC_hcell">Step 2</h2>');
+    $r->print('<blockquote>');
+    $r->print('<table border="0" style="border-style:solid;border-collapse:seperate;text-align:left;margin-left:auto;margin-right:auto;border-spacing:0pt;">');
+
+    #$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 valign="top" align="center">');
+   
     &partmenu($r,$allparts,$psprt);
-    $r->print('</td></tr></table>');
+    $r->print('</table></blockquote></div>');
 }
 
-sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles)=@_;
-    $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
+sub mapmenu {##
+    my ($r,$allmaps,$pschp,$maptitles)=@_; 
+    $r->print('<tr>');
+    $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+    $r->print('<blockquote>'.&mt('Select Enclosing Map or Folder').'</blockquote>');
+    $r->print('</td>');                  
+    $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>'); 
     $r->print('<select name="pschp">');
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
@@ -1509,12 +1547,16 @@ sub mapmenu {
 	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
     }
     $r->print("</select>");
+    $r->print('</blockquote></td></tr>');
 }
 
 sub levelmenu {
-    my ($r,$alllevs,$parmlev)=@_;
-    $r->print('<b>'.&mt('Select Parameter Level').
-	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
+    my ($r,$alllevs,$parmlev)=@_;    
+    $r->print('<tr>');
+    $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+    $r->print('<blockquote>'.&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</blockquote>');
+    $r->print('</td>');                  
+    $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>'); 
     $r->print('<select name="parmlev">');
     foreach (reverse sort keys %{$alllevs}) {
 	$r->print('<option value="'.$$alllevs{$_}.'"');
@@ -1524,6 +1566,7 @@ sub levelmenu {
 	$r->print('>'.&mt($_).'</option>');
     }
     $r->print("</select>");
+    $r->print('</blockquote></td></tr>');
 }
 
 
@@ -1532,7 +1575,7 @@ 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}) {
@@ -1551,7 +1594,7 @@ 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}) {
@@ -1601,12 +1644,12 @@ 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>');
@@ -1790,6 +1833,39 @@ 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],
@@ -1813,15 +1889,21 @@ sub assessparms {
 		  '" name="recent_'.$_.'" />');
     }
                         
-    if (!$pssymb) {
-        $r->print('<table border="1"><tr><td>');
+    if (!$pssymb) {	
+        $r->print('<div class="LC_ContentBoxSpecial">');
+        $r->print('<h2 class="LC_hcell">Step 1</h2>');
+        $r->print('<blockquote>');
+        $r->print('<table border="0" style="border-style:solid;border-collapse:seperate;text-align:left;margin-left:auto;margin-right:auto;border-spacing:0pt;">');
         &levelmenu($r,\%alllevs,$parmlev);
+       
 	if ($parmlev ne 'general') {
-            $r->print('<td>');
+           
 	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
-	    $r->print('</td>');
+	    
 	}
-        $r->print('</td></tr></table>');
+        $r->print('</table>');
+        $r->print('</blockquote>');
+        $r->print('</div>');
 	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
@@ -1831,7 +1913,14 @@ sub assessparms {
 		  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
 		  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
     }
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<h2 class="LC_hcell">Step 3</h2>');
+    $r->print('<blockquote>');
+    $r->print('<table border="0" style="border-style:solid;border-collapse:seperate;text-align:left;margin-left:auto;margin-right:auto;border-spacing:0pt;">');
     &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);    
+    $r->print('</table>');
+    $r->print('</blockquote>');
+    $r->print('</div>');
 
     $r->print('<p>'.$message.'</p>');
 
@@ -1858,9 +1947,9 @@ sub assessparms {
               $coursespan += 3;
            } 
       
-           $r->print('<p><table border=2>');
-           $r->print('<tr><td colspan=5></td>');
-           $r->print('<th colspan='.($coursespan).'>'.&mt('Any User').'</th>');
+           $r->print('<p><table border="2">');
+           $r->print('<tr><td colspan="5"></td>');
+           $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
            if ($uname) {
                if (@usersgroups > 1) {
                    $userspan ++;
@@ -1886,18 +1975,18 @@ sub assessparms {
 				  'fr'     => 'for Resource'
 					      );
            $r->print(<<ENDTABLETWO);
-<th rowspan=3>$lt{'pie'}</th>
-<th rowspan=3>$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
-</tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
-<th colspan=1>$lt{'ic'}</th>
+<th rowspan="3">$lt{'pie'}</th>
+<th rowspan="3">$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
+</tr><tr><td colspan="5"></td><th colspan="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
+<th colspan="1">$lt{'ic'}</th>
 
 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);
@@ -1938,20 +2027,20 @@ ENDTABLEHEADFOUR
 		    ||
 		    ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
-                    if ($defbgone eq '"#E0E099"') {
-                        $defbgone='"#E0E0DD"';
+                    if ($defbgone eq '#E0E099') {
+                        $defbgone='#E0E0DD';
                     } else {
-                        $defbgone='"#E0E099"';
+                        $defbgone='#E0E099';
                     }
-                    if ($defbgtwo eq '"#FFFF99"') {
-                        $defbgtwo='"#FFFFDD"';
+                    if ($defbgtwo eq '#FFFF99') {
+                        $defbgtwo='#FFFFDD';
                     } else {
-                        $defbgtwo='"#FFFF99"';
+                        $defbgtwo='#FFFF99';
                     }
-                    if ($defbgthree eq '"#FFBB99"') {
-                        $defbgthree='"#FFBBDD"';
+                    if ($defbgthree eq '#FFBB99') {
+                        $defbgthree='#FFBBDD';
                     } else {
-                        $defbgthree='"#FFBB99"';
+                        $defbgthree='#FFBB99';
                     }
 
                     my $thistitle='';
@@ -1968,7 +2057,16 @@ 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,$_);
@@ -1980,9 +2078,9 @@ 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('".
@@ -1995,11 +2093,11 @@ 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>');
 
@@ -2022,9 +2120,9 @@ ENDTABLEHEADFOUR
         } # end of  full
 #--------------------------------------------------- Entry for parm level map
         if ($parmlev eq 'map') {
-            my $defbgone = '"E0E099"';
-            my $defbgtwo = '"FFFF99"';
-            my $defbgthree = '"FFBB99"';
+            my $defbgone = '#E0E099';
+            my $defbgtwo = '#FFFF99';
+            my $defbgthree = '#FFBB99';
 
             my %maplist;
 
@@ -2075,7 +2173,16 @@ 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_/;
@@ -2112,27 +2219,32 @@ ENDTABLEHEADFOUR
                              ,'<font color="red"><i>'.$coursename.'</i></font>'
                              )
                          ."<br /></h4>\n"
-                         );
+                );
 #---------------------------------------------------------------- print table
-                $r->print('<p><table border="2">');
-                $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
-                $r->print('<th>'.&mt('Default Value').'</th>');
-                $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+                $r->print('<p>'.&Apache::loncommon::start_data_table()
+                         .&Apache::loncommon::start_data_table_header_row()
+                         .'<th>'.&mt('Parameter Name').'</th>'
+                         .'<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></div>");
+                $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 $defbgtwo = '"FFFF99"';
-            my $defbgthree = '"FFBB99"';
+            my $defbgone = '#E0E099';
+            my $defbgtwo = '#FFFF99';
+            my $defbgthree = '#FFBB99';
 
 #-------------------------------------------- for each map, gather information
             my $mapid="0.0";
@@ -2163,7 +2275,16 @@ 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_/;
@@ -2176,7 +2297,8 @@ ENDTABLEHEADFOUR
 #---------------------------------------------------- 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) {
@@ -2190,18 +2312,24 @@ 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('<tr><th>'.&mt('Parameter Name').'</th>');
-            $r->print('<th>'.&mt('Default Value').'</th>');
-            $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
+            $r->print('<p>'.&Apache::loncommon::start_data_table()
+                     .&Apache::loncommon::start_data_table_header_row()
+                     .'<th>'.&mt('Parameter Name').'</th>'
+                     .'<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());
@@ -2221,6 +2349,7 @@ sub crsenv {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my (%crsinfo,$chome);
+    my $crstype = &Apache::loncommon::course_type();
 
     #
     # Go through list of changes
@@ -2231,6 +2360,23 @@ 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;
@@ -2281,12 +2427,12 @@ 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);
 		}
@@ -2392,9 +2538,6 @@ 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'},
@@ -2406,7 +2549,14 @@ 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><br />'.
@@ -2415,7 +2565,7 @@ sub crsenv {
                                  &mt('Select Map').'</a><br /><span class="LC_warning"> '.
                                  &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, optional').')',
@@ -2450,15 +2600,15 @@ sub crsenv {
              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</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>"').')',
              '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] for link to each a listing of each student's files.",'"<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 live chatroom use for Roles').'</b><br />'
+             'plc.roles.denied'=> '<b>'.&mt('Disallow chat room use for Roles').'</b><br />'
                                  .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<br />'
                                  .'("<tt>'.&mt('role,role,...').'</tt>") '
 	                         .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
              'plc.users.denied' => 
-                          '<b>'.&mt('Disallow live chatroom use for Users').'</b><br />'.
+                          '<b>'.&mt('Disallow chat room use for Users').'</b><br />'.
                                   '("<tt>'.&mt('user:domain,user:domain,...').'</tt>")',
 
              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').'</b><br />'
@@ -2533,11 +2683,11 @@ sub crsenv {
              'externalsyllabus'
                  => '<b>'.&mt('URL of Syllabus (not using internal handler)').'</b>',
 	     'tthoptions'
-	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>',
+	         => '<b>'.&mt('Default set of options to pass to tth/m when converting TeX').'</b>',
 
 	     'texengine'
 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'
-                   .'('.&mt('[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student\'s preference','"<tt>jsMath</tt>"','"<tt>mimetex</tt>"','"<tt>tth</tt>"').')',
+                   .'('.&mt("[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student's preference",'"<tt>jsMath</tt>"','"<tt>mimetex</tt>"','"<tt>tth</tt>"').')',
              'timezone'
                  => '<b>'.&mt('Timezone in which the course takes place').'</b>',
 
@@ -2552,69 +2702,32 @@ sub crsenv {
                     &mt('Display Categories').'</a>',
              'datelocale' 
                  => '<b>'.&mt('Locale used for course calendar').'</b>',
+             'rolenames'
+                 => '<b>'.&mt('Replacement titles for standard course roles').'</b><br />'.
+                    '('.&mt('To replace the standard title for a course role, enter the title you wish to use, otherwise leave blank.').')',
              );
-        my @Display_Order = ('url','description','courseid','cloners');
-        (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
-        if ($can_toggle_cat) {
-            push(@Display_Order,'hidefromcat');
-        }
-        if ($can_categorize) {
-            push(@Display_Order,'categories');
-        }
-        push (@Display_Order,('grading',
-                             'externalsyllabus',
-                             'default_xml_style','pageseparators',
-                             'question.email','question.email.text','comment.email',
-                             'comment.email.text','policy.email','policy.email.text',
-                             'student_classlist_view',
-                             'student_classlist_opt_in',
-                             'student_classlist_portfiles',
-                             'plc.roles.denied','plc.users.denied',
-                             'pch.roles.denied','pch.users.denied',
-                             'allow_limited_html_in_feedback',
-                             'allow_discussion_post_editing',
-                             'languages',
-                             'timezone',
-                             'datelocale',
-			     'nothideprivileged',
-                             'rndseed',
-                             'receiptalg',
-                             'problem_stream_switch',
-			     'suppress_tries',
-                             'suppress_embed_prompt',
-                             'default_paper_size',
-			     'print_header_format',
-                             'disable_receipt_display',
-                             'spreadsheet_default_classcalc',
-                             'spreadsheet_default_studentcalc',
-                             'spreadsheet_default_assesscalc', 
-                             'hideemptyrows',
-                             'default_enrollment_start_date',
-                             'default_enrollment_end_date',
-			     'tthoptions',
-			     'texengine',
-			     'disablesigfigs',
-			     'disableexampointprint',
-			     'task_messages','task_grading'));
-	foreach my $parameter (sort(keys(%values))) {
-            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
-                    ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
-                    || ($parameter eq 'type')) {
-                if (! $descriptions{$parameter}) {
-                    $descriptions{$parameter}=$parameter;
-                    push(@Display_Order,$parameter);
-                }
-            }
-	}
-	
-        foreach my $parameter (@Display_Order) {
-            my $description = $descriptions{$parameter};
-            # onchange is javascript to automatically check the 'Set' button.
-            my $onchange = 'onFocus="javascript:window.document.forms'.
-                "['envform'].elements['".$parameter."_setparmval']".
-                '.checked=true;"';
-            $output .= &Apache::loncommon::start_data_table_row().
-		'<td>'.$description.'</td>';
+
+
+# ----------------------------------------------------------------
+# Begin: New Version with Parameter Categories
+
+    sub parameter_row {
+        # Create parameter row for course environment screen
+
+        my ($parameter, $description) = @_;
+
+        # Start Parameter Row
+        my $output = &Apache::loncommon::start_data_table_row();
+
+        # Column 1/3: Descriptive text of current parameter
+        $output .= '<td>'.$description.'</td>';
+
+        # Column 2/3: Input field (Sometimes special field(s), depending on parameter)
+
+        # onchange is javascript to automatically check the 'Set' button.
+        my $onchange = 'onFocus="javascript:window.document.forms'
+                      ."['envform'].elements['".$parameter."_setparmval']"
+                      .'.checked=true;"';
             if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
                 $output .= '<td>'.
                     &Apache::lonhtmlcommon::date_setter('envform',
@@ -2639,7 +2752,27 @@ sub crsenv {
                 $output .= '<td>'.
                     &Apache::loncommon::select_datelocale($parameter.'_value',
                                                           $currdatelocale,
-                                                          $onchange,$includeempty).'</td>'; 
+                                                          $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'},
+                                                    15,$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 '') {
@@ -2655,39 +2788,229 @@ sub crsenv {
                            $values{'categories'}.'" />'.
                            '<input type="textbox" name="categories_display" value="'.
                            $catdisplay.'" readonly="readonly" size="40" /></td>';
-            } else {
-                $output .= '<td>'.
-                    &Apache::lonhtmlcommon::textbox($parameter.'_value',
-                                                    $values{$parameter},
-                                                    40,$onchange).'</td>';
-            }
-            $output .= '<td>'.
-                &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
-                '</td>';
-            $output .= &Apache::loncommon::end_data_table_row()."\n";
-	}
-        my $onchange = 'onFocus="javascript:window.document.forms'.
-            '[\'envform\'].elements[\'newp_setparmval\']'.
-            '.checked=true;"';
-	$output.=&Apache::loncommon::start_data_table_row().
-	    '<td><i>'.&mt('Create New Environment Variable').'</i><br />'.
-	    '<input type="text" size=40 name="newp_name" '.
-                $onchange.' /></td><td>'.
-            '<input type="text" size=40 name="newp_value" '.
-                $onchange.' /></td><td>'.
-	    '<input type="checkbox" name="newp_setparmval" /></td>'.
-	    &Apache::loncommon::end_data_table_row()."\n";
+            } else { # Display default textbox in all other cases
+                $output .= '<td>'
+                          .&Apache::lonhtmlcommon::textbox($parameter.'_value',
+                                                           $values{$parameter},
+                                                           40,
+                                                           $onchange)
+                          .'</td>';
+            }
+
+        # Column 3/3: Check Box (in most cases)
+        unless ($parameter eq 'rolenames') {
+            $output .= '<td>'
+                      .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval')
+                      .'</td>';
+        }
+
+        # End Parameter Row
+        $output .= &Apache::loncommon::end_data_table_row();
+
+        return $output;
+    } # End sub parameter_row
+
+
+    # Parameter Category Names
+    my %parm_cat_names = &Apache::lonlocal::texthash (
+        'cat_0'      => 'Parameter Category Zero',
+        'cat_1'      => 'Parameter Category One',
+        'cat_2'      => 'Parameter Category Two',
+        'cat_3'      => 'Parameter Category Three',
+        'cat_4'      => 'Parameter Category Four',
+        'cat_5'      => 'Parameter Category Five',
+        'cat_6'      => 'Parameter Category Six',
+        'cat_7'      => 'Parameter Category Seven',
+        'cat_can'    => 'Parameter Category Can',
+        'cat_custom' => 'Parameter Category Custom',
+    );
+
+    # Display Order of Parameter Categories
+    my @Display_Order = (
+        'cat_0',
+        'cat_1',
+        'cat_2',
+        'cat_3',
+        'cat_4',
+        'cat_5',
+        'cat_6',
+        'cat_7',
+        'cat_can',
+        'cat_custom',
+    );
+
+    # Link Parameter Categories with Parameters
+    # Order of parameters is display order
+    my %parm_cat_parms = (
+        'cat_0' => [
+            'url',
+            'description',
+            'courseid',
+            'cloners'
+        ],
+        'cat_1' => [
+            'grading',
+            'externalsyllabus',
+            'default_xml_style',
+            'pageseparators'
+        ],
+        'cat_2' => [
+            'question.email',
+            'question.email.text',
+            'comment.email',
+            'comment.email.text',
+            'policy.email',
+            'policy.email.text',
+        ],
+        'cat_3' => [
+            'student_classlist_view',
+            'student_classlist_opt_in',
+            'student_classlist_portfiles',
+            'plc.roles.denied',
+            'plc.users.denied',
+            'pch.roles.denied',
+            'pch.users.denied',
+            'allow_limited_html_in_feedback',
+            'allow_discussion_post_editing',
+        ],
+        'cat_4' => [
+            'languages',
+            'timezone',
+            'datelocale',
+            'rolenames',
+            'nothideprivileged',
+            'rndseed',
+            'receiptalg',
+            'problem_stream_switch',
+            'suppress_tries',
+            'suppress_embed_prompt',
+            'default_paper_size',
+            'print_header_format',
+            'disable_receipt_display',
+        ],
+        'cat_5' => [
+            'spreadsheet_default_classcalc',
+            'spreadsheet_default_studentcalc',
+            'spreadsheet_default_assesscalc',
+            'hideemptyrows',
+        ],
+        'cat_6' => [
+            'default_enrollment_start_date',
+            'default_enrollment_end_date',
+        ],
+        'cat_7' => [
+            'tthoptions',
+            'texengine',
+            'disablesigfigs',
+            'disableexampointprint',
+            'task_messages',
+            'task_grading',
+        ],
+    );
+
+    # Add special parameters depending on special context to parameter categories hash
+    my @can_cats;
+    (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+    if ($can_toggle_cat) {
+        push(@can_cats,'hidefromcat');
     }
-    my %lt=&Apache::lonlocal::texthash(
-		    'par'   => 'Parameter',
-		    'val'   => 'Value',
-		    'set'   => 'Set?',
-		    'sav'   => 'Save'
-				       );
-
-    my $Parameter=&mt('Parameter');
-    my $Value=&mt('Value');
-    my $Set=&mt('Set');
+    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);
+            }
+        }
+    }
+    $parm_cat_parms{'cat_custom'} = [@custom_cats];
+
+
+# Display Course Parameter Overview
+# Provide hyperlinks to detailed parameter settings
+$output_SB .= '<a name="parmlist" />'
+             .'<div class="LC_ContentBoxSpecial">'
+             .'<h2 class="LC_hcell">'.&mt('Course Parameter Overview').'</h2>'
+             .'<ul>';
+foreach my $catkey (@Display_Order) {
+    if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories 
+    $output_SB .= '<li>'
+                 .'<a href="#parmlist_'.$catkey.'">'
+                 .$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) {
@@ -2710,20 +3033,12 @@ ENDSCRIPT
 				       $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
-<div><input type="submit" name="crsenv" value="$lt{'sav'}" /></div>
-$start_table
-$start_header_row
-<th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}</th>
-$end_header_row
-$output
-$end_table
-<input type="submit" name="crsenv" value="$lt{'sav'}" />
+$output_SB
 </form>
 $end_page
 ENDENV
@@ -3093,7 +3408,7 @@ 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;
 	    }
 #
@@ -3128,7 +3443,7 @@ 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());
 	}
     }
@@ -3440,7 +3755,7 @@ 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());
 }
 
@@ -3872,20 +4187,20 @@ sub output_row {
         my $multiple_checked;
         my $single_checked;
         if ($options =~ m/onlyone/) {
-            $multiple_checked = "";
-            $single_checked = " CHECKED ";
+            $multiple_checked = '';
+            $single_checked = ' checked="checked"';
         } else {
-            $multiple_checked = " CHECKED ";
-            $single_checked = "";
+            $multiple_checked = ' checked="checked"';
+            $single_checked = '';
         }
 	$output .= &Apache::loncommon::continue_data_table_row();
 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
-	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
+	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
 	            '.&mt('Student may select multiple choices from list').'</span></td>';
 	$output .= &Apache::loncommon::end_data_table_row();
 	$output .= &Apache::loncommon::continue_data_table_row();
 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
-	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
+	            <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
 	            '.&mt('Student may select only one choice from list').'</span></td>';
 	$output .= &Apache::loncommon::end_data_table_row();
     }
@@ -4300,12 +4615,12 @@ ENDINPUTDATE
 	} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
             my $yeschecked='';
             my $nochecked='';
-            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
-            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
 
 	    $r->print(<<ENDYESNO);
-<label><input type="radio" name="$tempkey\_value" value="yes" $yeschecked /> $lt{'yes'}</label><br />
-<label><input type="radio" name="$tempkey\_value" value="no" $nochecked /> $lt{'no'}</label>
+<label><input type="radio" name="$tempkey\_value" value="yes"$yeschecked /> $lt{'yes'}</label><br />
+<label><input type="radio" name="$tempkey\_value" value="no"$nochecked /> $lt{'no'}</label>
 ENDYESNO
         } else {
 	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
@@ -4313,8 +4628,8 @@ ENDYESNO
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
-	      "\n<input type='submit' name='storerules' value='".
-	      &mt('Save Rules')."' /></form>\n".
+	      "\n".'<input type="submit" name="storerules" value="'.
+	      &mt('Save').'" /></form>'."\n".
 	      &Apache::loncommon::end_page());
     return;
 }
@@ -4550,6 +4865,94 @@ 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,
+                                                1,$uname,$udom,$cnum,$cdom);
+                &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                                1,$uname,$udom,$uname,$udom);
+            }
+        }
+    }
+    return $delresult;
+}
+
 sub check_for_course_info {
     my $navmap = Apache::lonnavmaps::navmap->new();
     return 1 if ($navmap);
@@ -4579,7 +4982,8 @@ 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 =