version 1.137, 2007/02/22 01:25:31
|
version 1.143, 2007/04/17 23:25:09
|
Line 423 sub displayfoils {
|
Line 423 sub displayfoils {
|
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$optionlist='<select name="HWVAL_'. |
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
|
$part.'\');" name="HWVAL_'. |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} else { |
} else { |
Line 475 sub displayfoils {
|
Line 476 sub displayfoils {
|
} |
} |
} |
} |
} |
} |
|
|
|
if ($target eq 'web') { |
|
&Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer, |
|
[\@whichopt, |
|
'submissiongrading']); |
|
} |
|
|
if ($target ne 'tex') { |
if ($target ne 'tex') { |
return $result.$break; |
return $result.$break; |
} else { |
} else { |
Line 533 sub webbubbles {
|
Line 541 sub webbubbles {
|
|
|
|
|
sub bubbles { |
sub bubbles { |
my ($ralphabet,$ropt,$response) = @_; |
my ($ralphabet,$ropt,$response, $max_width) = @_; |
my @alphabet = @$ralphabet; |
my @alphabet = @$ralphabet; |
my @opt = @$ropt; |
my @opt = @$ropt; |
my ($result,$head,$line) =('','',''); |
my ($result,$head,$line) =('','',''); |
my $number_of_bubbles = $#opt + 1; |
my $number_of_bubbles = $#opt + 1; |
my $current_length = 0; |
my $current_length = 0; |
my $textwidth; |
my $textwidth; |
if ($env{'form.textwidth'} ne '') { |
if (defined($max_width)) { |
|
$textwidth=$max_width; |
|
&Apache::lonxml::debug("Max width passed in: $max_width"); |
|
} elsif ($env{'form.textwidth'} ne '') { |
$env{'form.textwidth'}=~/(\d+)/; |
$env{'form.textwidth'}=~/(\d+)/; |
$textwidth=$1; |
$textwidth=$1; |
|
&Apache::lonxml::debug("Max width from form: $textwidth"); |
} else { |
} else { |
$env{'form.textwidth'}=~/(\d*)\.?(\d*)/; |
$env{'form.textwidth'}=~/(\d*)\.?(\d*)/; |
$textwidth=$1.'.'.$2; |
$textwidth=$1.'.'.$2; |
|
&Apache::lonxml::debug("Max width defaults? $textwidth"); |
} |
} |
|
&Apache::lonxml::debug("Final maxwidth: $textwidth"); |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
my $leftmargin; |
my $leftmargin; |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];} |
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];} |
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} |
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} |
|
|
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |