| \n";
- my @help;# = Apache::lonxml::helpinfo($token);
+ my @help = Apache::lonxml::helpinfo($token);
if ($help[0]) {
- $result .= ' | ' .
- Apache::loncommon::help_open_topic(@help) .
- ' | ';
- } else { $result .= " | "; }
+ $result .= '' .
+ Apache::loncommon::help_open_topic(@help);
+ } else { $result .= " | "; }
$result .= &end_row().&start_spanning_row();
}
return $result;
@@ -111,7 +109,7 @@ sub start_table {
sub end_table {
$Apache::edit::colordepth--;
my $result='';
- $result.="";
+ $result.='| ';
my ($tagname,$closingtag);
if (defined($Apache::edit::inserttag[-2])) {
@@ -121,7 +119,7 @@ sub end_table {
$closingtag=$Apache::edit::inserttag[-1];
}
$result.=&innerinsertlist('edit',$tagname,$closingtag).
- " |
";
+ " |
";
pop(@Apache::edit::inserttag);
return $result;
}
@@ -149,7 +147,7 @@ sub deletelist {
}
sub handle_delete {
- if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
+ if (!$env{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result=0;
if ($space) {
@@ -192,7 +190,7 @@ sub get_insert_list {
$descrip."\n";
}
foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
- if ($result) { $result=''.$result; }
+ if ($result) { $result=''.$result; }
}
return $result;
}
@@ -224,9 +222,9 @@ sub innerinsertlist {
}
sub handle_insert {
- if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
+ if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
my $result;
- my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};
+ my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"};
my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
if ($func eq 'default') {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
@@ -241,7 +239,7 @@ sub handle_insert {
}
} else {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
- &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined.");
+ &Apache::lonxml::error("Unable to insert tag ".$Apache::lonxml::curdepth." ($tagnum) $newtag, func was not defined.");
}
}
return $result;
@@ -249,10 +247,10 @@ sub handle_insert {
sub handle_insertafter {
my $tagname=shift;
- if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
+ if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
{ return ''; }
my $result;
- my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
+ my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
if ($func eq 'default') {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
@@ -273,16 +271,28 @@ sub handle_insertafter {
return $result;
}
+sub insert_img {
+ return '
+ ![]() ';
+}
+
sub insert_responseparam {
return '
';
}
+sub insert_parameter {
+ return '
+ ';
+}
+
sub insert_formularesponse {
return '
-
+
+
+
';
}
@@ -290,8 +300,11 @@ sub insert_formularesponse {
sub insert_numericalresponse {
return '
+
+
+
';
}
@@ -301,6 +314,7 @@ sub insert_stringresponse {
+
';
}
@@ -316,8 +330,11 @@ sub insert_imageresponse {
return '
+
+
+
';
}
@@ -326,28 +343,66 @@ sub insert_optionresponse {
return '
+
+
+
+
';
}
+sub insert_organicresponse {
+ return '
+
+
+
+
+
+';
+}
+
+sub insert_organicstructure {
+ return '
+
+';
+}
+
sub insert_radiobuttonresponse {
return '
+
+
+
+
';
}
+sub insert_reactionresponse {
+ return '
+
+
+
+
+
+';
+}
+
sub insert_rankresponse {
return '
+
+
+
+
';
}
@@ -358,8 +413,12 @@ sub insert_matchresponse {
+
+
+
+
';
}
@@ -369,11 +428,17 @@ sub insert_displaytitle { return '
-
-
+
';
}
+sub insert_hintgroup {
+ return '
+
+
+';
+}
+
sub insert_numericalhint {
return '
@@ -405,11 +470,11 @@ sub insert_optionhint {
}
sub insert_startouttext {
- return "\n";
+ return "";
}
sub insert_script {
- return "\n";
+ return "\n";
}
sub textarea_sizes {
@@ -428,7 +493,7 @@ sub textarea_sizes {
sub editline {
my ($tag,$data,$description,$size)=@_;
- $data=&HTML::Entities::encode($data);
+ $data=&HTML::Entities::encode($data,'<>&"');
if ($description) { $description="
".$description."
"; }
my $result = <<"END";
$description
@@ -439,28 +504,43 @@ END
}
sub editfield {
- my ($tag,$data,$description,$minwidth,$minheight)=@_;
+ my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
my ($rows,$cols)=&textarea_sizes(\$data);
+ if (&Apache::lonhtmlcommon::htmlareabrowser() &&
+ !&Apache::lonhtmlcommon::htmlareablocked()) {
+ $rows+=7; # make room for HTMLarea
+ $minheight+=7; # make room for HTMLarea
+ }
if ($cols > 80) { $cols = 80; }
if ($cols < $minwidth ) { $cols = $minwidth; }
if ($rows < $minheight) { $rows = $minheight; }
if ($description) { $description="
".$description."
"; }
- return $description."\n".' '."\n";
+ &HTML::Entities::encode($data,'<>&"').''.
+ ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
+ 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
}
sub modifiedfield {
- my ($token) = @_;
+ my ($endtag,$parser) = @_;
my $result;
-# foreach my $envkey (sort keys %ENV) {
-# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
+# foreach my $envkey (sort keys %env) {
+# &Apache::lonxml::debug("$envkey ---- $env{$envkey}");
# }
# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
-# &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
- $result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
+# &Apache::lonxml::debug($env{"form.homework_edit_$Apache::lonxml::curdepth"});
+ $result=$env{"form.homework_edit_$Apache::lonxml::curdepth"};
+ my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
+ # textareas throw away intial \n
+ if ($bodytext=~/^\n/) { $result="\n".$result; }
return $result;
}
@@ -473,7 +553,7 @@ sub get_new_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"};
+ my $newvalue=$env{"form.$element"};
&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:");
if (defined($newvalue) && $value ne $newvalue) {
if (ref($newvalue) eq 'ARRAY') {
@@ -482,6 +562,9 @@ sub get_new_args {
$token->[2]->{$arg}=$newvalue;
}
$rebuild=1;
+ } elsif (!defined($newvalue) && defined($value)) {
+ delete($token->[2]->{$arg});
+ $rebuild=1;
}
}
return $rebuild;
@@ -529,7 +612,7 @@ sub checked_arg {
my $result;
my $optionlist="";
my $allselected=$token->[2]{$name};
- $result=$description;
+ $result=&mt($description);
foreach my $option (@$list) {
my ($value,$text);
if ( ref($option) eq 'ARRAY') {
@@ -544,7 +627,7 @@ sub checked_arg {
&html_element_name($name)."'";
foreach my $selected (split(/,/,$allselected)) {
if ( $selected eq $option ) {
- $result.=" checked='on' ";
+ $result.=" checked='checked' ";
last;
}
}
@@ -558,7 +641,7 @@ sub text_arg {
my $result;
if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};
- $result=$description.' ';
return ''.$result.'';
}
@@ -569,17 +652,19 @@ 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];
+ $value='value="'.&HTML::Entities::encode($$option[0]).'"';
+ $text=$$option[1];
+ $option=$$option[0];
} else {
- $value='value="'.$option.'"';
+ $text=$option;
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
}
if ( $selected eq $option ) {
- $optionlist.="\n";
+ $optionlist.="\n";
} else {
- $optionlist.="\n";
+ $optionlist.="\n";
}
}
$result.=''.$description.' |