--- loncom/homework/radiobuttonresponse.pm	2004/08/27 21:47:34	1.92
+++ 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.92 2004/08/27 21:47:34 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.95 2004/10/07 20:28:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -167,9 +167,11 @@ sub end_foilgroup {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $style = $Apache::lonhomework::type;
+	my $direction = &Apache::lonxml::get_param('direction',$parstack,
+						   $safeeval,'-2');
 	if ( $style eq 'survey'  && $target ne 'analyze') {
 	    if ($target eq 'web' || $target eq 'tex') {
-		$result=&displayallfoils();
+		$result=&displayallfoils($direction);
 	    } elsif ( $target eq 'answer' ) {
 		$result=&displayallanswers();
 	    } elsif ( $target eq 'grade' ) {
@@ -181,9 +183,6 @@ sub end_foilgroup {
 						 '-2');
 	    my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 						       $safeeval,'-2');
-	    my $direction = &Apache::lonxml::get_param('direction',$parstack,
-						       $safeeval,'-2');
-	    &Apache::lonxml::debug("direction is $direction");
 	    if ($target eq 'web' || $target eq 'tex') {
 		$result=&displayfoils($target,$max,$randomize,$direction);
 	    } elsif ($target eq 'answer' ) {
@@ -224,6 +223,7 @@ sub getfoilcounts {
 }
 
 sub displayallfoils {
+    my ($direction)=@_;
     my $result;
     &Apache::lonxml::debug("survey style display");
     my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -232,11 +232,16 @@ sub displayallfoils {
     my $part=$Apache::inputtags::part;
     my $lastresponse=
 	$Apache::lonhomework::history{"resource.$part.$id.submission"};
+    if ($direction eq 'horizontal') { $result.='<table><tr>'; }
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     if (&Apache::response::show_answer() ) {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		$result.="<br />";
+		if ($direction eq 'horizontal') {
+		    $result.="<td>";
+		} else {
+		    $result.="<br />";
+		}
 		if (defined($lastresponse{$name})) {
 		    $result.='<b>';
 		}
@@ -244,18 +249,28 @@ sub displayallfoils {
 		if (defined($lastresponse{$name})) {
 		    $result.='</b>';
 		}
+		if ($direction eq 'horizontal') { $result.="</td>"; }
 	    }
 	}
     } else {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		$result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+		if ($direction eq 'horizontal') {
+		    $result.="<td>";
+		} 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>"; }
 	    }
 	}
     }
+    if ($direction eq 'horizontal') { $result.='</tr></table>'; }
     return $result;
 }
 
@@ -420,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.='}';}
 	    }
@@ -454,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
@@ -545,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);