version 1.44, 2004/07/08 17:51:31
|
version 1.45, 2004/10/07 18:06:05
|
Line 460 sub displayfoils {
|
Line 460 sub displayfoils {
|
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$question.='<br />'.$optionlist.$text."\n"; |
$question.="<br />\n".$optionlist.$text; |
} else { |
} else { |
$question.='<br />'.$text."\n"; |
$question.="<br />\n".$text; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
my @blank; |
my @blank; |
Line 488 sub displayfoils {
|
Line 488 sub displayfoils {
|
$result=$question.$result; |
$result=$question.$result; |
} elsif ($result=&itemdisplay('right')) { |
} elsif ($result=&itemdisplay('right')) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
#remove the first <br /> |
'</td></tr></table>'; |
$question=~s|<br />||; |
|
$result='<table><tr><td valign="top">'.$question. |
|
'</td><td valign="top">'.$result.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my ($lefttabsize,$righttabsize)=(0,0); |
my ($lefttabsize,$righttabsize)=(0,0); |
Line 508 sub displayfoils {
|
Line 510 sub displayfoils {
|
} |
} |
} elsif ($result=&itemdisplay('left')) { |
} elsif ($result=&itemdisplay('left')) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
#remove the first <br /> |
'</td></tr></table>'; |
$question=~s|<br />||; |
|
$result='<table><tr><td valign="top">'.$result. |
|
'</td><td valign="top">'.$question.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my ($lefttabsize,$righttabsize)=(0,0); |
my ($lefttabsize,$righttabsize)=(0,0); |