\n";
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;
@@ -90,44 +194,45 @@ sub tag_end {
sub start_table {
my ($token)=@_;
- my $tag = $token->[1];
- my $tagnum;
- foreach my $namespace (reverse @Apache::lonxml::namespace) {
- my $testtag=$namespace.'::'.$tag;
- $tagnum=$Apache::lonxml::insertlist{"$testtag.num"};
- if (defined($tagnum)) { last; }
- }
- if (!defined ($tagnum)) {$tagnum=$Apache::lonxml::insertlist{"$tag.num"};}
- my $color = $Apache::lonxml::insertlist{"$tagnum.color"};
+ my $tag = &Apache::lonxml::get_tag($token);
+
+ my $color = $Apache::lonxml::insertlist{"$tag.color"};
+ &Apache::lonxml::debug(" $tag -- $color");
if (!defined($color)) {
$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
}
$Apache::edit::colordepth++;
push(@Apache::edit::inserttag,$token->[1]);
my $result='';
- $result.='
';
+ $result.='';
return $result;
}
sub end_table {
$Apache::edit::colordepth--;
my $result='
';
- $result.="";
+ $result.='';
my ($tagname,$closingtag);
if (defined($Apache::edit::inserttag[-2])) {
$tagname=$Apache::edit::inserttag[-2];
- } else {$tagname='problem';}
+ } else {
+ if ($Apache::lonhomework::parsing_a_task) {
+ $tagname='Task';
+ } else {
+ $tagname='problem';
+ }
+ }
if (defined($Apache::edit::inserttag[-1])) {
$closingtag=$Apache::edit::inserttag[-1];
}
$result.=&innerinsertlist('edit',$tagname,$closingtag).
- "
";
- pop(@Apache::edit::inserttag);
+ "
";
+ my $last = pop(@Apache::edit::inserttag);
return $result;
}
-sub start_spanning_row { return '';}
+sub start_spanning_row { return ' ';}
sub start_row { return ' '; }
sub end_row { return '
Yes
+".&mt('yes')."
";
return $result;
}
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) {
@@ -164,7 +269,7 @@ sub handle_delete {
}
if (!$result) {
my $endtag='/'.$token->[1];
- my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
+ my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser,$style);
$$parser['-1']->get_token();
&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
&Apache::lonxml::end_tag($tagstack,$parstack,$token);
@@ -175,25 +280,26 @@ sub handle_delete {
sub get_insert_list {
my ($tagname) = @_;
my $result='';
- my @tagnums= ();
+ my @tags= ();
#&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
if ($Apache::lonxml::insertlist{"$tagname.which"}) {
- push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
+ push (@tags, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
}
foreach my $namespace (@Apache::lonxml::namespace) {
if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {
- push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
+ push (@tags, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
}
}
- if (@tagnums) {
+ if (@tags) {
my %options;
- foreach my $tagnum (@tagnums) {
- my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"};
+ foreach my $tag (@tags) {
+ my $descrip=$Apache::lonxml::insertlist{"$tag.description"};
+ my $tagnum =$Apache::lonxml::insertlist{"$tag.num"};
$options{$descrip} ="".
$descrip." \n";
}
foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
- if ($result) { $result='
$optionlist
"
@@ -225,41 +331,33 @@ sub innerinsertlist {
}
sub handle_insert {
- if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
- my $result;
- 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"};
- my $namespace;
- if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
- $result.="\n<$newtag>\n";
- } else {
- if (defined(&$func)) {
- {
- no strict 'refs';
- $result.=&$func();
- }
- } else {
- my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
- &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined.");
- }
- }
- return $result;
+ if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
+ my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"};
+ return &do_insert($tagnum);
}
sub handle_insertafter {
my $tagname=shift;
- if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
- { return ''; }
+ if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') {
+ return '';
+ }
+ my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
+ return &do_insert($tagnum,1);
+}
+
+sub do_insert {
+ my ($tagnum,$after) = @_;
my $result;
- my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
- my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
+
+ my $newtag = $Apache::lonxml::insertlist{"$tagnum.tag"};
+ my $func = $Apache::lonxml::insertlist{"$newtag.function"};
if ($func eq 'default') {
- my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
my $namespace;
if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
- $result.="\n<$newtag>\n";
+ my $depth = scalar(@Apache::lonxml::depthcounter);
+ $depth -- if ($after);
+ my $inset = "\t"x$depth;
+ $result.="\n$inset<$newtag>";
} else {
if (defined(&$func)) {
{
@@ -267,8 +365,7 @@ sub handle_insertafter {
$result.=&$func();
}
} else {
- my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
- &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");
+ &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined. ($tagnum)");
}
}
return $result;
@@ -284,35 +381,195 @@ sub insert_responseparam {
-
-
';
}
+sub insert_functionplotresponse {
+ return '
+
+
+
+
+
+ ';
+}
+
+sub insert_spline {
+ return '
+
+
+# &fpr_val("label"), &fpr_f($x), &fpr_dfdx($x), &fpr_d2fdx2($x)
+# ($xs,$xe,$ys,$ye)=&fpr_vectorcoords("Name"), ($x,$y)=&fpr_objectcoords("Name")
+# &fpr_vectorlength("Name"), &fpr_vectorangle("Name")
+
+# Return 0 or 1
+return 1;
+
+ ';
+}
+
+sub insert_functionplotruleset {
+ return '
+
+ ';
+}
+
+sub insert_functionplotelements {
+ return '
+
+ ';
+}
+
sub insert_numericalresponse {
return '
+
-
';
}
+sub insert_externalresponse {
+ return '
+
+ ';
+}
+
+sub insert_customresponse {
+ return '
+
+
+
+
+
+ ';
+}
+
+sub insert_customresponse_answer {
+ return '
+
+
+';
+}
+
+sub insert_customhint {
+ return '
+
+
+
+ ';
+}
+
+sub insert_customhint_answer {
+ return '
+
+
+';
+}
+
+sub insert_mathresponse {
+ return '
+
+
+
+
+
+ ';
+}
+
+sub insert_mathresponse_answer {
+ return '
+
+
+';
+}
+
+sub insert_mathhint {
+ return '
+
+
+
+ ';
+}
+
+sub insert_mathhint_answer {
+ return '
+
+
+';
+}
+
sub insert_stringresponse {
return '
-
';
}
@@ -328,10 +585,11 @@ sub insert_imageresponse {
return '
+
+
-
';
}
@@ -340,10 +598,12 @@ sub insert_optionresponse {
return '
+
+
-
';
}
@@ -353,8 +613,7 @@ sub insert_organicresponse {
-
';
}
@@ -369,10 +628,12 @@ sub insert_radiobuttonresponse {
return '
+
+
-
';
}
@@ -382,8 +643,7 @@ sub insert_reactionresponse {
-
';
}
@@ -392,10 +652,12 @@ sub insert_rankresponse {
return '
+
+
-
';
}
@@ -405,30 +667,36 @@ sub insert_matchresponse {
+ -
+
+
+
-
';
}
+sub insert_startpartmarker { return '
- ';
}
sub insert_hintgroup {
return '
- ';
}
@@ -438,6 +706,18 @@ sub insert_numericalhint {
';
}
+sub insert_reactionhint {
+ return '
+
+ ';
+}
+
+sub insert_organichint {
+ return '
+
+ ';
+}
+
sub insert_stringhint {
return '
@@ -463,13 +743,60 @@ sub insert_optionhint {
}
sub insert_startouttext {
- return "
+//
+
+SCRIPT
+}
+
+sub form_change_detection {
+ return ' onsubmit="is_submit=true;" ';
}
+sub element_change_detection {
+ return ' onchange="unClean();" ';
+}
+
+sub submit_ask_anyway {
+ my ($extra_action) = @_;
+ return ' onclick="still_ask=true;'.$extra_action.'" ';
+}
+
+sub submit_dont_ask {
+ my ($extra_action) = @_;
+ return ' onclick="is_submit=true;'.$extra_action.'" ';
+}
+
+
sub textarea_sizes {
my ($data)=@_;
my $count=0;
@@ -486,42 +813,61 @@ sub textarea_sizes {
sub editline {
my ($tag,$data,$description,$size)=@_;
- $data=&HTML::Entities::encode($data);
- if ($description) { $description="'.$result.' ';
+ '" type="text" value="'.$arg.'" size="'.$size.'" ';
+ if (defined $class) {
+ $result .= 'class="' . $class . '" ';
+ }
+ $result .= &element_change_detection().'/>';
+ return ' '.$result.' ';
}
sub select_arg {
@@ -629,26 +988,28 @@ sub select_arg {
my $result;
my $optionlist="";
my $selected=$token->[2]{$name};
- foreach my $option (@$list) {
- my ($text,$value);
- if ( ref($option) eq 'ARRAY') {
- $value='value="'.$$option[0].'"';
- $text=$$option[1];
- $option=$$option[0];
- } else {
- $text=$option;
- $value='value="'.$option.'"';
- }
- if ( $selected eq $option ) {
- $optionlist.="$text \n";
- } else {
- $optionlist.="$text \n";
- }
+ if (ref($list) eq 'ARRAY') {
+ foreach my $option (@{$list}) {
+ my ($text,$value);
+ if (ref($option) eq 'ARRAY') {
+ $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+ $text=$option->[1];
+ $option=$option->[0];
+ } else {
+ $text=$option;
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+ }
+ if ( $selected eq $option ) {
+ $optionlist.="".&mt($text)." \n";
+ } else {
+ $optionlist.="".&mt($text)." \n";
+ }
+ }
}
- $result.=''.$description.'
+ $result.=' '.&mt($description).'
'.$optionlist.'
- ';
+ ';
return $result;
}
@@ -658,27 +1019,30 @@ sub select_or_text_arg {
my $optionlist="";
my $found=0;
my $selected=$token->[2]{$name};
- foreach my $option (@$list) {
- my ($text,$value);
- if ( ref($option) eq 'ARRAY') {
- $value='value="'.$$option[0].'"';
- $text=$$option[1];
- $option=$$option[0];
- } else {
- $text=$option;
- $value='value="'.$option.'"';
- }
- if ( $selected eq $option ) {
- $optionlist.="$text \n";
- $found=1;
- } else {
- $optionlist.="$text \n";
- }
+ if (ref($list) eq 'ARRAY') {
+ foreach my $option (@{$list}) {
+ my ($text,$value);
+ if (ref($option) eq 'ARRAY') {
+ $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+ $text=$option->[1];
+ $option=$option->[0];
+ } else {
+ $text=$option;
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+ }
+ if ( $selected eq $option ) {
+ $optionlist.="$text \n";
+ $found=1;
+ } else {
+ $optionlist.="$text \n";
+ }
+ }
}
$optionlist.="".&mt('Type-in value')." \n";
#
+ my $change_code=&element_change_detection();
my $element=&html_element_name($name);
my $selectelement='select_list_'.$element;
my $typeinelement='type_in_'.$element;
@@ -693,49 +1057,55 @@ sub select_or_text_arg {
$description=&mt($description);
#
return (<
+
$description
+onchange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
$optionlist
...
- $element = &Apache::lonnet::escape('homework_edit_'.
+ $element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
- my $formheight='';
+ my $id=$Apache::lonxml::curdepth;
+ my %data=("imagechoice.$id.type" =>'point',
+ "imagechoice.$id.formname" =>$form,
+ "imagechoice.$id.formx" =>"$idx$element",
+ "imagechoice.$id.formy" =>"$idy$element",
+ "imagechoice.$id.file" =>$bgfile,
+ "imagechoice.$id.formcoord" =>$element);
if ($height) {
- $formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
+ $data{"imagechoice.$id.formheight"}=$height.'_'.
+ $Apache::edit::bgimgsrccurdepth;
}
- my $formwidth='';
if ($width) {
- $formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
+ $data{"imagechoice.$id.formwidth"}=$width.'_'.
+ $Apache::edit::bgimgsrccurdepth;
}
- my $result = <<"ENDBUTTON";
-Click Coordinates
-ENDBUTTON
+ &Apache::lonnet::appenv(\%data);
+ my $text="Click Coordinates";
+ my $result=''.$text.' ';
return $result;
}
@@ -744,14 +1114,13 @@ ENDBUTTON
sub entercoord {
my ($idx,$mode,$width,$height,$type) = @_;
unless ($Apache::edit::bgimgsrc) { return ''; }
- my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
- &Apache::lonnet::logthis($Apache::edit::bgfile);
+ my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
- $element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");
+ $element = &escape("$idx\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between ...
- $element = &Apache::lonnet::escape('homework_edit_'.
+ $element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
my $id=$Apache::lonxml::curdepth;
@@ -767,7 +1136,7 @@ sub entercoord {
$data{"imagechoice.$id.formwidth"}=$width.'_'.
$Apache::edit::bgimgsrccurdepth;
}
- &Apache::lonnet::appenv(%data);
+ &Apache::lonnet::appenv(\%data);
my $text="Enter Coordinates";
if ($type eq 'polygon') { $text='Create Polygon Data'; }
my $result=''.$text.' ';
@@ -775,24 +1144,26 @@ sub entercoord {
}
sub deletecoorddata {
- &Apache::lonnet::delenv("imagechoice\\.");
+ &Apache::lonnet::delenv('imagechoice.');
}
#----------------------------------------------------- browse
sub browse {
# insert a link to call up the filesystem browser (lonindexer)
- my ($id, $mode, $titleid) = @_;
+ my ($id, $mode, $titleid, $only) = @_;
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
- $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+ $element = &escape("$id\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between ...
- $element = &Apache::lonnet::escape('homework_edit_'.
+ $element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
my $titleelement;
if ($titleid) {
- $titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
+ $titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+ } else {
+ $titleelement=",'$only'";
}
my $result = <<"ENDBUTTON";
Select
@@ -807,14 +1178,14 @@ sub search {
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
- $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+ $element = &escape("$id\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between ...
- $element = &Apache::lonnet::escape('homework_edit_'.
+ $element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
my $titleelement;
if ($titleid) {
- $titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
+ $titleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
}
my $result = <<"ENDBUTTON";
Search
@@ -826,119 +1197,4 @@ ENDBUTTON
1;
__END__
-=head1 NAME
-
-Apache::edit - edit mode helpers
-
-=head1 SYNOPSIS
-
-Invoked by many homework and xml related modules.
-
- &Apache::edit::SUBROUTINENAME(ARGUMENTS);
-
-=head1 INTRODUCTION
-
-This module outputs HTML syntax helpful for the rendering of edit
-mode interfaces.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-There is no handler subroutine.
-
-=head1 OTHER SUBROUTINES
-
-=over 4
-
-=item *
-
-initialize_edit() : initialize edit (set colordepth to zero)
-
-=item *
-tag_start($target,$token,$description) : provide deletion and insertion lists
-for the manipulation of a start tag; return a scalar string
-
-=item *
-
-tag_end($target,$token,$description) : ending syntax corresponding to
-&tag_start. return a scalar string.
-
-=item *
-
-start_table($token) : start table; update colordepth; return scalar string.
-
-=item *
-
-end_table() : reduce color depth; end table; return scalar string
-
-=item *
-
-start_spanning_row() : start a new table row spanning the 'edit' environment.
-
-=item *
-
-start_row() : start a new table row and element.
-
-=item *
-
-end_row() : end current table element and row.
-
-=item *
-
-movebuttons($target,$token) : move-up and move-down buttons; return scalar
-string
-
-=item *
-
-deletelist($target,$token) : provide a yes option in an HTML select element;
-return scalar string
-
-=item *
-
-handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,
-$style) : respond to a user delete request by passing relevant stack
-and array information to various rendering functions; return a scalar string
-
-=item *
-
-get_insert_list($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-
-insertlist($target,$token) : api that uses get_insert_list;
-return a scalar string
-
-=item *
-
-handleinsert($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-
-get_insert_list($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-browse($elementname) : provide a link which will open up the filesystem
-browser (lonindexer) and, once a file is selected, place the result in
-the form element $elementname.
-
-=item *
-search($elementname) : provide a link which will open up the filesystem
-searcher (lonsearchcat) and, once a file is selected, place the result in
-the form element $elementname.
-
-=item *
-editline(tag,data,description,size): Provide a