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.67 and 1.74

version 1.67, 2003/10/08 16:46:38	version 1.74, 2003/12/18 19:59:24
Line 33 package Apache::edit;	Line 33 package Apache::edit;
use strict;	use strict;
use Apache::lonnet();	use Apache::lonnet();
use HTML::Entities();	use HTML::Entities();
	use Apache::lonlocal;

# Global Vars	# Global Vars
# default list of colors to use in editing	# default list of colors to use in editing
Line 273 sub handle_insertafter {	Line 274 sub handle_insertafter {
return $result;	return $result;
}	}

	sub insert_img {
	return '
	<img />';
	}

sub insert_responseparam {	sub insert_responseparam {
return '	return '
<responseparam />';	<responseparam />';
Line 342 sub insert_optionresponse {	Line 348 sub insert_optionresponse {
</optionresponse>';	</optionresponse>';
}	}

	sub insert_organicresponse {
	return '
	<organicresponse>
	<textline />
	<hintgroup>
	<startouttext/>
	<endouttext />
	</hintgroup>
	</organicresponse>';
	}

	sub insert_organicstructure {
	return '
	<organicstructure />
	';
	}

sub insert_radiobuttonresponse {	sub insert_radiobuttonresponse {
return '	return '
<radiobuttonresponse max="10">	<radiobuttonresponse max="10">
Line 354 sub insert_radiobuttonresponse {	Line 377 sub insert_radiobuttonresponse {
</radiobuttonresponse>';	</radiobuttonresponse>';
}	}

	sub insert_reactionresponse {
	return '
	<reactionresponse>
	<textline />
	<hintgroup>
	<startouttext/>
	<endouttext />
	</hintgroup>
	</reactionresponse>';
	}

sub insert_rankresponse {	sub insert_rankresponse {
return '	return '
<rankresponse max="10">	<rankresponse max="10">
Line 477 sub editfield {	Line 511 sub editfield {
}	}

sub modifiedfield {	sub modifiedfield {
my ($token) = @_;	my ($endtag,$parser) = @_;
my $result;	my $result;
# foreach my $envkey (sort keys %ENV) {	# foreach my $envkey (sort keys %ENV) {
# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");	# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
Line 485 sub modifiedfield {	Line 519 sub modifiedfield {
# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");	# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
# &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});	# &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
$result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};	$result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
	my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
	# textareas throw away intial \n
	if ($bodytext=~/^\n/) { $result="\n".$result; }
return $result;	return $result;
}	}

Line 553 sub checked_arg {	Line 590 sub checked_arg {
my $result;	my $result;
my $optionlist="";	my $optionlist="";
my $allselected=$token->[2]{$name};	my $allselected=$token->[2]{$name};
$result=$description;	$result=&mt($description);
foreach my $option (@$list) {	foreach my $option (@$list) {
my ($value,$text);	my ($value,$text);
if ( ref($option) eq 'ARRAY') {	if ( ref($option) eq 'ARRAY') {
Line 582 sub text_arg {	Line 619 sub text_arg {
my $result;	my $result;
if (!defined $size) { $size=20; }	if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};	my $arg=$token->[2]{$name};
$result=$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.'" />';
return '<nobr>'.$result.'</nobr>';	return '<nobr>'.$result.'</nobr>';
}	}
Line 640 sub select_or_text_arg {	Line 677 sub select_or_text_arg {
}	}
$optionlist.="<option value=\"TYPEDINVALUE\"".	$optionlist.="<option value=\"TYPEDINVALUE\"".
((!$found)?' selected="on"':'').	((!$found)?' selected="on"':'').
">Type in value</option>\n";	">".&mt('Type-in value')."</option>\n";
#	#
my $element=&html_element_name($name);	my $element=&html_element_name($name);
my $selectelement='select_list_'.$element;	my $selectelement='select_list_'.$element;
Line 653 sub select_or_text_arg {	Line 690 sub select_or_text_arg {
'.options['.$selectedindex.'].value';	'.options['.$selectedindex.'].value';
my $typedinvalue='this.form.'.$typeinelement.'.value';	my $typedinvalue='this.form.'.$typeinelement.'.value';
my $selecttypeinindex='this.form.'.$selectelement.'.options.length';	my $selecttypeinindex='this.form.'.$selectelement.'.options.length';
	$description=&mt($description);
#	#
return (<<ENDSELECTORTYPE);	return (<<ENDSELECTORTYPE);
<nobr>	<nobr>
$description	$description
<select name="$selectelement"	<select name="$selectelement"
onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }"	onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
$optionlist	$optionlist
</select>	</select>
<input type="text" size="$size" name="$typeinelement"	<input type="text" size="$size" name="$typeinelement"
Line 731 ENDBUTTON	Line 769 ENDBUTTON
#----------------------------------------------------- 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) = @_;	my ($id, $mode, $titleid) = @_;
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 = &Apache::lonnet::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 = &Apache::lonnet::escape('homework_edit_'.
$Apache::lonxml::curdepth);	$Apache::lonxml::curdepth);
	}
	my $titleelement;
	if ($titleid) {
	$titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
}	}
my $result = <<"ENDBUTTON";	my $result = <<"ENDBUTTON";
<a href=\"javascript:openbrowser('$form','$element')\"\>Select</a>	<a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>Select</a>
ENDBUTTON	ENDBUTTON
return $result;	return $result;
}	}
Line 749 ENDBUTTON	Line 791 ENDBUTTON
#----------------------------------------------------- browse	#----------------------------------------------------- browse
sub search {	sub search {
# insert a link to call up the filesystem browser (lonindexer)	# insert a link to call up the filesystem browser (lonindexer)
my ($id, $mode) = @_;	my ($id, $mode, $titleid) = @_;
my $form = 'lonhomework';	my $form = 'lonhomework';
my $element;	my $element;
if (! defined($mode) \|\| $mode eq 'attribute') {	if (! defined($mode) \|\| $mode eq 'attribute') {
Line 758 sub search {	Line 800 sub search {
$element = &Apache::lonnet::escape('homework_edit_'.	$element = &Apache::lonnet::escape('homework_edit_'.
$Apache::lonxml::curdepth);	$Apache::lonxml::curdepth);
}	}
	my $titleelement;
	if ($titleid) {
	$titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
	}
my $result = <<"ENDBUTTON";	my $result = <<"ENDBUTTON";
<a href=\"javascript:opensearcher('$form','$element')\"\>Search</a>	<a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>Search</a>
ENDBUTTON	ENDBUTTON
return $result;	return $result;
}	}

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

Removed from v.1.67
changed lines
	Added in v.1.74