loncom/homework/edit.pm - diff

Return to edit.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/edit.pm between versions 1.85 and 1.108

version 1.85, 2004/07/27 23:35:33	version 1.108, 2007/06/19 20:24:42
Line 29	Line 29
package Apache::edit;	package Apache::edit;

use strict;	use strict;
use Apache::lonnet();	use Apache::lonnet;
use HTML::Entities();	use HTML::Entities();
use Apache::lonlocal;	use Apache::lonlocal;
	use lib '/home/httpd/lib/perl/';
	use LONCAPA;


# Global Vars	# Global Vars
# default list of colors to use in editing	# default list of colors to use in editing
Line 68 sub tag_start {	Line 71 sub tag_start {
# "</tr><tr><td colspan=\"3\">\n";	# "</tr><tr><td colspan=\"3\">\n";
my @help = Apache::lonxml::helpinfo($token);	my @help = Apache::lonxml::helpinfo($token);
if ($help[0]) {	if ($help[0]) {
$result .= '<td align="right" valign="top">' .	$result .= '</td><td align="right" valign="top">' .
Apache::loncommon::help_open_topic(@help) .	Apache::loncommon::help_open_topic(@help);
'</td>';	} else { $result .= "</td><td> "; }
} else { $result .= "<td> </td>"; }
$result .= &end_row().&start_spanning_row();	$result .= &end_row().&start_spanning_row();
}	}
return $result;	return $result;
Line 88 sub tag_end {	Line 90 sub tag_end {

sub start_table {	sub start_table {
my ($token)=@_;	my ($token)=@_;
my $tag = $token->[1];	my $tag = &Apache::lonxml::get_tag($token);
my $tagnum;
foreach my $namespace (reverse @Apache::lonxml::namespace) {	my $color = $Apache::lonxml::insertlist{"$tag.color"};
my $testtag=$namespace.'::'.$tag;	&Apache::lonxml::debug(" $tag -- $color");
$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"};
if (!defined($color)) {	if (!defined($color)) {
$color = $Apache::edit::colorlist[$Apache::edit::colordepth];	$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
}	}
Line 110 sub start_table {	Line 107 sub start_table {
sub end_table {	sub end_table {
$Apache::edit::colordepth--;	$Apache::edit::colordepth--;
my $result='</table></div>';	my $result='</table></div>';
$result.="<table><tr><td>";	$result.='<div align="left"><table><tr><td>';

my ($tagname,$closingtag);	my ($tagname,$closingtag);
if (defined($Apache::edit::inserttag[-2])) {	if (defined($Apache::edit::inserttag[-2])) {
$tagname=$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])) {	if (defined($Apache::edit::inserttag[-1])) {
$closingtag=$Apache::edit::inserttag[-1];	$closingtag=$Apache::edit::inserttag[-1];
}	}
$result.=&innerinsertlist('edit',$tagname,$closingtag).	$result.=&innerinsertlist('edit',$tagname,$closingtag).
"</td></tr></table>";	"</td></tr></table></div>";
pop(@Apache::edit::inserttag);	my $last = pop(@Apache::edit::inserttag);
return $result;	return $result;
}	}

Line 148 sub deletelist {	Line 151 sub deletelist {
}	}

sub handle_delete {	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 ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result=0;	my $result=0;
if ($space) {	if ($space) {
Line 162 sub handle_delete {	Line 165 sub handle_delete {
}	}
if (!$result) {	if (!$result) {
my $endtag='/'.$token->[1];	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();	$$parser['-1']->get_token();
&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");	&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
&Apache::lonxml::end_tag($tagstack,$parstack,$token);	&Apache::lonxml::end_tag($tagstack,$parstack,$token);
Line 173 sub handle_delete {	Line 176 sub handle_delete {
sub get_insert_list {	sub get_insert_list {
my ($tagname) = @_;	my ($tagname) = @_;
my $result='';	my $result='';
my @tagnums= ();	my @tags= ();
#&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));	#&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
if ($Apache::lonxml::insertlist{"$tagname.which"}) {	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) {	foreach my $namespace (@Apache::lonxml::namespace) {
if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {	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;	my %options;
foreach my $tagnum (@tagnums) {	foreach my $tag (@tags) {
my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"};	my $descrip=$Apache::lonxml::insertlist{"$tag.description"};
	my $tagnum =$Apache::lonxml::insertlist{"$tag.num"};
$options{$descrip} ="<option value=\"$tagnum\">".	$options{$descrip} ="<option value=\"$tagnum\">".
$descrip."</option>\n";	$descrip."</option>\n";
}	}
foreach my $option (sort(keys(%options))) {$result.=$options{$option};}	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;	return $result;
}	}
Line 223 sub innerinsertlist {	Line 227 sub innerinsertlist {
}	}

sub handle_insert {	sub handle_insert {
if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }	if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
my $result;	my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"};
my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};	return &do_insert($tagnum);
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;
}	}

sub handle_insertafter {	sub handle_insertafter {
my $tagname=shift;	my $tagname=shift;
if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')	if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') {
{ return ''; }	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 $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') {	if ($func eq 'default') {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
my $namespace;	my $namespace;
if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }	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 {	} else {
if (defined(&$func)) {	if (defined(&$func)) {
{	{
Line 265 sub handle_insertafter {	Line 261 sub handle_insertafter {
$result.=&$func();	$result.=&$func();
}	}
} else {	} else {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};	&Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined. ($tagnum)");
&Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");
}	}
}	}
return $result;	return $result;
Line 282 sub insert_responseparam {	Line 277 sub insert_responseparam {
<responseparam />';	<responseparam />';
}	}

	sub insert_parameter {
	return '
	<parameter />';
	}

sub insert_formularesponse {	sub insert_formularesponse {
return '	return '
<formularesponse answer="" samples="">	<formularesponse answer="" samples="">
<textline />	<responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol" />
	<textline size="25"/>
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
</hintgroup>	</hintgroup>
Line 295 sub insert_formularesponse {	Line 296 sub insert_formularesponse {
sub insert_numericalresponse {	sub insert_numericalresponse {
return '	return '
<numericalresponse answer="">	<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 />	<textline />
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
Line 302 sub insert_numericalresponse {	Line 305 sub insert_numericalresponse {
</numericalresponse>';	</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 {	sub insert_stringresponse {
return '	return '
<stringresponse answer="" type="">	<stringresponse answer="" type="">
Line 323 sub insert_imageresponse {	Line 395 sub insert_imageresponse {
return '	return '
<imageresponse max="1">	<imageresponse max="1">
<foilgroup>	<foilgroup>
	<foil>
	</foil>
</foilgroup>	</foilgroup>
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
Line 334 sub insert_optionresponse {	Line 408 sub insert_optionresponse {
return '	return '
<optionresponse max="10">	<optionresponse max="10">
<foilgroup options="">	<foilgroup options="">
	<foil>
	<startouttext /><endouttext />
	</foil>
</foilgroup>	</foilgroup>
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
Line 361 sub insert_radiobuttonresponse {	Line 438 sub insert_radiobuttonresponse {
return '	return '
<radiobuttonresponse max="10">	<radiobuttonresponse max="10">
<foilgroup>	<foilgroup>
	<foil>
	<startouttext /><endouttext />
	</foil>
</foilgroup>	</foilgroup>
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
Line 382 sub insert_rankresponse {	Line 462 sub insert_rankresponse {
return '	return '
<rankresponse max="10">	<rankresponse max="10">
<foilgroup options="">	<foilgroup options="">
	<foil>
	<startouttext /><endouttext />
	</foil>
</foilgroup>	</foilgroup>
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
Line 395 sub insert_matchresponse {	Line 478 sub insert_matchresponse {
<foilgroup options="">	<foilgroup options="">
<itemgroup>	<itemgroup>
</itemgroup>	</itemgroup>
	<foil>
	<startouttext /><endouttext />
	</foil>
</foilgroup>	</foilgroup>
<hintgroup>	<hintgroup>
<startouttext /><endouttext />	<startouttext /><endouttext />
Line 407 sub insert_displaytitle { return '<dis	Line 493 sub insert_displaytitle { return '<dis
sub insert_hintpart {	sub insert_hintpart {
return '	return '
<hintpart on="default">	<hintpart on="default">
<startouttext/>	<startouttext/><endouttext />
<endouttext />
</hintpart>';	</hintpart>';
}	}

Line 457 sub insert_script {	Line 542 sub insert_script {
return "\n<script type=\"loncapa/perl\"></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 {
	return ' onclick="still_ask=true;" ';
	}

sub textarea_sizes {	sub textarea_sizes {
my ($data)=@_;	my ($data)=@_;
my $count=0;	my $count=0;
Line 475 sub editline {	Line 598 sub editline {
my ($tag,$data,$description,$size)=@_;	my ($tag,$data,$description,$size)=@_;
$data=&HTML::Entities::encode($data,'<>&"');	$data=&HTML::Entities::encode($data,'<>&"');
if ($description) { $description="<br />".$description."<br />"; }	if ($description) { $description="<br />".$description."<br />"; }
	my $change_code = &element_change_detection();
my $result = <<"END";	my $result = <<"END";
$description	$description
<input type="text" name="homework_edit_$Apache::lonxml::curdepth"	<input type="text" name="homework_edit_$Apache::lonxml::curdepth"
value="$data" size="$size" />	value="$data" size="$size" $change_code />
END	END
return $result;	return $result;
}	}
Line 497 sub editfield {	Line 621 sub editfield {
if ($rows < $minheight) { $rows = $minheight; }	if ($rows < $minheight) { $rows = $minheight; }
if ($description) { $description="<br />".$description."<br />"; }	if ($description) { $description="<br />".$description."<br />"; }
if ($usehtmlarea) {	if ($usehtmlarea) {
push @Apache::lonxml::htmlareafields,'homework_edit_'.	&Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'.
$Apache::lonxml::curdepth;	$Apache::lonxml::curdepth);
}	}
return $description."\n".'   <textarea rows="'.$rows.	# 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_'.	'" cols="'.$cols.'" name="homework_edit_'.
$Apache::lonxml::curdepth.'" id="homework_edit_'.	$Apache::lonxml::curdepth.'" id="homework_edit_'.
$Apache::lonxml::curdepth.'">'.	$Apache::lonxml::curdepth.'" '.&element_change_detection().'>'.
&HTML::Entities::encode($data,'<>&"').'</textarea>'.	&HTML::Entities::encode($data,'<>&"').'</textarea>'.
($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',	($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";	'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
Line 512 sub editfield {	Line 640 sub editfield {
sub modifiedfield {	sub modifiedfield {
my ($endtag,$parser) = @_;	my ($endtag,$parser) = @_;
my $result;	my $result;
# foreach my $envkey (sort keys %ENV) {	$result=$env{"form.homework_edit_$Apache::lonxml::curdepth"};
# &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"};
my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);	my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
# textareas throw away intial \n	# 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;	return $result;
}	}

Line 533 sub get_new_args {	Line 663 sub get_new_args {
#just want the string that it was set to	#just want the string that it was set to
my $value=$token->[2]->{$arg};	my $value=$token->[2]->{$arg};
my $element=&html_element_name($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:");	&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:");
if (defined($newvalue) && $value ne $newvalue) {	if (defined($newvalue) && $value ne $newvalue) {
if (ref($newvalue) eq 'ARRAY') {	if (ref($newvalue) eq 'ARRAY') {
Line 603 sub checked_arg {	Line 733 sub checked_arg {
$text=$option;	$text=$option;
$value='value="'.$option.'"';	$value='value="'.$option.'"';
}	}
$result.="<nobr><input type='checkbox' $value name='".	$result.="<nobr><label><input type='checkbox' $value name='".
&html_element_name($name)."'";	&html_element_name($name)."'";
foreach my $selected (split(/,/,$allselected)) {	foreach my $selected (split(/,/,$allselected)) {
if ( $selected eq $option ) {	if ( $selected eq $option ) {
$result.=" checked='on' ";	$result.=" checked='checked' ";
last;	last;
}	}
}	}
$result.=" />$text</nobr>\n";	$result.=&element_change_detection()." />$text</label></nobr>\n";
}	}
return $result;	return $result;
}	}
Line 622 sub text_arg {	Line 752 sub text_arg {
if (!defined $size) { $size=20; }	if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};	my $arg=$token->[2]{$name};
$result=&mt($description).' <input name="'.&html_element_name($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>';	return '<nobr>'.$result.'</nobr>';
}	}

Line 634 sub select_arg {	Line 765 sub select_arg {
foreach my $option (@$list) {	foreach my $option (@$list) {
my ($text,$value);	my ($text,$value);
if ( ref($option) eq 'ARRAY') {	if ( ref($option) eq 'ARRAY') {
$value='value="'.$$option[0].'"';	$value='value="'.&HTML::Entities::encode($$option[0]).'"';
$text=$$option[1];	$text=$$option[1];
$option=$$option[0];	$option=$$option[0];
} else {	} else {
$text=$option;	$text=$option;
$value='value="'.$option.'"';	$value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
}	}
if ( $selected eq $option ) {	if ( $selected eq $option ) {
$optionlist.="<option $value selected=\"on\">$text</option>\n";	$optionlist.="<option $value selected=\"selected\">$text</option>\n";
} else {	} else {
$optionlist.="<option $value >$text</option>\n";	$optionlist.="<option $value >$text</option>\n";
}	}
}	}
$result.='<nobr>'.$description.' <select name="'.	$result.='<nobr>'.$description.' <select name="'.
&html_element_name($name).'">	&html_element_name($name).'" '.&element_change_detection().' >
'.$optionlist.'	'.$optionlist.'
</select></nobr>';	</select></nobr>';
return $result;	return $result;
Line 663 sub select_or_text_arg {	Line 794 sub select_or_text_arg {
foreach my $option (@$list) {	foreach my $option (@$list) {
my ($text,$value);	my ($text,$value);
if ( ref($option) eq 'ARRAY') {	if ( ref($option) eq 'ARRAY') {
$value='value="'.$$option[0].'"';	$value='value="'.&HTML::Entities::encode($$option[0]).'"';
$text=$$option[1];	$text=$$option[1];
$option=$$option[0];	$option=$$option[0];
} else {	} else {
$text=$option;	$text=$option;
$value='value="'.$option.'"';	$value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
}	}
if ( $selected eq $option ) {	if ( $selected eq $option ) {
$optionlist.="<option $value selected=\"on\">$text</option>\n";	$optionlist.="<option $value selected=\"selected\">$text</option>\n";
$found=1;	$found=1;
} else {	} else {
$optionlist.="<option $value>$text</option>\n";	$optionlist.="<option $value>$text</option>\n";
}	}
}	}
$optionlist.="<option value=\"TYPEDINVALUE\"".	$optionlist.="<option value=\"TYPEDINVALUE\"".
((!$found)?' selected="on"':'').	((!$found)?' selected="selected"':'').
">".&mt('Type-in value')."</option>\n";	">".&mt('Type-in value')."</option>\n";
#	#
	my $change_code=&element_change_detection();
my $element=&html_element_name($name);	my $element=&html_element_name($name);
my $selectelement='select_list_'.$element;	my $selectelement='select_list_'.$element;
my $typeinelement='type_in_'.$element;	my $typeinelement='type_in_'.$element;
Line 705 $optionlist	Line 837 $optionlist
value="$typeinvalue"	value="$typeinvalue"
onChange="$hiddenvalue=$typedinvalue;"	onChange="$hiddenvalue=$typedinvalue;"
onFocus="$selectedindex=$selecttypeinindex-1;" />	onFocus="$selectedindex=$selecttypeinindex-1;" />
<input type="hidden" name="$element" value="$selected" />	<input type="hidden" name="$element" value="$selected" $change_code />
</nobr>	</nobr>
ENDSELECTORTYPE	ENDSELECTORTYPE
}	}
Line 717 sub entercoords {	Line 849 sub entercoords {
unless ($Apache::edit::bgimgsrc) { return ''; }	unless ($Apache::edit::bgimgsrc) { return ''; }
if ($idx) { $idx.='_'; }	if ($idx) { $idx.='_'; }
if ($idy) { $idy.='_'; }	if ($idy) { $idy.='_'; }
my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));	my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
my $form = 'lonhomework';	my $form = 'lonhomework';
my $element;	my $element;
if (! defined($mode) \|\| $mode eq 'attribute') {	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>	} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
$element = &Apache::lonnet::escape('homework_edit_'.	$element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);	$Apache::lonxml::curdepth);
}	}
my $id=$Apache::lonxml::curdepth;	my $id=$Apache::lonxml::curdepth;
Line 752 sub entercoords {	Line 884 sub entercoords {
sub entercoord {	sub entercoord {
my ($idx,$mode,$width,$height,$type) = @_;	my ($idx,$mode,$width,$height,$type) = @_;
unless ($Apache::edit::bgimgsrc) { return ''; }	unless ($Apache::edit::bgimgsrc) { return ''; }
my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));	my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
my $form = 'lonhomework';	my $form = 'lonhomework';
my $element;	my $element;
if (! defined($mode) \|\| $mode eq 'attribute') {	if (! defined($mode) \|\| $mode eq 'attribute') {
$element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");	$element = &escape("$idx\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>	} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
$element = &Apache::lonnet::escape('homework_edit_'.	$element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);	$Apache::lonxml::curdepth);
}	}
my $id=$Apache::lonxml::curdepth;	my $id=$Apache::lonxml::curdepth;
Line 788 sub deletecoorddata {	Line 920 sub deletecoorddata {
#----------------------------------------------------- browse	#----------------------------------------------------- browse
sub browse {	sub browse {
# insert a link to call up the filesystem browser (lonindexer)	# insert a link to call up the filesystem browser (lonindexer)
my ($id, $mode, $titleid) = @_;	my ($id, $mode, $titleid, $only) = @_;
my $form = 'lonhomework';	my $form = 'lonhomework';
my $element;	my $element;
if (! defined($mode) \|\| $mode eq 'attribute') {	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>	} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
$element = &Apache::lonnet::escape('homework_edit_'.	$element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);	$Apache::lonxml::curdepth);
}	}
my $titleelement;	my $titleelement;
if ($titleid) {	if ($titleid) {
$titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";	$titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
	} else {
	$titleelement=",'$only'";
}	}
my $result = <<"ENDBUTTON";	my $result = <<"ENDBUTTON";
<a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>Select</a>	<a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>Select</a>
Line 814 sub search {	Line 948 sub search {
my $form = 'lonhomework';	my $form = 'lonhomework';
my $element;	my $element;
if (! defined($mode) \|\| $mode eq 'attribute') {	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>	} elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
$element = &Apache::lonnet::escape('homework_edit_'.	$element = &escape('homework_edit_'.
$Apache::lonxml::curdepth);	$Apache::lonxml::curdepth);
}	}
my $titleelement;	my $titleelement;
if ($titleid) {	if ($titleid) {
$titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";	$titleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
}	}
my $result = <<"ENDBUTTON";	my $result = <<"ENDBUTTON";
<a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>Search</a>	<a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>Search</a>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.85
changed lines
	Added in v.1.108