| '. + &mt($item->{text}).' '. + &Apache::loncommon::help_open_topic($item->{'help'}).' | '."\n". + '|||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
+ |||||||||||||||||||||||||||||||||
|
+ |||||||||||||||||||||||||||||||||
'; return ($output,$rowtotal); } @@ -648,7 +665,21 @@ sub process_changes { } } } elsif (ref($item->{'ordered'}) eq 'ARRAY') { - @ordered = @{$item->{'ordered'}}; + if ($action eq 'courseinfo') { + my ($can_toggle_cat,$can_categorize) = + &can_modify_catsettings($cdom,$crstype); + foreach my $entry (@{$item->{'ordered'}}) { + next if (($entry eq 'hidefromcat') && + (!$can_toggle_cat)); + next if (($entry eq 'categories') && + (!$can_categorize)); + next if (($entry eq 'loncaparev') || + ($entry eq 'owner')); + push(@ordered,$entry); + } + } else { + @ordered = @{$item->{'ordered'}}; + } } if (@ordered > 0) { if ($action eq 'feedback') { @@ -690,7 +721,6 @@ sub process_changes { } } else { foreach my $entry (@ordered) { - next if (($entry eq 'loncaparev') || ($entry eq 'owner')); if ($entry eq 'cloners') { if ($env{'form.cloners_all'}) { $newvalues{$entry} = '*'; @@ -1346,9 +1376,9 @@ sub store_changes { $output .= ''; } else { if ($crstype eq 'Community') { - $output = &mt('No changes made to community settings.'); + $output .= &mt('No changes made to community settings.'); } else { - $output = &mt('No changes made to course settings.'); + $output .= &mt('No changes made to course settings.'); } } } @@ -1708,8 +1738,7 @@ sub print_courseinfo { text => ''.&mt($itemtext->{'cloners'}).' '. &mt('Owner and Coordinators included automatically'), input => 'textbox', - size => '40', - advanced => 1 + size => '40' }, 'rolenames' => { text => ''.&mt($itemtext->{'rolenames'}).' '. @@ -1901,7 +1930,7 @@ sub print_courseinfo { my $showreqd; if ($loncaparev) { $showreqd = &mt('[_1] or newer',$loncaparev).' '. - &mt('Details').'', + &mt('Details').''; } else { $showreqd = &mt('No specific version required'); } @@ -2069,23 +2098,21 @@ sub display_loncaparev_constraints { my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; my $output; + my %lt = &Apache::lonlocal::texthash ( + 'all' => 'all', + 'section/group' => 'section/group', + 'user' => 'user', + ); my (%checkparms,%checkresponsetypes,%checkcrstypes,%anonsurvey,%randomizetry); &Apache::loncommon::build_release_hashes(\%checkparms,\%checkresponsetypes, \%checkcrstypes,\%anonsurvey,\%randomizetry); - -# my %paramstrings = -# ('string_questiontype' => -# [[ 'anonsurveycred', 'Anonymous Survey'], -# [ 'anonsurvey', 'Anonymous Survey'], -# [ 'randomizetry', 'New Randomization Each N Tries']] -# ); if (defined($checkcrstypes{$crstype})) { $output .= ' '.&mt('Course type: [_1] requires [_2] or newer',$crstype, $checkcrstypes{$crstype}).''; } my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps, %byresponsetype,%bysubmission); - @scopeorder = ('course','section/group','user'); + @scopeorder = ('all','section/group','user'); my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom); if (ref($resourcedata) eq 'HASH') { foreach my $key (keys(%{$resourcedata})) { @@ -2109,12 +2136,12 @@ sub display_loncaparev_constraints { $which = $2; $scope = 'section/group'; } else { - $scope = 'course'; + $scope = 'all'; } my $what="$stdname=$valname"; if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) { $level = 'general'; - if ($scope eq 'course') { + if ($scope eq 'all') { if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') { unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) { push(@{$fromparam{$rev}{$scope}},$what); @@ -2135,7 +2162,7 @@ sub display_loncaparev_constraints { } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) { $level = 'folder'; $map = $1; - if ($scope eq 'course') { + if ($scope eq 'all') { if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') { unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) { push(@{$bymap{$map}{$rev}{$scope}},$what); @@ -2155,7 +2182,7 @@ sub display_loncaparev_constraints { } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) { $level = 'resource'; $resource = $1; - if ($scope eq 'course') { + if ($scope eq 'all') { if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') { unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) { push(@{$byresource{$resource}{$rev}{$scope}},$what); @@ -2194,7 +2221,7 @@ sub display_loncaparev_constraints { if ($newrow) { $output .= &Apache::loncommon::continue_data_table_row(); } - $output .= ' | '.$scope.' | '; + $output .= ''.$lt{$scope}.' | '; foreach my $which (sort(keys(%{$fromparam{$rev}{$scope}}))) { $output .= ''.$which.' | '.
join(' ',@{$fromparam{$rev}{$scope}{$which}}).' | ';
@@ -2205,7 +2232,7 @@ sub display_loncaparev_constraints {
if ($newrow) {
$output .= &Apache::loncommon::continue_data_table_row();
}
- $output .= ''.$scope.' | '. + $output .= ' | '.$lt{$scope}.' | '.
join(' ',@{$fromparam{$rev}{$scope}}).' | '.
&Apache::loncommon::end_data_table_row();
$newrow = 1;
@@ -2311,7 +2338,7 @@ sub display_loncaparev_constraints {
$r->print($output);
if (defined($navmap)) {
&show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
- \%byresponsetype,\@scopeorder);
+ \%byresponsetype,\@scopeorder,\%lt);
}
$r->print(''.$icon.' '.&mt('Main Course Documents').' | '); - &releases_by_map($r,$bymap,$topmap,$scopeorder); + &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt); $r->print(&Apache::loncommon::end_data_table_row()); my $it=$navmap->getIterator(undef,undef,undef,1,1,undef); my $curRes; @@ -2377,7 +2405,7 @@ sub show_contents_view { } $r->print(&Apache::loncommon::start_data_table_row(). ''.$indent.$icon.' '.$title.' | '); - &releases_by_map($r,$bymap,$url,$scopeorder); + &releases_by_map($r,$bymap,$url,$scopeorder,$lt); $r->print(&Apache::loncommon::end_data_table_row()); } else { my $rowspan; @@ -2406,7 +2434,7 @@ sub show_contents_view { $r->print('
| '.&mt('Setting - scope: [_1]',$scope).' | '); + $r->print('||
| '.&mt('Setting - scope: [_1]',$lt->{$scope}).' | '); foreach my $which (sort(keys(%{$byresource->{$symb}{$rev}{$scope}}))) { $r->print(''.$which.' | '.
join(' ',@{$byresource->{$symb}{$rev}{$scope}{$which}}). @@ -2414,7 +2442,7 @@ sub show_contents_view { } $r->print(' |
| '.&mt('Setting - scope: [_1]',$scope).' | '. + $r->print('||
| '.&mt('Setting - scope: [_1]',$lt->{$scope}).' | '. ''.
join(' ',@{$byresource->{$symb}{$rev}{$scope}}).' |
| '.&mt('Setting - scope: [_1]',$scope).' | '); + $r->print('||
| '.&mt('Setting - scope: [_1]',$lt->{$scope}).' | '); foreach my $which (sort(keys(%{$bymap->{$url}{$rev}{$scope}}))) { $r->print(''.$which.' | '.
join(' ',@{$bymap->{$url}{$rev}{$scope}{$which}}). @@ -2480,7 +2508,7 @@ sub releases_by_map { } $r->print(' |
| '.&mt('Setting - scope: [_1]',$scope). + $r->print(' | ||
| '.&mt('Setting - scope: [_1]',$lt->{$scope}). ' | '.
join(' ',@{$bymap->{$url}{$rev}{$scope}}).' |