--- loncom/homework/edit.pm 2003/11/28 01:55:24 1.73
+++ loncom/homework/edit.pm 2008/01/15 03:09:09 1.113
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.73 2003/11/28 01:55:24 www Exp $
+# $Id: edit.pm,v 1.113 2008/01/15 03:09:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,15 +25,16 @@
#
# http://www.lon-capa.org/
#
-# 3/20 Guy
-# 01/10/02 Matthew
-# 03/06/02 Matthew
+
package Apache::edit;
use strict;
-use Apache::lonnet();
+use Apache::lonnet;
use HTML::Entities();
use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
# Global Vars
# default list of colors to use in editing
@@ -70,10 +71,9 @@ sub tag_start {
# "</tr><tr><td colspan=\"3\">\n";
my @help = Apache::lonxml::helpinfo($token);
if ($help[0]) {
- $result .= '<td align="right" valign="top">' .
- Apache::loncommon::help_open_topic(@help) .
- '</td>';
- } else { $result .= "<td> </td>"; }
+ $result .= '</td><td align="right" valign="top">' .
+ Apache::loncommon::help_open_topic(@help);
+ } else { $result .= "</td><td> "; }
$result .= &end_row().&start_spanning_row();
}
return $result;
@@ -90,15 +90,10 @@ 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];
}
@@ -112,18 +107,24 @@ sub start_table {
sub end_table {
$Apache::edit::colordepth--;
my $result='</table></div>';
- $result.="<table><tr><td>";
+ $result.='<div align="left"><table><tr><td>';
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).
- "</td></tr></table>";
- pop(@Apache::edit::inserttag);
+ "</td></tr></table></div>";
+ my $last = pop(@Apache::edit::inserttag);
return $result;
}
@@ -150,7 +151,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) {
@@ -164,7 +165,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 +176,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} ="<option value=\"$tagnum\">".
$descrip."</option>\n";
}
foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
- if ($result) { $result='<option selected="on"></option>'.$result; }
+ if ($result) { $result='<option selected="selected"></option>'.$result; }
}
return $result;
}
@@ -225,41 +227,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</$newtag>";
- } 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</$newtag>";
+ my $depth = scalar(@Apache::lonxml::depthcounter);
+ $depth -- if ($after);
+ my $inset = "\t"x$depth;
+ $result.="\n$inset<$newtag>\n$inset</$newtag>";
} else {
if (defined(&$func)) {
{
@@ -267,8 +261,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,13 +277,18 @@ sub insert_responseparam {
<responseparam />';
}
+sub insert_parameter {
+ return '
+ <parameter />';
+}
+
sub insert_formularesponse {
return '
<formularesponse answer="" samples="">
- <textline />
+ <responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol" />
+ <textline size="25"/>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</formularesponse>';
}
@@ -298,21 +296,90 @@ sub insert_formularesponse {
sub insert_numericalresponse {
return '
<numericalresponse answer="">
+<responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance" />
+<responseparam name="sig" type="int_range,0-16" default="0,15" description="Significant Figures" />
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</numericalresponse>';
}
+sub insert_customresponse {
+ return '
+<customresponse>
+ <answer type="loncapa/perl">
+ </answer>
+ <textline />
+ <hintgroup>
+ <startouttext /><endouttext />
+ </hintgroup>
+</customresponse>';
+}
+
+sub insert_customresponse_answer {
+ return '
+ <answer type="loncapa/perl">
+ </answer>
+';
+}
+
+sub insert_customhint {
+ return '
+ <customhint>
+ <answer type="loncapa/perl">
+ </answer>
+ </customhint>';
+}
+
+sub insert_customhint_answer {
+ return '
+ <answer type="loncapa/perl">
+ </answer>
+';
+}
+
+sub insert_mathresponse {
+ return '
+<mathresponse>
+ <answer>
+ </answer>
+ <textline />
+ <hintgroup>
+ <startouttext />
+ <endouttext />
+ </hintgroup>
+</mathresponse>';
+}
+
+sub insert_mathresponse_answer {
+ return '
+ <answer>
+ </answer>
+';
+}
+
+sub insert_mathhint {
+ return '
+ <mathhint>
+ <answer>
+ </answer>
+ </mathhint>';
+}
+
+sub insert_mathhint_answer {
+ return '
+ <answer>
+ </answer>
+';
+}
+
sub insert_stringresponse {
return '
<stringresponse answer="" type="">
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</stringresponse>';
}
@@ -328,10 +395,11 @@ sub insert_imageresponse {
return '
<imageresponse max="1">
<foilgroup>
+ <foil>
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</imageresponse>';
}
@@ -340,10 +408,12 @@ sub insert_optionresponse {
return '
<optionresponse max="10">
<foilgroup options="">
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</optionresponse>';
}
@@ -353,8 +423,7 @@ sub insert_organicresponse {
<organicresponse>
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</organicresponse>';
}
@@ -369,10 +438,12 @@ sub insert_radiobuttonresponse {
return '
<radiobuttonresponse max="10">
<foilgroup>
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</radiobuttonresponse>';
}
@@ -382,8 +453,7 @@ sub insert_reactionresponse {
<reactionresponse>
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</reactionresponse>';
}
@@ -392,10 +462,12 @@ sub insert_rankresponse {
return '
<rankresponse max="10">
<foilgroup options="">
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</rankresponse>';
}
@@ -406,10 +478,12 @@ sub insert_matchresponse {
<foilgroup options="">
<itemgroup>
</itemgroup>
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</matchresponse>';
}
@@ -419,16 +493,14 @@ sub insert_displaytitle { return '<dis
sub insert_hintpart {
return '
<hintpart on="default">
- <startouttext/>
- <endouttext />
+ <startouttext/><endouttext />
</hintpart>';
}
sub insert_hintgroup {
return '
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>';
}
@@ -463,11 +535,50 @@ sub insert_optionhint {
}
sub insert_startouttext {
- return "<startouttext />\n<endouttext />";
+ return "<startouttext /><endouttext />";
}
sub insert_script {
- return "\n<script type=\"loncapa/perl\">\n</script>";
+ return "\n<script type=\"loncapa/perl\"></script>";
+}
+
+sub js_change_detection {
+ my $unsaved=&mt("There are unsaved changes");
+ return (<<SCRIPT);
+<script type="text/javascript">
+var clean = true;
+var is_submit = false;
+var still_ask = false;
+function compareForm(event_) {
+ if (!event_ && window.event) {
+ event_ = window.event;
+ }
+ if ((!is_submit || (is_submit && still_ask)) && !clean) {
+ still_ask = false;
+ is_submit = false;
+ event_.returnValue = "$unsaved";
+ return "$unsaved";
+ }
+}
+function unClean() {
+ clean=false;
+}
+window.onbeforeunload = compareForm;
+</script>
+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 textarea_sizes {
@@ -486,42 +597,61 @@ sub textarea_sizes {
sub editline {
my ($tag,$data,$description,$size)=@_;
- $data=&HTML::Entities::encode($data);
- if ($description) { $description="<br />".$description."<br />"; }
+ $data=&HTML::Entities::encode($data,'<>&"');
+ if ($description) { $description=$description."<br />"; }
+ my $change_code = &element_change_detection();
my $result = <<"END";
$description
<input type="text" name="homework_edit_$Apache::lonxml::curdepth"
- value="$data" size="$size" />
+ value="$data" size="$size" $change_code />
END
return $result;
}
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="<br />".$description."<br />"; }
- return $description."\n".' <textarea rows="'.$rows.
+ if ($description) { $description=$description."<br />"; }
+ if ($usehtmlarea) {
+ &Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'.
+ $Apache::lonxml::curdepth);
+ }
+ # remove typesetting whitespace from between data and the end tag
+ # to make the edit look prettier
+ $data =~ s/\n?[ \t]*$//;
+
+ return $description."\n".'<textarea style="width:100%" rows="'.$rows.
'" cols="'.$cols.'" name="homework_edit_'.
- $Apache::lonxml::curdepth.'">'.
- &HTML::Entities::encode($data).'</textarea>'."\n";
+ $Apache::lonxml::curdepth.'" id="homework_edit_'.
+ $Apache::lonxml::curdepth.'" '.&element_change_detection().'>'.
+ &HTML::Entities::encode($data,'<>&"').'</textarea>'.
+ ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
+ 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
}
sub modifiedfield {
my ($endtag,$parser) = @_;
my $result;
-# 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"};
+ $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; }
+ if ($bodytext=~/^\n/) {
+ $result="\n".$result;
+ }
+ # if there is typesetting whitespace from between the data and the end tag
+ # restore to keep the source looking pretty
+ if ($bodytext =~ /(\n?[ \t]*)$/) {
+ $result .= $1;
+ }
return $result;
}
@@ -534,7 +664,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') {
@@ -543,6 +673,13 @@ sub get_new_args {
$token->[2]->{$arg}=$newvalue;
}
$rebuild=1;
+ # add new attributes to the of the attribute seq
+ if (!grep { $arg eq $_ } (@{ $token->[3] })) {
+ push(@{ $token->[3] },$arg);
+ }
+ } elsif (!defined($newvalue) && defined($value)) {
+ delete($token->[2]->{$arg});
+ $rebuild=1;
}
}
return $rebuild;
@@ -554,11 +691,13 @@ sub rebuild_tag {
my $result;
if ($token->[0] eq 'S') {
$result = '<'.$token->[1];
- while (my ($key,$val)= each(%{$token->[2]})) {
- $val=~s:^\s+|\s+$::g;
- $val=~s:"::g; #"
- &Apache::lonxml::debug("setting :$key: to :$val:");
- $result.=' '.$key.'="'.$val.'"';
+ foreach my $attribute (@{ $token->[3] }) {
+ my $value = $token->[2]{$attribute};
+ next if ($value eq '');
+ $value =~s/^\s+|\s+$//g;
+ $value =~s/\"//g;
+ &Apache::lonxml::debug("setting :$attribute: to :$value:");
+ $result.=' '.$attribute.'="'.$value.'"';
}
if ($token->[4] =~ m:/>$:) {
$result.=' />';
@@ -601,15 +740,15 @@ sub checked_arg {
$text=$option;
$value='value="'.$option.'"';
}
- $result.="<nobr><input type='checkbox' $value name='".
+ $result.="<nobr><label><input type='checkbox' $value name='".
&html_element_name($name)."'";
foreach my $selected (split(/,/,$allselected)) {
if ( $selected eq $option ) {
- $result.=" checked='on' ";
+ $result.=" checked='checked' ";
last;
}
}
- $result.=" />$text</nobr>\n";
+ $result.=&element_change_detection()." />$text</label></nobr>\n";
}
return $result;
}
@@ -620,7 +759,8 @@ sub text_arg {
if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};
$result=&mt($description).' <input name="'.&html_element_name($name).
- '" type="text" value="'.$arg.'" size="'.$size.'" />';
+ '" type="text" value="'.$arg.'" size="'.$size.'" '.
+ &element_change_detection().'/>';
return '<nobr>'.$result.'</nobr>';
}
@@ -632,21 +772,21 @@ sub select_arg {
foreach my $option (@$list) {
my ($text,$value);
if ( ref($option) eq 'ARRAY') {
- $value='value="'.$$option[0].'"';
+ $value='value="'.&HTML::Entities::encode($$option[0]).'"';
$text=$$option[1];
$option=$$option[0];
} else {
$text=$option;
- $value='value="'.$option.'"';
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
}
if ( $selected eq $option ) {
- $optionlist.="<option $value selected=\"on\">$text</option>\n";
+ $optionlist.="<option $value selected=\"selected\">$text</option>\n";
} else {
$optionlist.="<option $value >$text</option>\n";
}
}
$result.='<nobr>'.$description.' <select name="'.
- &html_element_name($name).'">
+ &html_element_name($name).'" '.&element_change_detection().' >
'.$optionlist.'
</select></nobr>';
return $result;
@@ -661,24 +801,25 @@ sub select_or_text_arg {
foreach my $option (@$list) {
my ($text,$value);
if ( ref($option) eq 'ARRAY') {
- $value='value="'.$$option[0].'"';
+ $value='value="'.&HTML::Entities::encode($$option[0]).'"';
$text=$$option[1];
$option=$$option[0];
} else {
$text=$option;
- $value='value="'.$option.'"';
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
}
if ( $selected eq $option ) {
- $optionlist.="<option $value selected=\"on\">$text</option>\n";
+ $optionlist.="<option $value selected=\"selected\">$text</option>\n";
$found=1;
} else {
$optionlist.="<option $value>$text</option>\n";
}
}
$optionlist.="<option value=\"TYPEDINVALUE\"".
- ((!$found)?' selected="on"':'').
+ ((!$found)?' selected="selected"':'').
">".&mt('Type-in value')."</option>\n";
#
+ my $change_code=&element_change_detection();
my $element=&html_element_name($name);
my $selectelement='select_list_'.$element;
my $typeinelement='type_in_'.$element;
@@ -696,14 +837,14 @@ sub select_or_text_arg {
<nobr>
$description
<select name="$selectelement"
-onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }"
+onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
$optionlist
</select>
<input type="text" size="$size" name="$typeinelement"
value="$typeinvalue"
onChange="$hiddenvalue=$typedinvalue;"
onFocus="$selectedindex=$selecttypeinindex-1;" />
-<input type="hidden" name="$element" value="$selected" />
+<input type="hidden" name="$element" value="$selected" $change_code />
</nobr>
ENDSELECTORTYPE
}
@@ -711,76 +852,95 @@ ENDSELECTORTYPE
#----------------------------------------------------- image coordinates
# single image coordinates, x, y
sub entercoords {
- my ($idx,,$idy,$mode,$width,$height) = @_;
+ my ($idx,$idy,$mode,$width,$height) = @_;
unless ($Apache::edit::bgimgsrc) { return ''; }
if ($idx) { $idx.='_'; }
if ($idy) { $idy.='_'; }
- my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);
+ 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("$Apache::lonxml::curdepth");
+ $element = &escape("$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
- $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";
-<a href="/cgi-bin/imagechoice.pl?formname=$form&file=$bgfile&formx=$idx$element&formy=$idy$element$formheight$formwidth"
-target="imagechoice">Click Coordinates</a>
-ENDBUTTON
+ &Apache::lonnet::appenv(%data);
+ my $text="Click Coordinates";
+ my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
return $result;
}
-# coordinate pair (x1,y1)-(x2,y2)
-sub entercoordpair {
- my ($id,$mode,$width,$height) = @_;
+# coordinates (x1,y1)-(x2,y2)...
+# mode can be either box, or polygon
+sub entercoord {
+ my ($idx,$mode,$width,$height,$type) = @_;
unless ($Apache::edit::bgimgsrc) { return ''; }
- my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);
+ 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("$id\_$Apache::lonxml::curdepth");
+ $element = &escape("$idx\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
- $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" =>$type,
+ "imagechoice.$id.formname" =>$form,
+ "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";
-<a href="/cgi-bin/imagechoice.pl?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"
-target="imagechoice">Click Coordinate Pair</a>
-ENDBUTTON
+ &Apache::lonnet::appenv(%data);
+ my $text="Enter Coordinates";
+ if ($type eq 'polygon') { $text='Create Polygon Data'; }
+ my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
return $result;
}
+
+sub deletecoorddata {
+ &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 <tag> ... </tag>
- $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";
<a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>Select</a>
@@ -795,14 +955,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 <tag> ... </tag>
- $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";
<a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>Search</a>