--- loncom/homework/edit.pm 2003/01/19 08:13:54 1.43
+++ loncom/homework/edit.pm 2003/10/15 21:19:46 1.57.2.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.43 2003/01/19 08:13:54 albertel Exp $
+# $Id: edit.pm,v 1.57.2.3 2003/10/15 21:19:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,9 @@ use HTML::Entities();
# depth of nesting of edit
$Apache::edit::colordepth=0;
@Apache::edit::inserttag=();
+# image-type responses: active background image and curdepth at definition
+$Apache::edit::bgimgsrc='';
+$Apache::edit::bgimgsrccurdepth='';
sub initialize_edit {
$Apache::edit::colordepth=0;
@@ -72,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;
}
@@ -159,7 +156,7 @@ sub handle_delete {
}
if (!$result) {
my $endtag='/'.$token->[1];
- my $bodytext=&Apache::lonxml::get_all_text($endtag,$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
$$parser['-1']->get_token();
&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
&Apache::lonxml::end_tag($tagstack,$parstack,$token);
@@ -307,6 +304,16 @@ sub insert_essayresponse {
';
}
+sub insert_imageresponse {
+ return '
+
+
+
+
+
+';
+}
+
sub insert_optionresponse {
return '
@@ -337,6 +344,18 @@ sub insert_rankresponse {
';
}
+sub insert_matchresponse {
+ return '
+
+
+
+
+
+
+
+';
+}
+
sub insert_displayduedate { return ''; }
sub insert_displaytitle { return ''; }
sub insert_hintpart {
@@ -353,12 +372,30 @@ sub insert_numericalhint {
';
}
+sub insert_stringhint {
+ return '
+
+';
+}
+
+sub insert_formulahint {
+ return '
+
+';
+}
+
sub insert_radiobuttonhint {
return '
';
}
+sub insert_optionhint {
+ return '
+
+';
+}
+
sub insert_startouttext {
return "\n";
}
@@ -371,9 +408,11 @@ sub textarea_sizes {
my ($data)=@_;
my $count=0;
my $maxlength=-1;
- foreach (split ("\n", $$data)) { $count++;
- if (length($_) > $maxlength) { $maxlength = length($_); }
- }
+ foreach (split ("\n", $$data)) {
+ $count+=int(length($_)/79);
+ $count++;
+ if (length($_) > $maxlength) { $maxlength = length($_); }
+ }
my $rows = $count;
my $cols = $maxlength;
return ($rows,$cols);
@@ -419,16 +458,21 @@ sub modifiedfield {
# Returns a 1 if the token has been modified and you should rebuild the tag
# side-effects, will modify the $token if new values are found
sub get_new_args {
- my ($token,$parstack,$safeeval,@args)=@_;
- my $rebuild=0;
- foreach my $arg (@args) {
+ my ($token,$parstack,$safeeval,@args)=@_;
+ my $rebuild=0;
+ foreach my $arg (@args) {
#just want the string that it was set to
my $value=$token->[2]->{$arg};
- my $newvalue=$ENV{"form.$Apache::lonxml::curdepth.$arg"};
+ my $element=&html_element_name($arg);
+ my $newvalue=$ENV{"form.$element"};
&Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
- if ($value ne $newvalue) {
- $token->[2]->{$arg}=$newvalue;
- $rebuild=1;
+ if (defined($newvalue) && $value ne $newvalue) {
+ if (ref($newvalue) eq 'ARRAY') {
+ $token->[2]->{$arg}=join(',',@$newvalue);
+ } else {
+ $token->[2]->{$arg}=$newvalue;
+ }
+ $rebuild=1;
}
}
return $rebuild;
@@ -457,14 +501,58 @@ sub rebuild_tag {
return $result;
}
+sub html_element_name {
+ my ($name) = @_;
+ return $name.'_'.$Apache::lonxml::curdepth;
+}
+
+sub hidden_arg {
+ my ($name,$token) = @_;
+ my $result;
+ my $arg=$token->[2]{$name};
+ $result='';
+ return $result;
+}
+
+sub checked_arg {
+ my ($description,$name,$list,$token) = @_;
+ my $result;
+ my $optionlist="";
+ my $allselected=$token->[2]{$name};
+ $result=$description;
+ foreach my $option (@$list) {
+ my ($value,$text);
+ if ( ref($option) eq 'ARRAY') {
+ $value='value="'.$$option[0].'"';
+ $text=$$option[1];
+ $option=$$option[0];
+ } else {
+ $text=$option;
+ $value='value="'.$option.'"';
+ }
+ $result.="");
+ if ( $selected eq $option ) {
+ $result.=" checked='on' ";
+ last;
+ }
+ }
+ $result.=" />$text\n";
+ }
+ return $result;
+}
+
sub text_arg {
my ($description,$name,$token,$size) = @_;
my $result;
if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};
- $result=$description.'';
- return $result;
+ return ''.$result.'';
}
sub select_arg {
@@ -473,23 +561,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;
}
@@ -500,31 +590,92 @@ 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";
if (($found) || (!$selected)) {
- $result.=$description.'