--- loncom/homework/radiobuttonresponse.pm	2004/08/30 02:03:44	1.93
+++ loncom/homework/radiobuttonresponse.pm	2004/10/07 20:28:30	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.93 2004/08/30 02:03:44 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.95 2004/10/07 20:28:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,9 +260,11 @@ sub displayallfoils {
 		} else {
 		    $result.="<br />";
 		}
+                $result .= '<label>';
 		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>";
+		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}.
+                    '</label>';
 		$temp++;
 		if ($direction eq 'horizontal') { $result.="</td>"; }
 	    }
@@ -433,8 +435,9 @@ sub displayfoils {
 	    } else {
 		$result.='Incorrect:';
 	    }
+	    if ($target eq 'web') { $result.="<label>"; }
 	    $result.=$Apache::response::foilgroup{$name.'.text'};
-	    if ($target eq 'web') { $result.="</input>"; }
+	    if ($target eq 'web') { $result.="</label>"; }
 	    if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
 		if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
 	    }
@@ -467,9 +470,10 @@ sub displayfoils {
 		} 
 	    }
 	    if ($target ne 'tex') { 
+                $result.= '<label>';
 		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>";
+		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</label>";
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
@@ -558,6 +562,9 @@ sub start_foil {
     my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::startredirection;
+	if ($target eq 'analyze') {
+	    &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+	}
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Name:','name',$token);