--- loncom/interface/lonparmset.pm 2009/01/15 18:31:11 1.420 +++ 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.420 2009/01/15 18:31:11 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 '
| ');
} else {
$parm=~s|\[.*\]\s||g;
+ $parm=&mt($parm);
}
my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
if ($automatic) {
$parm.=''.$parm.' | '); + $r->print(''.$parm.' | '); my $thismarker=$which; $thismarker=~s/^parameter\_//; @@ -1307,17 +1309,22 @@ sub parmmenu { ENDSCRIPT $r->print(); - $r->print("\n
'); + 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(" |
' .' |
'.&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row() @@ -2128,7 +2136,9 @@ ENDTABLEHEADFOUR \%type,\%display,$defbgone,$defbgtwo,$defbgthree, $parmlev,$uname,$udom,$csec,$cgroup); } - $r->print(&Apache::loncommon::end_data_table().'
'); + $r->print(&Apache::loncommon::end_data_table().'' + .'' + ); } # end each map } # end of $parmlev eq map #--------------------------------- Entry for parm level general (Course level) @@ -2291,12 +2301,12 @@ sub crsenv { my ($name,$domain) = split(':',$user); if (!defined($user) || !defined($domain)) { $setoutput.= ''. - ($foundkeys?'':&mt('There are no parameters.')).'
'. + ($foundkeys?'':&mt('There are no parameters.')).''. &Apache::loncommon::end_page()); } @@ -3882,20 +3892,20 @@ sub output_row { my $multiple_checked; my $single_checked; if ($options =~ m/onlyone/) { - $multiple_checked = ""; - $single_checked = " CHECKED "; + $multiple_checked = ''; + $single_checked = ' checked="checked"'; } else { - $multiple_checked = " CHECKED "; - $single_checked = ""; + $multiple_checked = ' checked="checked"'; + $single_checked = ''; } $output .= &Apache::loncommon::continue_data_table_row(); $output .= '