--- loncom/interface/lonparmset.pm 2009/01/27 15:59:30 1.425
+++ loncom/interface/lonparmset.pm 2009/02/15 17:19:39 1.432
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.425 2009/01/27 15:59:30 schafran Exp $
+# $Id: lonparmset.pm,v 1.432 2009/02/15 17:19:39 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\_//;
@@ -1181,9 +1183,15 @@ sub extractResourceInformation {
#
my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
- my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
- my $parmdis = $display;
- $parmdis =~ s/\s*\[Part.*$//g;
+ my ($display,$parmdis);
+ $display = &standard_parameter_names($name);
+ if ($display eq '') {
+ $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+ $parmdis = $display;
+ $parmdis =~ s/\s*\[Part.*$//g;
+ } else {
+ $parmdis = $display;
+ }
$$allparms{$name}=$parmdis;
if (ref($defkeytype)) {
$$defkeytype{$name}=
@@ -1315,9 +1323,9 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');
}
- $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
- : &mt($tempkey))
- .'');
+ $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+ : $tempkey)
+ .'');
$cnt++;
if ($cnt==3) {
$r->print("
\n");
@@ -3453,7 +3461,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());
}
@@ -4327,7 +4335,7 @@ ENDYESNO
}
$r->print(&Apache::loncommon::end_data_table().
"\n".''."\n".
+ &mt('Save').'" />'."\n".
&Apache::loncommon::end_page());
return;
}