--- loncom/homework/edit.pm 2003/06/04 23:04:34 1.53
+++ loncom/homework/edit.pm 2003/10/06 20:11:38 1.57.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.53 2003/06/04 23:04:34 albertel Exp $
+# $Id: edit.pm,v 1.57.2.2 2003/10/06 20:11:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -75,13 +75,7 @@ sub tag_end {
my ($target,$token,$description) = @_;
my $result='';
if ($target eq 'edit') {
- my $tag=$token->[1];
- if (!defined($description)) {
- $result.="
</$tag> | | ";
- } else {
- if ($description ne '') { $result.="
$description | | "; }
- }
- $result.="
".&end_table()."\n";
+ $result.="".&end_table()."\n";
}
return $result;
}
@@ -310,6 +304,16 @@ sub insert_essayresponse {
';
}
+sub insert_imageresponse {
+ return '
+
+
+
+
+
+';
+}
+
sub insert_optionresponse {
return '
@@ -514,7 +518,7 @@ sub text_arg {
my $arg=$token->[2]{$name};
$result=$description.' ';
- return $result;
+ return ''.$result.'';
}
sub select_arg {
@@ -523,23 +527,25 @@ sub select_arg {
my $optionlist="";
my $selected=$token->[2]{$name};
foreach my $option (@$list) {
- my $value;
+ my ($text,$value);
if ( ref($option) eq 'ARRAY') {
$value='value="'.$$option[0].'"';
- $option=$$option[1];
+ $text=$$option[1];
+ $option=$$option[0];
} else {
+ $text=$option;
$value='value="'.$option.'"';
}
if ( $selected eq $option ) {
- $optionlist.="\n";
+ $optionlist.="\n";
} else {
- $optionlist.="\n";
+ $optionlist.="\n";
}
}
- $result.=$description.' ';
return $result;
}
@@ -550,18 +556,20 @@ sub select_or_text_arg {
my $found=0;
my $selected=$token->[2]{$name};
foreach my $option (@$list) {
- my $value;
+ my ($text,$value);
if ( ref($option) eq 'ARRAY') {
$value='value="'.$$option[0].'"';
- $option=$$option[1];
+ $text=$$option[1];
+ $option=$$option[0];
} else {
+ $text=$option;
$value='value="'.$option.'"';
}
if ( $selected eq $option ) {
- $optionlist.="\n";
+ $optionlist.="\n";
$found=1;
} else {
- $optionlist.="\n";
+ $optionlist.="\n";
}
}
$optionlist.="\n";
@@ -573,7 +581,7 @@ sub select_or_text_arg {
} else {
$result.=&text_arg($description,$name,$token,$size);
}
- return $result;
+ return ''.$result.'';
}
#----------------------------------------------------- image coordinates
@@ -647,7 +655,7 @@ sub browse {
$Apache::lonxml::curdepth);
}
my $result = <<"ENDBUTTON";
-Browse
+Select
ENDBUTTON
return $result;
}