--- loncom/interface/lonparmset.pm 2009/01/20 18:05:55 1.422
+++ loncom/interface/lonparmset.pm 2009/01/28 17:13:03 1.427
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.422 2009/01/20 18:05:55 bisitz Exp $
+# $Id: lonparmset.pm,v 1.427 2009/01/28 17:13:03 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -974,12 +974,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\_//;
@@ -1315,7 +1316,7 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');
}
- $r->print('>'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
+ $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
: &mt($tempkey))
.'');
$cnt++;
@@ -1816,12 +1817,13 @@ sub assessparms {
if (!$pssymb) {
$r->print('');
&levelmenu($r,\%alllevs,$parmlev);
+ $r->print(' | ');
if ($parmlev ne 'general') {
$r->print('');
&mapmenu($r,\%allmaps,$pschp,\%maptitles);
$r->print(' | ');
}
- $r->print('
');
+ $r->print('');
&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
} else {
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
@@ -2293,12 +2295,12 @@ sub crsenv {
my ($name,$domain) = split(':',$user);
if (!defined($user) || !defined($domain)) {
$setoutput.= '
'.
- &mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ &mt("Invalid e-mail address specified, address must be of the form username:domain what was specified was ([_1])",$user).
'';
undef($value);
} elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
$setoutput.= '
'.
- &mt("Invalid email address specified, user [_1] is unknown.",$name).
+ &mt("Invalid e-mail address specified, user [_1] is unknown.",$name).
'';
undef($value);
}
@@ -3140,7 +3142,7 @@ sub listdata {
$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
}
$r->print('');
+ $thistype.'" />');
$r->print(''.&Apache::loncommon::end_data_table_row());
}
}
@@ -3885,19 +3887,19 @@ sub output_row {
my $single_checked;
if ($options =~ m/onlyone/) {
$multiple_checked = '';
- $single_checked = ' checked="checked" ';
+ $single_checked = ' checked="checked"';
} else {
- $multiple_checked = ' checked="checked" ';
+ $multiple_checked = ' checked="checked"';
$single_checked = '';
}
$output .= &Apache::loncommon::continue_data_table_row();
$output .= ''.(' ' x 10).'
-
+
'.&mt('Student may select multiple choices from list').' | ';
$output .= &Apache::loncommon::end_data_table_row();
$output .= &Apache::loncommon::continue_data_table_row();
$output .= ''.(' ' x 10).'
-
+
'.&mt('Student may select only one choice from list').' | ';
$output .= &Apache::loncommon::end_data_table_row();
}