--- loncom/homework/edit.pm 2003/05/09 22:10:12 1.50
+++ loncom/homework/edit.pm 2003/10/16 18:36:22 1.57.2.4
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.50 2003/05/09 22:10:12 albertel Exp $
+# $Id: edit.pm,v 1.57.2.4 2003/10/16 18:36:22 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 '
@@ -404,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);
@@ -452,17 +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 $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;
@@ -505,6 +515,35 @@ sub hidden_arg {
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.="$text\n";
+ }
+ return $result;
+}
+
sub text_arg {
my ($description,$name,$token,$size) = @_;
my $result;
@@ -512,7 +551,7 @@ sub text_arg {
my $arg=$token->[2]{$name};
$result=$description.' ';
- return $result;
+ return ''.$result.'';
}
sub select_arg {
@@ -521,23 +560,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;
}
@@ -548,18 +589,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";
@@ -571,7 +614,7 @@ sub select_or_text_arg {
} else {
$result.=&text_arg($description,$name,$token,$size);
}
- return $result;
+ return ''.$result.'';
}
#----------------------------------------------------- image coordinates
@@ -627,7 +670,7 @@ sub entercoordpair {
$formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
}
my $result = <<"ENDBUTTON";
-Click Coordinate Pair
ENDBUTTON
return $result;
@@ -645,7 +688,7 @@ sub browse {
$Apache::lonxml::curdepth);
}
my $result = <<"ENDBUTTON";
-Browse
+Select
ENDBUTTON
return $result;
}