--- loncom/interface/lonparmset.pm 2008/12/12 17:06:05 1.419
+++ loncom/interface/lonparmset.pm 2009/02/13 17:46:00 1.429
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.419 2008/12/12 17:06:05 bisitz Exp $
+# $Id: lonparmset.pm,v 1.429 2009/02/13 17:46:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -848,12 +848,13 @@ sub plink {
my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
unless (defined($winvalue)) { $winvalue=$val; }
my $valout = &valout($value,$type,1);
+ my $unencmarker = $marker;
foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
\$hour, \$min, \$sec) {
$$item = &HTML::Entities::encode($$item,'"<>&');
$$item =~ s/\'/\\\'/g;
}
- return '
|
'.
+ return '';
@@ -974,12 +975,13 @@ sub print_row {
.$$part{$which}.' | ');
} else {
$parm=~s|\[.*\]\s||g;
+ $parm=&mt($parm);
}
my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
if ($automatic) {
$parm.='
'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'';
}
- $r->print(''.$parm.' | ');
+ $r->print(''.$parm.' | ');
my $thismarker=$which;
$thismarker=~s/^parameter\_//;
@@ -1307,17 +1309,22 @@ sub parmmenu {
ENDSCRIPT
$r->print();
- $r->print("\n