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.461 and 1.464

version 1.461, 2009/12/06 21:18:24	version 1.464, 2010/02/10 20:17:44
Line 254 sub page_start {	Line 254 sub page_start {
my $page_start = &Apache::loncommon::start_page($name,$extra_head,	my $page_start = &Apache::loncommon::start_page($name,$extra_head,
\%body_args);	\%body_args);
$page_start .= $pageheader;	$page_start .= $pageheader;
	if (!defined($found{'body'})
unless ($env{'request.gcicontext'} eq 'buildtest') {	&& $env{'request.state'} ne 'construct'
if (!defined($found{'body'})	&& ($target eq 'web' \|\| $target eq 'webgrade')) {
&& $env{'request.state'} ne 'construct'
&& ($target eq 'web' \|\| $target eq 'webgrade')) {	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
	if ($symb eq '' && !$publicuser) {
my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();	$page_start .= '<p class="LC_info">'
if ($symb eq '' && !$publicuser) {	.&mt('Browsing resource, all submissions are temporary.')
$page_start .= '<p class="LC_info">'	.'</p>';
.&mt('Browsing resource, all submissions are temporary.')
.'</p>';
}
}	}
}	}

Line 278 sub page_start {	Line 275 sub page_start {
$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
my $uri = Apache::loncommon::inhibit_menu_check(	my $uri = Apache::loncommon::inhibit_menu_check(
&Apache::lonenc::check_encrypt($env{'request.uri'}));	&Apache::lonenc::check_encrypt($env{'request.uri'}));
	$uri = &HTML::Entities::encode($uri,'<>&"');
$form_tag_start.=$uri.'" ';	$form_tag_start.=$uri.'" ';
if ($target eq 'edit') {	if ($target eq 'edit') {
$form_tag_start.=&Apache::edit::form_change_detection();	$form_tag_start.=&Apache::edit::form_change_detection();
Line 917 sub start_problem {	Line 915 sub start_problem {
if ($env{'request.state'} ne "construct" &&	if ($env{'request.state'} ne "construct" &&
($symb eq '' \|\| $Apache::lonhomework::type eq 'practice')) {	($symb eq '' \|\| $Apache::lonhomework::type eq 'practice')) {
$form_tag_start.='<input type="hidden" name="rndseed" value="'.	$form_tag_start.='<input type="hidden" name="rndseed" value="'.
$rndseed.'" />';	$rndseed.'" />'.
unless ($env{'request.gcicontext'} eq 'buildtest') {	'<input type="submit" name="resetdata"
$form_tag_start .= '<input type="submit" name="resetdata"'.	value="'.&mt('New Problem Variation').'" />';
' value="'.&mt('New Problem Variation').'" />';
}
if (exists($env{'form.username'})) {	if (exists($env{'form.username'})) {
$form_tag_start.=	$form_tag_start.=
'<input type="hidden" name="username"	'<input type="hidden" name="username"
value="'.$env{'form.username'}.'" />';	value="'.$env{'form.username'}.'" />';
}	}
unless ($env{'request.gcicontext'} eq 'buildtest') {	if ($env{'request.role.adv'}) {
if ($env{'request.role.adv'}) {	$form_tag_start.= ' <label class="LC_nobreak">'
$form_tag_start.= ' <label class="LC_nobreak">'	.'<input type="checkbox" name="showallfoils"';
.'<input type="checkbox" name="showallfoils"';	if (defined($env{'form.showallfoils'})) {
if (defined($env{'form.showallfoils'})) {	$form_tag_start.=' checked="checked"';
$form_tag_start.=' checked="checked"';	}
}	$form_tag_start.= ' /> '
$form_tag_start.= ' /> '	.&mt('Show All Foils')
.&mt('Show All Foils')	.'</label>';
.'</label>';	}
}
}
if ($Apache::lonhomework::type eq 'practice') {	if ($Apache::lonhomework::type eq 'practice') {
$form_tag_start.=&practice_problem_header();	$form_tag_start.=&practice_problem_header();
}	}
unless ($env{'request.gcicontext'} eq 'buildtest') {	$form_tag_start.='<hr />';
$form_tag_start.='<hr />';
}
}	}

($status,$accessmsg,my $slot_name,my $slot) =	($status,$accessmsg,my $slot_name,my $slot) =
Line 1134 sub end_problem {	Line 1126 sub end_problem {
'\textit{'.$duedate_text.'} '.$toc_line;	'\textit{'.$duedate_text.'} '.$toc_line;
} else {	} else {
$frontmatter.= $begin_doc.$toc_line;	$frontmatter.= $begin_doc.$toc_line;
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}	if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) {
	$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
	}
}	}
} else {	} else {
$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;	$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
Line 1142 sub end_problem {	Line 1136 sub end_problem {
} else {	} else {
if (not $env{'request.symb'} =~ m/\.page_/) {	if (not $env{'request.symb'} =~ m/\.page_/) {
$frontmatter .= $begin_doc.$toc_line;	$frontmatter .= $begin_doc.$toc_line;
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}	if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) {
	$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
	}
} else {	} else {
$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;	$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
}	}
Line 1784 sub start_part {	Line 1780 sub start_part {
'.disableexampointprint'}) eq 'yes') {	'.disableexampointprint'}) eq 'yes') {
$allow_print_points=0;	$allow_print_points=0;
}	}
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}	if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) {
	$result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';

	}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
$result.='<a name="'.&escape($Apache::inputtags::part).'" />';	$result.='<a name="'.&escape($Apache::inputtags::part).'" />';
}	}

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

Removed from v.1.461
changed lines
	Added in v.1.464