--- loncom/homework/imagechoice.pm 2005/08/25 19:33:14 1.9
+++ loncom/homework/imagechoice.pm 2007/05/02 01:33:02 1.13
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.9 2005/08/25 19:33:14 albertel Exp $
+# $Id: imagechoice.pm,v 1.13 2007/05/02 01:33:02 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,6 +26,8 @@ package Apache::imagechoice;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
+use LONCAPA;
+
sub deletedata {
my ($id)=@_;
@@ -37,20 +39,31 @@ sub closewindow {
if ($needimage) {
$needimage="";
}
- $r->print(<<"ENDSUBM");
-
-
-
+ENDSUBM
+
+ my $start_page =
+ &Apache::loncommon::start_page('Close Window',$js,
+ {'bgcolor' => '#FFFFFF',
+ 'only_body' => 1,
+ 'add_entries' => {
+ onload => 'submitthis();'},});
+
+ my $end_page =
+ &Apache::loncommon::end_page();
+
+ $r->print(<<"ENDSUBM");
+$start_page
Position Selected
$display
$needimage
-
-
+$end_page
ENDSUBM
}
@@ -111,19 +124,26 @@ sub getcoord {
$heading='Select Second Coordinate on Image';
#$nextstage='';
} else {
- $heading='Select Finish to store selection.';
+ $heading='Select Finish to save selection.';
$nextstage='';
}
} elsif ($type eq 'polygon') {
$heading='Enter Coordinate or click finish to close Polygon';
$nextstage='';
} elsif ($type eq 'point') {
- $heading='Click to select a Coordinate or click Finish to store current selection.';
+ $heading='Click to select a Coordinate or click Finish to save 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
$heading
-
-
+$end_page
END
}
@@ -228,7 +247,7 @@ sub handler {
$r->send_http_header;
my %data;
my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
- my $filename = &Apache::lonnet::unescape($env{"imagechoice.$id.file"});
+ my $filename = &unescape($env{"imagechoice.$id.file"});
my $formname = $env{"imagechoice.$id.formname"};
if ($env{'form.cancel'} eq 'Cancel') {
&deletedata($id);