loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.381 and 1.386

version 1.381, 2007/06/22 00:57:38	version 1.386, 2007/08/03 23:29:57
Line 47 BEGIN {	Line 47 BEGIN {

sub start_web {	sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);	if ($target ne 'edit' && $target ne 'modified') {
if ($target eq 'web' \|\| $target eq 'webgrade') {	my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
return $bodytext;	if ($target eq 'web' \|\| $target eq 'webgrade') {
	return $bodytext;
	}
	} elsif ($target eq "edit" ) {
	my $bodytext =
	&Apache::lonxml::get_all_text_unbalanced("/web",$parser);
	my $result = &Apache::edit::tag_start($target,$token);
	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
	return $result;
	} elsif ( $target eq "modified" ) {
	return $token->[4].&Apache::edit::modifiedfield("/web",$parser);
}	}
return '';	return '';
}	}
Line 61 sub end_web {	Line 71 sub end_web {
sub start_tex {	sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);	if ($target ne 'edit' && $target ne 'modified') {
if ($target eq 'tex') {	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
return $bodytext.' ';	if ($target eq 'tex') {
	return $bodytext.' ';
	}
	} elsif ($target eq "edit" ) {
	my $bodytext =
	&Apache::lonxml::get_all_text_unbalanced("/tex",$parser);
	my $result = &Apache::edit::tag_start($target,$token);
	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
	return $result;
	} elsif ( $target eq "modified" ) {
	return $token->[4].&Apache::edit::modifiedfield("/tex",$parser);
}	}
return $result;;	return $result;;
}	}
Line 105 function setSubmittedPart (part) {	Line 125 function setSubmittedPart (part) {

$extra_head .= &Apache::londefdef::generate_css_links();	$extra_head .= &Apache::londefdef::generate_css_links();

if ($target eq 'edit') {	if ($env{'request.state'} eq 'construct') {
$extra_head.=&Apache::edit::js_change_detection().	$extra_head.=&Apache::edit::js_change_detection().
"<script type=\"text/javascript\">\n".	"<script type=\"text/javascript\">\n".
"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".	"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
Line 289 sub problem_web_to_edit_header {	Line 309 sub problem_web_to_edit_header {
<input type="text" name="rndseed" size="10" value="'.	<input type="text" name="rndseed" size="10" value="'.
$rndseed.'"	$rndseed.'"
onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>	onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
<label><input type="checkbox" name="showallfoils" ';	<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
my $show_all_foils_text =	my $show_all_foils_text =
($Apache::lonhomework::parsing_a_task) ?	($Apache::lonhomework::parsing_a_task) ?
&mt(' Show All Instances')	&mt(' Show All Instances')
: &mt(' Show All Foils');	: &mt(' Show All Foils');

if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }	if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
$result.= ' />'.$show_all_foils_text.'</label>'.	$result.= ' />'.$show_all_foils_text.'</label></span>'.
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
'<hr />';	'<hr />';
	$result.=&mt('Apply style file: ').'
	<input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
	<a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
	<input type="submit" name="clear_style_file" value="'.&mt('Clear').'" />
	<br />';

if (!$Apache::lonhomework::parsing_a_task) {	if (!$Apache::lonhomework::parsing_a_task) {
$result.="	$result.="
<nobr>	<nobr>
Line 937 sub end_problem {	Line 963 sub end_problem {
if (not $env{'request.symb'} =~ m/\.page_/) {	if (not $env{'request.symb'} =~ m/\.page_/) {
$result .= $endminipage.'\end{document} ';	$result .= $endminipage.'\end{document} ';
} else {	} else {
$result .= '';	$result .= $endminipage;
}	}
}	}
}	}
Line 1055 sub start_block {	Line 1081 sub start_block {
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|
$target eq 'tex' \|\| $target eq 'analyze' \|\| $target eq 'webgrade') {	$target eq 'tex' \|\| $target eq 'analyze' \|\| $target eq 'webgrade') {
my $code = $token->[2]->{'condition'};	my $code = $token->[2]->{'condition'};
if (defined($code)) {	if (defined($code) && $code ne '') {
if (!$Apache::lonxml::default_homework_loaded) {	if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);	&Apache::lonxml::default_homework_load($safeeval);
}	}
Line 1349 sub start_part {	Line 1375 sub start_part {
# duedates.	# duedates.
}	}
my $result='';	my $result='';
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);	my $id= &Apache::lonxml::get_id($parstack,$safeeval);
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;	$Apache::inputtags::part=$id;
push(@Apache::inputtags::partlist,$id);	push(@Apache::inputtags::partlist,$id);
@Apache::inputtags::response=();	@Apache::inputtags::response=();

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

Removed from v.1.381
changed lines
	Added in v.1.386