--- loncom/interface/lonhtmlcommon.pm 2004/09/29 14:50:43 1.90
+++ loncom/interface/lonhtmlcommon.pm 2004/10/21 11:18:06 1.94
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.90 2004/09/29 14:50:43 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.94 2004/10/21 11:18:06 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -131,7 +131,8 @@ sub select_recent {
">\n";
foreach (sort keys %recent) {
unless ($_=~/^error\:/) {
- $return.="\n';
}
@@ -804,8 +805,10 @@ sub Increment_PrgWin {
my $sec = $time_est % 60;
#
my $str;
- if ($min == 1 && $sec > 1) {
+ if ($min == 0 && $sec > 1) {
$str = '[_2] seconds';
+ } elsif ($min == 1 && $sec > 1) {
+ $str = '1 minute [_2] seconds';
} elsif ($min == 1 && $sec < 2) {
$str = '1 minute';
} elsif ($min < 10 && $sec > 1) {
@@ -885,9 +888,12 @@ sub crumbs {
unless ($path eq $uri) { $path.='/'; }
my $linkpath=$path;
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.=''.$_.'/';
+ my $escaped_linkpath = &Apache::loncommon::escape_single($linkpath);
+ my $escaped_target = &Apache::loncommon::escape_single($target);
+ $output.=''.$_.'/';
}
} else {
$output.=$uri;
@@ -902,7 +908,7 @@ sub spellheader {
my $nothing = &javascript_nothing();
return (<
-// BEGIN LON-CAPA Internal
+//
ENDCHECK
}
@@ -974,7 +980,7 @@ sub disablelink {
if (defined($#fields)) {
unless ($#fields>=0) { return ''; }
}
- return ''.&mt('Disable WYSIWYG Editor').'';
+ return ''.&mt('Disable WYSIWYG Editor').'';
}
sub enablelink {
@@ -982,7 +988,7 @@ sub enablelink {
if (defined($#fields)) {
unless ($#fields>=0) { return ''; }
}
- return ''.&mt('Enable WYSIWYG Editor').'';
+ return ''.&mt('Enable WYSIWYG Editor').'';
}
# ----------------------------------------- Script to activate only some fields