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();
- return;
-}
-
-
-ENDSCRIPT
- } else {
- my $onload;
- }
- my $start_page =
- &Apache::loncommon::start_page('Course Categories',$catwin_js,
- {'only_body' => 1,});
- my $end_page = &Apache::loncommon::end_page();
- my $categoriesform = ''.&mt('Categorize Course').' ';
- if ($hascats) {
- my %currsettings =
- &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
- $categoriesform .= &mt('Assign one or more categories to this course.').' '.
- ' ';
- } else {
- $categoriesform .= &mt('No categories defined for this domain');
- }
- $r->print($start_page.$categoriesform.$end_page);
- return;
-}
-
##################################################
# Overview mode
##################################################
@@ -2923,7 +2742,7 @@ sub storedata {
$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified date for');
}
- if (defined($data) and $$olddata{$thiskey} ne $data) {
+ if (defined($data) and $$olddata{$thiskey} ne $data) {
if ($tuname) {
if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
$tkey.'.type' => $typeof},
@@ -2938,8 +2757,8 @@ sub storedata {
&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
} else {
$newdata{$thiskey}=$data;
- $newdata{$thiskey.'.type'}=$typeof;
- }
+ $newdata{$thiskey.'.type'}=$typeof;
+ }
}
} elsif ($cmd eq 'del') {
if ($tuname) {
@@ -2993,7 +2812,7 @@ sub parse_listdata_key {
my ($key,$listdata) = @_;
# split into student/section affected, and
# the realm (folder/resource part and parameter
- my ($student,$realm) =
+ my ($student,$realm) =
($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
# if course wide student would be undefined
if (!defined($student)) {
@@ -3034,13 +2853,13 @@ sub listdata {
if ($sortorder eq 'realmstudent') {
if ($ares ne $bres ) {
$result = ($ares cmp $bres);
- } elsif ($astudent ne $bstudent) {
+ } elsif ($astudent ne $bstudent) {
$result = ($astudent cmp $bstudent);
} elsif ($apart ne $bpart ) {
$result = ($apart cmp $bpart);
}
} else {
- if ($astudent ne $bstudent) {
+ if ($astudent ne $bstudent) {
$result = ($astudent cmp $bstudent);
} elsif ($ares ne $bres ) {
$result = ($ares cmp $bres);
@@ -3048,7 +2867,7 @@ sub listdata {
$result = ($apart cmp $bpart);
}
}
-
+
if (!$result) {
if (defined($aparm) && defined($bparm)) {
$result = ($aparm <=> $bparm);
@@ -3119,9 +2938,10 @@ sub listdata {
#
# 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++;
@@ -3198,7 +3018,7 @@ sub default_selector {
return ' ';
}
-my %strings =
+my %strings =
(
'string_yesno'
=> [[ 'yes', 'Yes' ],
@@ -3213,7 +3033,7 @@ my %strings =
sub string_selector {
my ($thistype, $thiskey, $showval) = @_;
-
+
if (!exists($strings{$thistype})) {
return &default_selector($thiskey,$showval);
}
@@ -3306,7 +3126,7 @@ ENDOVER
my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
if (!@psprt) { $psprt[0]='0'; }
- my @selected_sections =
+ my @selected_sections =
&Apache::loncommon::get_env_multiple('form.Section');
@selected_sections = ('all') if (! @selected_sections);
foreach my $sec (@selected_sections) {
@@ -3319,14 +3139,14 @@ ENDOVER
my $pssymb='';
my $parmlev='';
-
+
unless ($env{'form.parmlev'}) {
$parmlev = 'map';
} else {
$parmlev = $env{'form.parmlev'};
}
- &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
+ &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
\%mapp, \%symbp,\%maptitles,\%uris,
\%keyorder,\%defkeytype);
@@ -3335,21 +3155,36 @@ ENDOVER
}
# Menu to select levels, etc
- $r->print('
- '.
' ' );
-
+
$r->print('');
my $display_value = $resourcedata->{$thiskey};
if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
- $display_value =
+ $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'));
@@ -3540,7 +3382,7 @@ ENDOVER
}
$r->print(' '.&mt('Part: [_1]',$data{'parameter_part'}));
$r->print(' ');
-
+
}
}
$r->print(&Apache::loncommon::end_data_table().''.
@@ -3630,7 +3472,7 @@ sub parse_key {
my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
$data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
}
-
+
$data{'parameter_part'} = $part;
$data{'parameter_name'} = $name;
@@ -3670,7 +3512,7 @@ sub check_cloners {
$disallowed{'format'} .= $currclone.',';
}
} elsif ($currclone !~/^($match_username)\:($match_domain)$/) {
- $disallowed{'format'} .= $currclone.',';
+ $disallowed{'format'} .= $currclone.',';
} else {
if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
$disallowed{'newuser'} .= $currclone.',';
@@ -3699,7 +3541,7 @@ sub change_clone {
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $clone_crs = $cnum.':'.$cdom;
-
+
if ($cnum && $cdom) {
my @allowclone;
&extract_cloners($clonelist,\@allowclone);
@@ -3780,10 +3622,10 @@ ENDMAINFORMHEAD
my @menu =
( { categorytitle=>'Settings for this Course',
items => [
- { linktext => 'Course Environment',
- url => '/adm/parmset?action=crsenv',
+ { linktext => 'Course Configuration',
+ url => '/adm/courseprefs?origin=params',
permission => $parm_permission,
- linktitle =>'Edit environment settings for this course.' ,
+ linktitle =>'Edit course configuration.' ,
icon => 'preferences-desktop-remote-desktop.png' ,
#help => 'Course_Environment',
},
@@ -3811,7 +3653,7 @@ ENDMAINFORMHEAD
permission => $parm_permission,
linktitle =>'Set default actions for parameters.' ,
icon => 'folder-new.png' ,
- }]},
+ }]},
{ categorytitle => 'New and Existing Parameter Settings for Resources',
items => [
{ linktext => 'Edit Resource Parameters - Helper Mode',
@@ -3843,7 +3685,7 @@ ENDMAINFORMHEAD
linktitle =>'Set/Modify existing resource parameters in overview mode.' ,
icon => 'preferences-desktop-wallpaper.png' ,
#help => 'Parameter_Overview',
- },
+ },
{ linktext => 'Change Log',
url => '/adm/parmset?action=parameterchangelog',
permission => $parm_permission,
@@ -3875,19 +3717,19 @@ sub output_row {
push @options,['deleted', 'Delete Metadata Field'];
}
$output = &Apache::loncommon::start_data_table_row();
- $output .= '
'.$field_text.': ';
+ $output .= ''.$field_text.': ';
$output .= &Apache::loncommon::end_data_table_row();
foreach my $opt (@options) {
my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
$output .= &Apache::loncommon::continue_data_table_row();
- $output .= ''.(' ' x 5).'
+ $output .= ''.(' ' x 5).'
'.
- &mt($opt->[1]).' ';
+ &mt($opt->[1]).' ';
$output .= &Apache::loncommon::end_data_table_row();
}
$output .= &Apache::loncommon::continue_data_table_row();
- $output .= ''.(' ' x 10).' ';
+ $output .= ''.(' ' x 10).' ';
$output .= &Apache::loncommon::end_data_table_row();
my $multiple_checked;
my $single_checked;
@@ -3899,14 +3741,14 @@ sub output_row {
$single_checked = '';
}
$output .= &Apache::loncommon::continue_data_table_row();
- $output .= ''.(' ' x 10).'
+ $output .= ' '.(' ' x 10).'
- '.&mt('Student may select multiple choices from list').' ';
+ '.&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).'
+ $output .= ' '.(' ' x 10).'
- '.&mt('Student may select only one choice from list').' ';
+ '.&mt('Student may select only one choice from list').'';
$output .= &Apache::loncommon::end_data_table_row();
}
return ($output);
@@ -3960,7 +3802,7 @@ sub order_meta_fields {
}
my $ordered_fields = join ",", @neworder;
my $put_result = &Apache::lonnet::put('environment',
- {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
}
my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
@@ -3973,8 +3815,8 @@ sub order_meta_fields {
$ordered_fields = join ",", @fields_in_order;
}
my $put_result = &Apache::lonnet::put('environment',
- {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
- }
+ {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ }
$r->print('');
my $num_fields = scalar(@fields_in_order);
foreach my $key (@fields_in_order) {
@@ -4025,7 +3867,7 @@ sub addmetafield {
$options =~ s/,,/,/;
my $put_result = &Apache::lonnet::put('environment',
{'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
-
+
$r->print('Undeleted Metadata Field '.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}." with result ".$put_result.' ');
}
$r->print(&continue());
@@ -4084,13 +3926,13 @@ sub setrestrictmeta {
$save_field = $meta_field;
if ($env{'form.'.$meta_field.'_stuadd'}) {
$options.='stuadd,';
- }
+ }
if ($env{'form.'.$meta_field.'_choices'}) {
$options.='choices,';
- }
+ }
if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
$options.='onlyone,';
- }
+ }
if ($env{'form.'.$meta_field.'_active'}) {
$options.='active,';
}
@@ -4136,7 +3978,7 @@ ENDButtons
$output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
}
$output .= &Apache::loncommon::end_data_table();
- $r->print(<print(<
$output
$buttons
@@ -4182,7 +4024,7 @@ sub defaultsetter {
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
text=>"Set Defaults"});
- my $start_page =
+ my $start_page =
&Apache::loncommon::start_page('Parameter Setting Default Actions');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
$r->print(<print(&mt('Manual setting rules apply to all interfaces.').' '.
&mt('Automatic setting rules apply to table mode interfaces only.'));
@@ -4320,12 +4162,12 @@ ENDINPUTDATE
} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
my $yeschecked='';
my $nochecked='';
- if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
- if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='checked="checked"'; }
+ if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
+ if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
$r->print(< $lt{'yes'}
- $lt{'no'}
+ $lt{'yes'}
+ $lt{'no'}
ENDYESNO
} else {
$r->print(' ');
@@ -4363,7 +4205,7 @@ sub components {
$issection='';
}
my $realm=''.&mt('All Resources').' ';
- my $realmdescription=&mt('all resources');
+ my $realmdescription=&mt('all resources');
if ($middle=~/^(.+)\_\_\_\(all\)$/) {
$realm=''.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' ('.$1.') ';
$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
@@ -4378,7 +4220,7 @@ sub components {
}
my %standard_parms;
-
+my %standard_parms_types;
sub load_parameter_names {
open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
@@ -4389,12 +4231,13 @@ sub load_parameter_names {
my (undef,$name,$type)=split(/\&/,$short,3);
if ($type eq 'display') {
$standard_parms{$name} = $plain;
- }
+ } elsif ($type eq 'type') {
+ $standard_parms_types{$name} = $plain;
+ }
}
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 {
@@ -4403,13 +4246,22 @@ sub standard_parameter_names {
&load_parameter_names();
}
if ($standard_parms{$name}) {
- return $standard_parms{$name};
- } else {
- return $name;
+ return $standard_parms{$name};
+ } else {
+ return $name;
}
}
-
+sub standard_parameter_types {
+ my ($name)=@_;
+ if (!%standard_parms_types) {
+ &load_parameter_names();
+ }
+ if ($standard_parms_types{$name}) {
+ return $standard_parms_types{$name};
+ }
+ return;
+}
sub parm_change_log {
my ($r)=@_;
@@ -4426,7 +4278,7 @@ sub parm_change_log {
$r->print('