--- loncom/interface/lonparmset.pm 2008/12/12 20:22:33 1.413.2.1 +++ loncom/interface/lonparmset.pm 2009/09/15 03:01:17 1.413.6.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.413.2.1 2008/12/12 20:22:33 raeburn Exp $ +# $Id: lonparmset.pm,v 1.413.6.2 2009/09/15 03:01:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -643,12 +643,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 '
'; + undef($value); + } + } + } } if ($name eq 'url') { $value=~s/^\/res\///; @@ -2314,7 +2366,7 @@ sub crsenv { 'student_classlist_view' => ''.&mt('Allow students to view classlist.').' ' .'('.&mt('[_1]: students can view all sections. [_2]: students can only view their own section. blank or [_3] prevents student view.','"all"','"section"','"disabled"').')', 'student_classlist_portfiles' => ''.&mt('Include link to accessible portfolio files').' ' - .'('.&mt('[_1] for link to each a listing of each student\'s files.','"yes"').')', + .'('.&mt("[_1] for link to each a listing of each student's files.",'"yes"').')', 'student_classlist_opt_in' => ''.&mt("Student's agreement needed for listing in student-viewable roster").' ' .'('.&mt('[_1] to require students to opt-in to listing in the roster (on the roster page).','"yes"').')', 'plc.roles.denied'=> ''.&mt('Disallow live chatroom use for Roles').' ' @@ -2401,7 +2453,7 @@ sub crsenv { 'texengine' => ''.&mt('Force all students in the course to use a specific math rendering engine.').' ' - .'('.&mt('[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student\'s preference','"jsMath"','"mimetex"','"tth"').')', + .'('.&mt("[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student's preference",'"jsMath"','"mimetex"','"tth"').')', 'timezone' => ''.&mt('Timezone in which the course takes place').'', @@ -2416,6 +2468,9 @@ sub crsenv { &mt('Display Categories').'', 'datelocale' => ''.&mt('Locale used for course calendar').'', + 'rolenames' + => ''.&mt('Replacement titles for standard course roles').' '. + '('.&mt('To replace the standard title for a course role, enter the title you wish to use, otherwise leave blank.').')', ); my @Display_Order = ('url','description','courseid','cloners'); (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom); @@ -2440,6 +2495,7 @@ sub crsenv { 'languages', 'timezone', 'datelocale', + 'rolenames', 'nothideprivileged', 'rndseed', 'receiptalg', @@ -2462,8 +2518,9 @@ sub crsenv { 'task_messages','task_grading')); foreach my $parameter (sort(keys(%values))) { unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) || - ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/) - || ($parameter eq 'type')) { + ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/) || + ($parameter eq 'type') || + ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) { if (! $descriptions{$parameter}) { $descriptions{$parameter}=$parameter; push(@Display_Order,$parameter); @@ -2503,7 +2560,28 @@ sub crsenv { $output .= ' '.
&Apache::loncommon::select_datelocale($parameter.'_value',
$currdatelocale,
- $onchange,$includeempty).' | ';
+ $onchange,$includeempty).'';
+ } elsif ($parameter eq 'rolenames') {
+ $output.= '
| ';
} elsif ($parameter eq 'categories') {
my $catdisplay;
if ($values{'categories'} ne '') {
@@ -2525,9 +2603,11 @@ sub crsenv {
$values{$parameter},
40,$onchange).'';
}
- $output .= '
'.
- &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
- ' | ';
+ unless ($parameter eq 'rolenames') {
+ $output .= ''.
+ &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+ ' | ';
+ }
$output .= &Apache::loncommon::end_data_table_row()."\n";
}
my $onchange = 'onFocus="javascript:window.document.forms'.
@@ -2957,15 +3037,16 @@ sub listdata {
}
if ($part ne $oldpart) {
$r->print(&tableend().
- "\n".&mt('Part').": $part");
+ "\n".''.&mt('Part').": $part");
$oldpart=$part;
}
#
# Ready to print
#
+ my $parmitem = &standard_parameter_names($name);
$r->print(&tablestart().
&Apache::loncommon::start_data_table_row().
- ''.&standard_parameter_names($name).
+ ' | '.&mt($parmitem).
' | ');
$foundkeys++;
@@ -2992,7 +3073,7 @@ sub listdata {
$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
}
$r->print('');
+ $thistype.'" />');
$r->print(' | '.&Apache::loncommon::end_data_table_row());
}
}
@@ -3352,9 +3433,10 @@ ENDOVER
$display_value =
&Apache::lonlocal::locallocaltime($display_value);
}
+ my $parmitem = &standard_parameter_names($data{'parameter_name'});
+ $parmitem = &mt($parmitem);
$r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
- &standard_parameter_names($data{'parameter_name'}),
- $resourcedata->{$thiskey}));
+ $parmitem,$resourcedata->{$thiskey}));
$r->print(''); if ($data{'scope_type'} eq 'all') { $r->print(&mt('All users')); @@ -3768,21 +3850,21 @@ 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 .= ' '.(' ' 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();
}
return ($output);
@@ -4245,7 +4327,6 @@ sub load_parameter_names {
close($config);
$standard_parms{'int_pos'} = 'Positive Integer';
$standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
- %standard_parms=&Apache::lonlocal::texthash(%standard_parms);
}
sub standard_parameter_names {
@@ -4359,15 +4440,18 @@ sub parm_change_log {
} else {
$makenewrow=1;
}
+ my $parmitem = &standard_parameter_names($parmname);
$output .=''.$realm.' | '.$section.' | '.
- &standard_parameter_names($parmname).' | '.
+ &mt($parmitem).' | '.
($part?&mt('Part: [_1]',$part):&mt('All Parts')).' | ';
my $stillactive=0;
if ($parmlog{$id}{'delflag'}) {
$output .= &mt('Deleted');
} else {
if ($typeflag) {
- $output .= &mt('Type: [_1]',&standard_parameter_names($value));
+ my $parmitem = &standard_parameter_names($value);
+ $parmitem = &mt($parmitem);
+ $output .= &mt('Type: [_1]',$parmitem);
} else {
my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
$uname,$udom,$issection,$issection,$courseopt);
@@ -4385,8 +4469,11 @@ sub parm_change_log {
}
$output .= ' | ';
if ($stillactive) {
- my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
- my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
+ my $parmitem = &standard_parameter_names($parmname);
+ $parmitem = &mt($parmitem);
+ my $title=&mt('Changed [_1]',$parmitem);
+ my $description=&mt('Changed [_1] for [_2] to [_3]',
+ $parmitem,$realmdescription,
(&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
if (($uname) && ($udom)) {
$output .=
| |