--- loncom/homework/imagechoice.pm 2005/04/07 06:56:21 1.8
+++ loncom/homework/imagechoice.pm 2006/04/13 18:49:29 1.10
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.8 2005/04/07 06:56:21 albertel Exp $
+# $Id: imagechoice.pm,v 1.10 2006/04/13 18:49:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,23 +33,35 @@ sub deletedata {
}
sub closewindow {
- my ($r,$output,$filename,$needimage)=@_;
+ my ($r,$output,$filename,$needimage,$display)=@_;
if ($needimage) {
$needimage="";
}
- $r->print(<<"ENDSUBM");
-
-
-
The X coordinate is $x
\n"; } if ($env{"imagechoice.$id.formy"}) { $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';'; + $display.="The Y coordinate is $y
\n"; } } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; @@ -83,11 +98,14 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); + $display.="The selected coordinates are $coordstr
\n"; $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; } - + if ($display) { + $display.="If this window fails to close you may need to manually replace the old coordinates with the above value.
\n"; + } &deletedata($id); - &closewindow($r,$output,$filename,$needimage); + &closewindow($r,$output,$filename,$needimage,$display); } sub getcoord { @@ -114,9 +132,16 @@ sub getcoord { $heading='Click to select a Coordinate or click Finish to store current selection.'; $nextstage=''; } + + my $start_page = + &Apache::loncommon::start_page('Get Coordinates',undef, + {'bgcolor' => '#FFFFFF', + 'only_body' => 1,}); + + my $end_page = + &Apache::loncommon::end_page(); $r->print(<<"END"); - - +$start_page