--- loncom/interface/lonparmset.pm 2009/01/28 17:13:03 1.427
+++ loncom/interface/lonparmset.pm 2009/02/13 20:20:30 1.430
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.427 2009/01/28 17:13:03 bisitz Exp $
+# $Id: lonparmset.pm,v 1.430 2009/02/13 20:20:30 schafran 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 '';
@@ -1316,9 +1317,14 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');
}
- $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
- : &mt($tempkey))
- .' | ');
+ my $displaykey;
+ if ($$allparms{$tempkey}=~/\S/) {
+ $displaykey = $$allparms{$tempkey};
+ } else {
+ $displaykey = $tempkey;
+ }
+ $displaykey =~ s/(\[|\])/~$1/g;
+ $r->print(' />'.&mt($displaykey).'');
$cnt++;
if ($cnt==3) {
$r->print("
\n");
@@ -3454,7 +3460,7 @@ ENDOVER
my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
$r->print(&tableend().''.
- ($foundkeys?'':&mt('There are no parameters.')).'
'.
+ ($foundkeys?'':&mt('There are no parameters.')).''.
&Apache::loncommon::end_page());
}
@@ -4328,7 +4334,7 @@ ENDYESNO
}
$r->print(&Apache::loncommon::end_data_table().
"\n".''."\n".
+ &mt('Save').'" />'."\n".
&Apache::loncommon::end_page());
return;
}