--- loncom/homework/randomlabel.pm 2002/02/07 16:45:06 1.13
+++ loncom/homework/randomlabel.pm 2002/03/06 20:29:03 1.15
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.13 2002/02/07 16:45:06 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.15 2002/03/06 20:29:03 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -101,11 +101,12 @@ sub start_randomlabel {
$bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
- $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).'
'.
- &Apache::edit::text_arg('Width(pixel):','width',$token,4).
- &Apache::edit::text_arg('Height(pixel):','height',$token,4).
- &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).
- &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75);
+ $result.=&Apache::edit::browse('bgimg').'
'.
+ &Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6).
+ &Apache::edit::text_arg('Height(pixel):','height' ,$token,6).
+ &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
'bgimg','width','height',
@@ -307,6 +308,7 @@ sub start_label {
if ($target eq 'web' || $target eq 'tex' ||
$target eq 'grade' || $target eq 'answer') {
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+ $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
push(@Apache::randomlabel::label_arr,$ltext);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);