loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.83 and 1.94

version 1.83, 2004/07/19 21:14:15	version 1.94, 2004/10/21 11:18:06
Line 117 sub store_recent {	Line 117 sub store_recent {
time.'&'.&Apache::lonnet::escape($value) });	time.'&'.&Apache::lonnet::escape($value) });
}	}

	sub remove_recent {
	my ($area,$names)=@_;
	my $file=&recent_filename($area);
	return &Apache::lonnet::del($file,$names);
	}

sub select_recent {	sub select_recent {
my ($area,$fieldname,$event)=@_;	my ($area,$fieldname,$event)=@_;
my %recent=&Apache::lonnet::dump(&recent_filename($area));	my %recent=&Apache::lonnet::dump(&recent_filename($area));
Line 125 sub select_recent {	Line 131 sub select_recent {
">\n<option value=''>--- ".&mt('Recent')." ---</option>";	">\n<option value=''>--- ".&mt('Recent')." ---</option>";
foreach (sort keys %recent) {	foreach (sort keys %recent) {
unless ($_=~/^error\:/) {	unless ($_=~/^error\:/) {
$return.="\n<option value='$_'>".	my $escaped = &Apache::loncommon::escape_url($_);
	$return.="\n<option value='$escaped'>".
&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).	&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
'</option>';	'</option>';
}	}
Line 519 sub javascript_nothing {	Line 526 sub javascript_nothing {
return $nothing;	return $nothing;
}	}

	##############################################
	##############################################
	sub javascript_docopen {
	# safari does not understand document.open() and loads "text/html"
	my $nothing = "''";
	my $user_browser;
	my $user_os;
	$user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
	$user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'}));
	if (! defined($user_browser) \|\| ! defined($user_os)) {
	(undef,$user_browser,undef,undef,undef,$user_os) =
	&Apache::loncommon::decode_user_agent();
	}
	if ($user_browser eq 'safari' && $user_os =~ 'mac') {
	$nothing = "document.clear()";
	} else {
	$nothing = "document.open('text/html','replace')";
	}
	return $nothing;
	}


##############################################	##############################################
##############################################	##############################################
Line 777 sub Increment_PrgWin {	Line 805 sub Increment_PrgWin {
my $sec = $time_est % 60;	my $sec = $time_est % 60;
#	#
my $str;	my $str;
if ($min == 1 && $sec > 1) {	if ($min == 0 && $sec > 1) {
$str = '[_2] seconds';	$str = '[_2] seconds';
	} elsif ($min == 1 && $sec > 1) {
	$str = '1 minute [_2] seconds';
} elsif ($min == 1 && $sec < 2) {	} elsif ($min == 1 && $sec < 2) {
$str = '1 minute';	$str = '1 minute';
} elsif ($min < 10 && $sec > 1) {	} elsif ($min < 10 && $sec > 1) {
Line 858 sub crumbs {	Line 888 sub crumbs {
unless ($path eq $uri) { $path.='/'; }	unless ($path eq $uri) { $path.='/'; }
my $linkpath=$path;	my $linkpath=$path;
if ($form) {	if ($form) {
$linkpath="javascript:$form.action='$path';$form.submit();";	my $escaped_path = &Apache::loncommon::escape_single($path);
	$linkpath="javascript:$form.action='$escaped_path';$form.submit();";
}	}
$output.='<a href="'.$linkpath.'"'.($target?' target="'.$target.'"':'').'>'.$_.'</a>/';	my $escaped_linkpath = &Apache::loncommon::escape_single($linkpath);
	my $escaped_target = &Apache::loncommon::escape_single($target);
	$output.='<a href="'.$escaped_linkpath.'"'.($target?' target="'.$escaped_target.'"':'').'>'.$_.'</a>/';
}	}
} else {	} else {
$output.=$uri;	$output.=$uri;
Line 869 sub crumbs {	Line 902 sub crumbs {
return $output.'</font>'.($noformat?'':'</b></tt><br />');	return $output.'</font>'.($noformat?'':'</b></tt><br />');
}	}

	# --------------------- A function that generates a window for the spellchecker

	sub spellheader {
	my $nothing = &javascript_nothing();
	return (<<ENDCHECK);
	<script type="text/javascript">
	//<!-- BEGIN LON-CAPA Internal
	var checkwin;

	function spellcheckerwindow() {
	checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
	checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
	checkwin.document.close();
	}
	// END LON-CAPA Internal -->
	</script>
	ENDCHECK
	}

	# ---------------------------------- Generate link to spell checker for a field

	sub spelllink {
	my ($form,$field)=@_;
	my $linktext=&mt('Check Spelling');
	return (<<ENDLINK);
	<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { document.$form.onsubmit();};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
	ENDLINK
	}

# ------------------------------------------------- Output headers for HTMLArea	# ------------------------------------------------- Output headers for HTMLArea

sub htmlareaheaders {	sub htmlareaheaders {
Line 897 sub htmlareaaddbuttons {	Line 959 sub htmlareaaddbuttons {
config.registerButton('ed_math','LaTeX Inline',	config.registerButton('ed_math','LaTeX Inline',
'/htmlarea/images/ed_math.gif',false,	'/htmlarea/images/ed_math.gif',false,
function(editor,id) {	function(editor,id) {
editor.surroundHTML('<m>\$','\$</m>');	editor.surroundHTML(' <m>\$','\$</m> ');
}	}
);	);
config.registerButton('ed_math_eqn','LaTeX Equation',	config.registerButton('ed_math_eqn','LaTeX Equation',
'/htmlarea/images/ed_math_eqn.gif',false,	'/htmlarea/images/ed_math_eqn.gif',false,
function(editor,id) {	function(editor,id) {
editor.surroundHTML(	editor.surroundHTML(
'<center><m>\\\\[','\\\\]</m></center>');	' \\n<center><m>\\\\[','\\\\]</m></center>\\n ');
}	}
);	);
config.toolbar.push(['ed_math','ed_math_eqn']);	config.toolbar.push(['ed_math','ed_math_eqn']);
Line 918 sub disablelink {	Line 980 sub disablelink {
if (defined($#fields)) {	if (defined($#fields)) {
unless ($#fields>=0) { return ''; }	unless ($#fields>=0) { return ''; }
}	}
return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';	return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
}	}

sub enablelink {	sub enablelink {
Line 926 sub enablelink {	Line 988 sub enablelink {
if (defined($#fields)) {	if (defined($#fields)) {
unless ($#fields>=0) { return ''; }	unless ($#fields>=0) { return ''; }
}	}
return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';	return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
}	}

# ----------------------------------------- Script to activate only some fields	# ----------------------------------------- Script to activate only some fields
Line 1005 returns: nothing	Line 1067 returns: nothing
my @Crumbs;	my @Crumbs;

sub breadcrumbs {	sub breadcrumbs {
my ($color,$component,$component_help,$function,$domain,$menulink) =	my ($color,$component,$component_help,$function,$domain,$menulink,
@_;	$helplink) = @_;
if (! defined($color)) {	if (! defined($color)) {
if (! defined($function)) {	if (! defined($function)) {
$function = &Apache::loncommon::get_users_function();	$function = &Apache::loncommon::get_users_function();
Line 1068 returns: nothing	Line 1130 returns: nothing
# if ($bug ne '') {	# if ($bug ne '') {
# $icons .= &Apache::loncommon::help_open_bug($bug);	# $icons .= &Apache::loncommon::help_open_bug($bug);
# }	# }
if (defined($component_help)) {	if ($helplink ne 'nohelp') {
$icons .=	$icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
&Apache::loncommon::help_open_topic($component_help);	}
}
$icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
if ($icons ne '') {	if ($icons ne '') {
$Str .= $icons.' ';	$Str .= $icons.' ';
}	}

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

Removed from v.1.83
changed lines
	Added in v.1.94