--- loncom/interface/lonparmset.pm 2008/07/09 11:10:06 1.404
+++ loncom/interface/lonparmset.pm 2008/10/10 10:54:03 1.411
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.404 2008/07/09 11:10:06 bisitz Exp $
+# $Id: lonparmset.pm,v 1.411 2008/10/10 10:54:03 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -973,7 +973,7 @@ sub extractResourceInformation {
if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
my $parmdis = $display;
- $parmdis =~ s/\[Part.*$//g;
+ $parmdis =~ s/ \[Part.*$//g;
$$allparms{$name}=$parmdis;
if (ref($defkeytype)) {
$$defkeytype{$name}=
@@ -985,7 +985,7 @@ sub extractResourceInformation {
# allparts is a hash of all parts
#
my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
- $$allparts{$part} = "Part: $part";
+ $$allparts{$part} = &mt('Part: [_1]',$part);
#
# Remember all keys going with this resource
#
@@ -1107,8 +1107,8 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked');
}
- $r->print('>'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
- : $tempkey)
+ $r->print('>'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
+ : &mt($tempkey))
.'');
$cnt++;
if ($cnt==3) {
@@ -1116,21 +1116,46 @@ ENDSCRIPT
$cnt=0;
}
}
- $r->print('
-
');
+ $r->print(''
+ .''
+ );
}
sub partmenu {
@@ -2126,6 +2151,8 @@ sub crsenv {
$setoutput.=&mt('Set').' '.$name.' '.&mt('to').' ';
if ($name =~ /^default_enrollment_(start|end)_date$/) {
$setoutput .= &Apache::lonlocal::locallocaltime($value);
+ } elsif ($name eq 'categories') {
+ $setoutput .= $env{'form.categories_display'};
} else {
$setoutput .= $value;
}
@@ -2355,6 +2382,8 @@ sub crsenv {
'categories'
=> ''.&mt('Categorize course').' '.
&mt('Display Categories').'',
+ 'datelocale'
+ => ''.&mt('Locale used for course calendar').'',
);
my @Display_Order = ('url','description','courseid','cloners');
(my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
@@ -2378,6 +2407,7 @@ sub crsenv {
'allow_discussion_post_editing',
'languages',
'timezone',
+ 'datelocale',
'nothideprivileged',
'rndseed',
'receiptalg',
@@ -2399,7 +2429,9 @@ sub crsenv {
'disableexampointprint',
'task_messages','task_grading'));
foreach my $parameter (sort(keys(%values))) {
- unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
+ unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+ ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+ || ($parameter eq 'type')) {
if (! $descriptions{$parameter}) {
$descriptions{$parameter}=$parameter;
push(@Display_Order,$parameter);
@@ -2429,6 +2461,32 @@ sub crsenv {
&Apache::loncommon::select_timezone($parameter.'_value',
$timezone,
$onchange,$includeempty).'';
+ } elsif ($parameter eq 'datelocale') {
+ my $includeempty = 1;
+ my $locale_obj = &Apache::lonlocal::getdatelocale();
+ my $currdatelocale;
+ if (ref($locale_obj)) {
+ $currdatelocale = $locale_obj->id();
+ }
+ $output .= ''.
+ &Apache::loncommon::select_datelocale($parameter.'_value',
+ $currdatelocale,
+ $onchange,$includeempty).' | ';
+ } elsif ($parameter eq 'categories') {
+ my $catdisplay;
+ if ($values{'categories'} ne '') {
+ my @curritems = split(/\&/,$values{'categories'});
+ foreach my $item (@curritems) {
+ my ($name,$parent,$pos) = split(/:/,$item);
+ $catdisplay .= &unescape($name).'&';
+ }
+ $catdisplay =~ s/\&$//;
+ }
+ $output .= ''.
+ ''.
+ ' | ';
} else {
$output .= ''.
&Apache::lonhtmlcommon::textbox($parameter.'_value',
@@ -2539,21 +2597,28 @@ sub assign_course_categories {
function updateCategories() {
var newcategories = '';
+ var unescapedcats = '';
if (document.chgcats.usecategory.length) {
for (var i=0; i 0) {
newcategories = newcategories.slice(0,-1);
}
+ if (unescapedcats.length > 0) {
+ unescapedcats = unescapedcats.slice(0,-3);
+ }
} else {
if (document.chgcats.usecategory.checked == true) {
newcategories = document.chgcats.usecategory.value;
+ unescapedcats = document.chgcats.catname.value;
}
}
opener.document.envform.categories_value.value = newcategories;
+ opener.document.envform.categories_display.value = unescapedcats;
opener.document.envform.categories_setparmval.checked = true;
alert("$alert");
self.close();
|