--- loncom/interface/lonparmset.pm	2009/01/20 18:05:55	1.422
+++ loncom/interface/lonparmset.pm	2009/02/13 20:20:30	1.430
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.422 2009/01/20 18:05:55 bisitz Exp $
+# $Id: lonparmset.pm,v 1.430 2009/02/13 20:20:30 schafran 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>';
@@ -974,12 +975,13 @@ sub print_row {
                   .$$part{$which}.'</td>');
     } else {    
         $parm=~s|\[.*\]\s||g;
+        $parm=&mt($parm);
     }
     my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
     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\_//;
@@ -1315,9 +1317,14 @@ 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>');
+        my $displaykey;
+        if ($$allparms{$tempkey}=~/\S/) {
+            $displaykey = $$allparms{$tempkey};
+        } else {
+            $displaykey = $tempkey;
+        }
+        $displaykey =~ s/(\[|\])/~$1/g;
+        $r->print(' />'.&mt($displaykey).'</label></td>');
  	$cnt++;
         if ($cnt==3) {
 	    $r->print("</tr>\n<tr>");
@@ -1816,12 +1823,13 @@ 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);
@@ -2293,12 +2301,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);
 		}
@@ -3140,7 +3148,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());
 	}
     }
@@ -3452,7 +3460,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());
 }
 
@@ -3885,19 +3893,19 @@ sub output_row {
         my $single_checked;
         if ($options =~ m/onlyone/) {
             $multiple_checked = '';
-            $single_checked = ' checked="checked" ';
+            $single_checked = ' checked="checked"';
         } else {
-            $multiple_checked = ' checked="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();
     }
@@ -4326,7 +4334,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;
 }