--- loncom/homework/imagechoice.pm 2005/08/25 19:33:14 1.9 +++ loncom/homework/imagechoice.pm 2014/02/14 17:01:30 1.18 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.9 2005/08/25 19:33:14 albertel Exp $ +# $Id: imagechoice.pm,v 1.18 2014/02/14 17:01:30 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,10 +26,13 @@ package Apache::imagechoice; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet; +use Apache::lonlocal; +use LONCAPA; + sub deletedata { my ($id)=@_; - &Apache::lonnet::delenv("imagechoice\\.$id\\.coords"); + &Apache::lonnet::delenv('imagechoice.'.$id.'.coords'); } sub closewindow { @@ -37,21 +40,31 @@ sub closewindow { if ($needimage) { $needimage=""; } - $r->print(<<"ENDSUBM"); - - - -

Position Selected

-$display -$needimage - - 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( + $start_page + .'

'.&mt('Position Selected').'

' + .$display + .$needimage + .$end_page); } sub storedata { @@ -75,11 +88,11 @@ sub storedata { my (undef,$x,$y)=split(':',$env{"imagechoice.$id.coords"}); if ($env{"imagechoice.$id.formx"}) { $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formx"}.'.value='.$x.';'; - $display.="

The X coordinate is $x

\n"; + $display.='

'.&mt('The X coordinate is [_1]',$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"; + $display.='

'.&mt('The Y coordinate is [_1]',$y)."

\n"; } } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; @@ -87,11 +100,13 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - $display.="

The selected coordinates are $coordstr

\n"; + $display.='

'.&mt('The selected coordinates are [_1]',"$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"; + $display.='

' + .&mt('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,$display); @@ -99,40 +114,51 @@ sub storedata { sub getcoord { my ($r,$type,$filename,$id)=@_; - my $heading='Select Position on Image'; + my $heading=&mt('Select Position on Image'); my $nextstage=''; if ($type eq 'box') { my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"}); my $step=scalar(@coords)/2; if ($step == 0) { - $heading='Select First Coordinate on Image'; + $heading=&mt('Select First Coordinate on Image.'); #$nextstage=''; } elsif ($step == 1) { - $heading='Select Second Coordinate on Image'; + $heading=&mt('Select Second Coordinate on Image.'); #$nextstage=''; } else { - $heading='Select Finish to store selection.'; - $nextstage=''; + $heading=&mt('Select [_1] to save selection.','"'.&mt('Save').'"'); + $nextstage=''; } } elsif ($type eq 'polygon') { - $heading='Enter Coordinate or click finish to close Polygon'; - $nextstage=''; + $heading=&mt('Click to select a Coordinate or click [_1] to close Polygon.', + '"'.&mt('Save').'"'); + $nextstage=''; } elsif ($type eq 'point') { - $heading='Click to select a Coordinate or click Finish to store current selection.'; - $nextstage=''; + $heading=&mt('Click to select a Coordinate or click [_1] to save current selection.', + '"'.&mt('Save').'"'); + $nextstage=''; } + + my $headline = 'Get Coordinates'; + my $start_page = + &Apache::loncommon::start_page($headline,undef, + {'bgcolor' => '#FFFFFF', + 'only_body' => 1,}); + my $end_page = + &Apache::loncommon::end_page(); + $headline = &mt($headline); + my $canceltext=&mt('Cancel'); $r->print(<<"END"); - - -

$heading

-
+$start_page +

$headline

+

$heading

+ $nextstage - +
- - +$end_page END } @@ -146,7 +172,7 @@ sub savecoord { $data=join(':',($env{"imagechoice.$id.coords"}, $env{"form.image.x"},$env{"form.image.y"})); } - &Apache::lonnet::appenv("imagechoice.$id.coords"=>$data); + &Apache::lonnet::appenv({"imagechoice.$id.coords"=>$data}); } return int(scalar(split(':',$env{"imagechoice.$id.coords"}))/2); } @@ -218,7 +244,7 @@ sub drawimage { &drawX(\%data,$imid,$x,$y); if ($type eq "polygon") { &drawPolygon(\%data,$id,$imid); } if ($type eq "box") { &drawBox(\%data,$id,$imid); } - &Apache::lonnet::appenv(%data); + &Apache::lonnet::appenv(\%data); return "/adm/randomlabel.png?token=$imid" } @@ -228,9 +254,9 @@ 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') { + if ($env{'form.cancel'}) { # eq &mt('Cancel')) { &deletedata($id); &closewindow($r,'',$filename); return OK; @@ -239,7 +265,7 @@ sub handler { if (defined($env{'form.type'})) { $type=$env{'form.type'}; } my $numcoords=&savecoord($id,$type); my $imurl=&drawimage($r,$type,$filename,$id); - if (($env{'form.finish'} eq 'Finish')) { + if ($env{'form.finish'}) { # eq &mt('Save')) { &storedata($r,$type,$imurl,$id); } else { &getcoord($r,$type,$imurl,$id);