--- loncom/homework/radiobuttonresponse.pm 2004/05/27 04:25:13 1.89
+++ loncom/homework/radiobuttonresponse.pm 2004/08/26 22:08:30 1.91
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.89 2004/05/27 04:25:13 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.91 2004/08/26 22:08:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -181,8 +181,11 @@ 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);
+ $result=&displayfoils($target,$max,$randomize,$direction);
} elsif ($target eq 'answer' ) {
$result=&displayanswers($max,$randomize);
} elsif ( $target eq 'grade') {
@@ -248,7 +251,7 @@ sub displayallfoils {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
$result.="
\n";
+ $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."";
$temp++;
}
}
@@ -390,7 +393,7 @@ sub whichfoils {
}
sub displayfoils {
- my ($target,$max,$randomize)=@_;
+ my ($target,$max,$randomize,$direction)=@_;
my $result;
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
@@ -398,7 +401,15 @@ sub displayfoils {
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
if ( ($target ne 'tex') &&
&Apache::response::show_answer() ) {
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') {
+ $result.='
'; }
+ }
if ($target ne 'tex') {
$result.=" "; } else { @@ -409,14 +420,19 @@ sub displayfoils { } else { $result.='Incorrect:'; } - if ($target ne 'tex') { - $result.=$Apache::response::foilgroup{$name.'.text'}."\n"; - } else { - $result.=$Apache::response::foilgroup{$name.'.text'}; - } + $result.=$Apache::response::foilgroup{$name.'.text'}; + if ($target eq 'web') { $result.=""; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { if ($target ne 'tex') { $result.='';} else {$result.='}';} } + if ($direction eq 'horizontal') { + if ($target ne 'tex') { $result.=' | '; }
+ }
+ }
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') {
+ $result.='