rat/lonpage.pm - diff

Return to lonpage.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonpage.pm between versions 1.103 and 1.108

version 1.103, 2014/02/11 15:56:47	version 1.108, 2015/03/11 19:55:44
Line 307 ENDEXT	Line 307 ENDEXT
#some additional cleanup necessary for LateX (due to limitations of table environment	#some additional cleanup necessary for LateX (due to limitations of table environment
$output =~ s/(\\vskip\s\d+mm)\s(\\\\)+/$1/g;	$output =~ s/(\\vskip\s\d+mm)\s(\\\\)+/$1/g;
}	}
	my $matheditor;
	if ($output =~ /\Qjavascript:LC_mathedit_HWVAL_\E/) {
	$matheditor = 'dragmath';
	} elsif ($output =~ /LCmathField/) {
	$matheditor = 'lcmath';
	}
my $parser=HTML::TokeParser->new(\$output);	my $parser=HTML::TokeParser->new(\$output);
my $token;	my $token;
my $thisdir=$src;	my $thisdir=$src;
Line 373 ENDEXT	Line 379 ENDEXT
s/\<((?:input\|select\|button\|textarea)[^\>]+)name\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;	s/\<((?:input\|select\|button\|textarea)[^\>]+)name\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
$output=~	$output=~
s/\<((?:input\|select\|button\|textarea)[^\>]+)id\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;	s/\<((?:input\|select\|button\|textarea)[^\>]+)id\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
	if ($matheditor eq 'dragmath') {
	$output=~
	s/(\Qjavascript:LC_mathedit_\E)(HWVAL_)([^'"]+?)($['"]*)(\QHWVAL_\E\3['"]$\;void$0$\;)/$1$idprefix$2$3$4$idprefix$5/g;
	$output=~
	s/(function\s+LC_mathedit_)(HWVAL_)([^'"]+?)(\s+$LCtextline$)/$1$idprefix$2$3$4/g;
	} elsif ($matheditor eq 'lcmath') {
	$output=~
	s/(var\s+LCmathField\s+=\s+document\.getElementById$['"])([^'"]+?)(['"]$\;)/$1$idprefix$2$3/g;
	}
	$output=~
	s/(\Q<div id="msg_\E)(\Qsubmit_\E)([^"]*)(\Q" style="display:none">\E)/<input type="hidden" name="$prefix$2$3_pressed" id="$idprefix$2$3_pressed" value="" \/>$1$idprefix$2$3$4/g;
	$output=~
	s/(\Q<td class="LC_status_\E)(\Qsubmit_\E)([^\"])(\s[^\"]*"\>)/$1$idprefix$2$3$4/g;
if ($nuploads) {	if ($nuploads) {
$output=~	$output=~
s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\sid\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\)])\>/\<$1 id="$prefix$2" $3\>/gsi;	s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\sid\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\)])\>/\<$1 id="$prefix$2" $3\>/gsi;
Line 385 ENDEXT	Line 404 ENDEXT
}	}
$output=~	$output=~
s/\<((?:input\|select)[^\>]+\Qjavascript:setSubmittedPart\E)$\s[\'\"]([^\'\"]+)[\'\"]\s*$/\<$1('$2','$prefix')/gsi;	s/\<((?:input\|select)[^\>]+\Qjavascript:setSubmittedPart\E)$\s[\'\"]([^\'\"]+)[\'\"]\s*$/\<$1('$2','$prefix')/gsi;
	$output=~
	s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)$\'([^\']+)\'$(;\")/\<$1('$idprefix$2')$3/gsi;
}	}
$thisdir=~s/\/[^\/]*$//;	$thisdir=~s/\/[^\/]*$//;
foreach (@rlinks) {	foreach (@rlinks) {
Line 457 ENDEXT	Line 478 ENDEXT
}	}
$fmtag .= ' action="'.	$fmtag .= ' action="'.
&Apache::lonenc::check_encrypt($requrl)	&Apache::lonenc::check_encrypt($requrl)
.'">';	.'" id="LC_page">';
$r->print($fmtag);	$r->print($fmtag);
}	}
} elsif (($target eq 'tex') \|\| ($target eq 'tex_answer')) {	} elsif (($target eq 'tex') \|\| ($target eq 'tex_answer')) {
Line 537 ENDEXT	Line 558 ENDEXT
$r->print('>'.$metainfo.'<embed src="'.	$r->print('>'.$metainfo.'<embed src="'.
$hash{'src_'.$rid}.'"></embed>');	$hash{'src_'.$rid}.'"></embed>');
} elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence\|page)$/) {	} elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence\|page)$/) {
$r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />'.	$r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />');
&mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'.	unless ($cellemb{$rid} eq 'wrp') {
&Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'</table></p><br />');	$r->print(&mt('It is recommended that you use an up-to-date virus scanner before handling this file.'));
	}
	$r->print('</p><p><table>'.
	&Apache::londocs::entryline(0,
	&mt("Click to download or use your browser's Save Link function"),
	'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).
	'</table></p><br />');
}	}
unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {	unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {
$r->print('</td>');	$r->print('</td>');
Line 563 ENDEXT	Line 590 ENDEXT
}	}
# ---------------------------------------------------------------- Submit, etc.	# ---------------------------------------------------------------- Submit, etc.
if ($nforms) {	if ($nforms) {
	my $class;
	if ($nforms > 1) {
	$class = ' class="LC_hwk_submit"';
	}
$r->print(	$r->print(
'<input name="all_submit" value="'.&mt('Submit All').'" type="'.	'<input name="all_submit" value="'.&mt('Submit All').'" type="'.
(($nforms>1)?'submit':'hidden').'"></input></form>');	(($nforms>1)?'submit':'hidden').'"'.$class.' id="all_submit" />'.
	'<div id="msg_all_submit" style="display:none">'.
	&mt('Processing your submission ...').'</div></form>');
}	}
unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {	unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {
$r->print(&Apache::loncommon::end_page({'discussion'	$r->print(&Apache::loncommon::end_page({'discussion'

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

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