--- loncom/homework/edit.pm 2004/01/12 19:53:54 1.76
+++ loncom/homework/edit.pm 2005/01/05 21:20:13 1.89
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.76 2004/01/12 19:53:54 albertel Exp $
+# $Id: edit.pm,v 1.89 2005/01/05 21:20:13 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,9 +25,7 @@
#
# http://www.lon-capa.org/
#
-# 3/20 Guy
-# 01/10/02 Matthew
-# 03/06/02 Matthew
+
package Apache::edit;
use strict;
@@ -70,10 +68,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;
@@ -193,7 +190,7 @@ sub get_insert_list {
$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;
}
@@ -284,13 +281,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>';
}
@@ -300,8 +302,7 @@ sub insert_numericalresponse {
<numericalresponse answer="">
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</numericalresponse>';
}
@@ -311,8 +312,7 @@ sub insert_stringresponse {
<stringresponse answer="" type="">
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</stringresponse>';
}
@@ -328,10 +328,11 @@ sub insert_imageresponse {
return '
<imageresponse max="1">
<foilgroup>
+ <foil>
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</imageresponse>';
}
@@ -340,10 +341,12 @@ sub insert_optionresponse {
return '
<optionresponse max="10">
<foilgroup options="">
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</optionresponse>';
}
@@ -353,8 +356,7 @@ sub insert_organicresponse {
<organicresponse>
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</organicresponse>';
}
@@ -369,10 +371,12 @@ sub insert_radiobuttonresponse {
return '
<radiobuttonresponse max="10">
<foilgroup>
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</radiobuttonresponse>';
}
@@ -382,8 +386,7 @@ sub insert_reactionresponse {
<reactionresponse>
<textline />
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</reactionresponse>';
}
@@ -392,10 +395,12 @@ sub insert_rankresponse {
return '
<rankresponse max="10">
<foilgroup options="">
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</rankresponse>';
}
@@ -406,10 +411,12 @@ sub insert_matchresponse {
<foilgroup options="">
<itemgroup>
</itemgroup>
+ <foil>
+ <startouttext /><endouttext />
+ </foil>
</foilgroup>
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>
</matchresponse>';
}
@@ -427,8 +434,7 @@ sub insert_hintpart {
sub insert_hintgroup {
return '
<hintgroup>
- <startouttext/>
- <endouttext />
+ <startouttext /><endouttext />
</hintgroup>';
}
@@ -463,11 +469,11 @@ 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 textarea_sizes {
@@ -486,7 +492,7 @@ sub textarea_sizes {
sub editline {
my ($tag,$data,$description,$size)=@_;
- $data=&HTML::Entities::encode($data);
+ $data=&HTML::Entities::encode($data,'<>&"');
if ($description) { $description="<br />".$description."<br />"; }
my $result = <<"END";
$description
@@ -497,17 +503,29 @@ END
}
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 />"; }
+ if ($usehtmlarea) {
+ push @Apache::lonxml::htmlareafields,'homework_edit_'.
+ $Apache::lonxml::curdepth;
+ }
return $description."\n".' <textarea rows="'.$rows.
'" cols="'.$cols.'" name="homework_edit_'.
+ $Apache::lonxml::curdepth.'" id="homework_edit_'.
$Apache::lonxml::curdepth.'">'.
- &HTML::Entities::encode($data).'</textarea>'."\n";
+ &HTML::Entities::encode($data,'<>&"').'</textarea>'.
+ ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
+ 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
}
sub modifiedfield {
@@ -543,6 +561,9 @@ sub get_new_args {
$token->[2]->{$arg}=$newvalue;
}
$rebuild=1;
+ } elsif (!defined($newvalue) && defined($value)) {
+ delete($token->[2]->{$arg});
+ $rebuild=1;
}
}
return $rebuild;
@@ -605,7 +626,7 @@ sub checked_arg {
&html_element_name($name)."'";
foreach my $selected (split(/,/,$allselected)) {
if ( $selected eq $option ) {
- $result.=" checked='on' ";
+ $result.=" checked='checked' ";
last;
}
}
@@ -640,7 +661,7 @@ sub select_arg {
$value='value="'.$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";
}
@@ -669,14 +690,14 @@ sub select_or_text_arg {
$value='value="'.$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 $element=&html_element_name($name);
@@ -711,11 +732,11 @@ 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=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
@@ -724,66 +745,43 @@ sub entercoords {
$element = &Apache::lonnet::escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
- my $formheight='';
- if ($height) {
- $formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
- }
- my $formwidth='';
- if ($width) {
- $formwidth='&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
- return $result;
-}
-
-# coordinate pair (x1,y1)-(x2,y2)
-sub entercoordpair {
- my ($id,$mode,$width,$height) = @_;
- unless ($Apache::edit::bgimgsrc) { return ''; }
- my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);
- my $form = 'lonhomework';
- my $element;
- if (! defined($mode) || $mode eq 'attribute') {
- $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
- } elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
- $element = &Apache::lonnet::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?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"
-target="imagechoice">Click Coordinate Pair</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 polygon (x1,y1)-(x2,y2)...
-sub entercoordpolygon {
- 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 ''; }
- &Apache::lonnet::logthis($Apache::edit::bgimgsrc);
my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
- &Apache::lonnet::logthis($Apache::edit::bgfile);
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
- $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+ $element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
$element = &Apache::lonnet::escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
my $id=$Apache::lonxml::curdepth;
- my %data=("imagechoice.$id.mode" =>'polygon',
+ my %data=("imagechoice.$id.type" =>$type,
"imagechoice.$id.formname" =>$form,
"imagechoice.$id.file" =>$bgfile,
"imagechoice.$id.formcoord" =>$element);
@@ -796,7 +794,9 @@ sub entercoordpolygon {
$Apache::edit::bgimgsrccurdepth;
}
&Apache::lonnet::appenv(%data);
- my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">Create Polygon Data</a>';
+ 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;
}