--- loncom/interface/lonparmset.pm	2009/01/20 16:38:39	1.421
+++ loncom/interface/lonparmset.pm	2009/02/03 21:11:16	1.428
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.421 2009/01/20 16:38:39 bisitz Exp $
+# $Id: lonparmset.pm,v 1.428 2009/02/03 21:11:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -974,12 +974,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\_//;
@@ -1307,17 +1308,22 @@ 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('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>');
+        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>");
@@ -1325,7 +1331,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">'
@@ -1601,12 +1607,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>');
@@ -1816,12 +1822,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);
@@ -2112,7 +2119,7 @@ ENDTABLEHEADFOUR
                              ,'<font color="red"><i>'.$coursename.'</i></font>'
                              )
                          ."<br /></h4>\n"
-                         );
+                );
 #---------------------------------------------------------------- print table
                 $r->print('<p>'.&Apache::loncommon::start_data_table()
                          .&Apache::loncommon::start_data_table_header_row()
@@ -2128,7 +2135,9 @@ ENDTABLEHEADFOUR
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                            $parmlev,$uname,$udom,$csec,$cgroup);
                 }
-                $r->print(&Apache::loncommon::end_data_table().'</p>');
+                $r->print(&Apache::loncommon::end_data_table().'</p>'
+                         .'</div>'
+                );
             } # end each map
         } # end of $parmlev eq map
 #--------------------------------- Entry for parm level general (Course level)
@@ -2291,12 +2300,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);
 		}
@@ -3103,7 +3112,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;
 	    }
 #
@@ -3138,7 +3147,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());
 	}
     }
@@ -3882,20 +3891,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();
     }