--- loncom/interface/lonparmset.pm	2009/01/28 17:00:00	1.426
+++ loncom/interface/lonparmset.pm	2009/02/15 17:19:39	1.432
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.426 2009/01/28 17:00:00 bisitz Exp $
+# $Id: lonparmset.pm,v 1.432 2009/02/15 17:19:39 raeburn 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>';
@@ -980,7 +981,7 @@ sub print_row {
     if ($automatic) {
 	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
     }
-    $r->print('<td style="background-color:'.$defbgone.';">'.$parm.'</td>');
+    $r->print('<td>'.$parm.'</td>');
    
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
@@ -1182,9 +1183,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}=
@@ -1316,9 +1323,9 @@ ENDSCRIPT
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $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>");
@@ -3454,7 +3461,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());
 }
 
@@ -4328,7 +4335,7 @@ ENDYESNO
     }
     $r->print(&Apache::loncommon::end_data_table().
 	      "\n".'<input type="submit" name="storerules" value="'.
-	      &mt('Save Rules').'" /></form>'."\n".
+	      &mt('Save').'" /></form>'."\n".
 	      &Apache::loncommon::end_page());
     return;
 }