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.369 and 1.372

version 1.369, 2006/11/20 11:52:10	version 1.372, 2006/12/11 01:07:07
Line 293 sub problem_web_to_edit_header {	Line 293 sub problem_web_to_edit_header {
: &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.	$result.= ' />'.$show_all_foils_text.'</label>'.
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
'</label><hr />';	'<hr />';
if (!$Apache::lonhomework::parsing_a_task) {	if (!$Apache::lonhomework::parsing_a_task) {
$result.="	$result.="
<nobr>	<nobr>
Line 963 sub end_problem {	Line 963 sub end_problem {
sub start_library {	sub start_library {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my ($result,$form_tag_start);	my ($result,$form_tag_start);
if ($$tagstack[0] eq 'library') {	if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') {
&init_problem_globals('library');	&init_problem_globals('library');
$Apache::lonhomework::type='problem';	$Apache::lonhomework::type='problem';
}	}
Line 978 sub start_library {	Line 978 sub start_library {
$result=$token->[4];	$result=$token->[4];
$result.=&Apache::edit::handle_insert();	$result.=&Apache::edit::handle_insert();
} elsif (($target eq 'web' \|\| $target eq 'webgrade')	} elsif (($target eq 'web' \|\| $target eq 'webgrade')
&& $$tagstack[0] eq 'library'	&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
&& $env{'request.state'} eq "construct" ) {	&& $env{'request.state'} eq "construct" ) {
my $name=&get_resource_name($parstack,$safeeval);	my $name=&get_resource_name($parstack,$safeeval);
($result,$form_tag_start)=	($result,$form_tag_start)=
Line 997 sub end_library {	Line 997 sub end_library {
my $result='';	my $result='';
if ($target eq 'edit') {	if ($target eq 'edit') {
$result=&problem_edit_footer();	$result=&problem_edit_footer();
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&	} elsif ($target eq 'web'
$env{'request.state'} eq "construct") {	&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
	&& $env{'request.state'} eq "construct") {
$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
}	}
if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };	if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
	&reset_problem_globals('library');
	}
return $result;	return $result;
}	}

Line 1490 sub end_preduedate {	Line 1493 sub end_preduedate {
# tags if the conditions are not right to display it.	# tags if the conditions are not right to display it.
sub start_postanswerdate {	sub start_postanswerdate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) \|\|
	&Apache::lonnet::allowed('pav',
	$env{'request.course.id'}.'/'.$env{'request.course.sec'});
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'webgrade' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'webgrade' \|\|
$target eq 'tex') {	$target eq 'tex' ) {
if ($Apache::lonhomework::scantronmode \|\|	if ($Apache::lonhomework::scantronmode \|\|
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {	$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' \|\|
	(($target eq 'tex') && !$pav)) {
&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);	&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
}	}
}	}

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

Removed from v.1.369
changed lines
	Added in v.1.372