+
';
- if (exists $item->{'header'}->[0]->{'col1'} ||
- exists $item->{'header'}->[0]->{'col2'}) {
+ if (exists $item->{'header'}->[2]->{'col1'} ||
+ exists $item->{'header'}->[2]->{'col2'}) {
$output .= '
- | '.&mt($item->{'header'}->[0]->{'col1'}).' |
- '.&mt($item->{'header'}->[0]->{'col2'}).' |
+ '.&mt($item->{'header'}->[2]->{'col1'}).' |
+ '.&mt($item->{'header'}->[2]->{'col2'}).' |
';
}
}
} else {
$output .= '
+
+
';
if (exists $item->{'header'}->[0]->{'col1'} ||
exists $item->{'header'}->[0]->{'col2'}) {
$output .= '
- | '.&mt($item->{'header'}->[0]->{'col1'}).' |
- '.&mt($item->{'header'}->[0]->{'col2'}).' |
+ '.&mt($item->{'header'}->[0]->{'col1'}).' | ';
+ if (($action eq 'courseinfo') || ($action eq 'localization') ||
+ ($action eq 'print_discussion')) {
+ $output .= '';
+ } else {
+ $output .= ' | ';
+ }
+ $output .= &mt($item->{'header'}->[0]->{'col2'}).' |
';
}
}
@@ -596,7 +653,7 @@ sub print_config_box {
$output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif ($action eq 'discussion') {
$output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
- } elsif ($action eq 'classlists') {
+ } elsif (($action eq 'classlists') || ($action eq 'viewableroster')) {
$output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'appearance') {
$output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
@@ -613,7 +670,9 @@ sub print_config_box {
}
$output .= '
-';
+ |
+
+
';
return ($output,$rowtotal);
}
@@ -637,7 +696,26 @@ 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);
+ }
+ } elsif ($action eq 'classlists') {
+ foreach my $entry (@{$item->{'ordered'}}) {
+ next if ($entry eq 'defaultcredits');
+ push(@ordered,$entry);
+ }
+ } else {
+ @ordered = @{$item->{'ordered'}};
+ }
}
if (@ordered > 0) {
if ($action eq 'feedback') {
@@ -687,8 +765,8 @@ sub process_changes {
if (exists($env{'form.cloners_activate'})) {
my $actnum = $env{'form.cloners_activate'};
if ($actnum ne '') {
- if ($env{'form.clonersdom_'.$actnum} ne '') {
- my $clonedom = $env{'form.clonersdom_'.$actnum};
+ if ($env{'form.cloners_dom_'.$actnum} ne '') {
+ my $clonedom = $env{'form.cloners_dom_'.$actnum};
if (&check_clone($clonedom,$disallowed) eq 'ok') {
$newvalues{$entry} = '*:'.$clonedom;
push(@clonedoms,$newvalues{$entry});
@@ -945,6 +1023,35 @@ sub process_changes {
}
}
$newvalues{$entry} =~ s/,$//;
+ } elsif ($entry eq 'discussion_post_fonts') {
+ my ($classorder,$classtitles) = &discussion_vote_classes();
+ my $fontchange = 0;
+ foreach my $class (@{$classorder}) {
+ my $ext_entry = $entry.'_'.$class;
+ my $size = $env{'form.'.$ext_entry.'_size'};
+ my $unit = $env{'form.'.$ext_entry.'_unit'};
+ my $weight = $env{'form.'.$ext_entry.'_weight'};
+ my $style = $env{'form.'.$ext_entry.'_style'};
+ my $other = $env{'form.'.$ext_entry.'_other'};
+ $size =~ s/,//g;
+ $unit =~ s/,//g;
+ $weight =~ s/,//g;
+ $style =~ s/,//g;
+ $other =~ s/[^\w;:\s\-\%.]//g;
+ $other =~ s/(^\s+|\s+$)//g;
+ $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
+ my $current = $values->{$ext_entry};
+ if ($values->{$ext_entry} eq '') {
+ $current = ',,,';
+ }
+ if ($newvalues{$ext_entry} ne $current) {
+ $changes->{$ext_entry} = $newvalues{$ext_entry};
+ $fontchange ++;
+ }
+ }
+ if ($fontchange) {
+ $changes->{$entry} = 1;
+ }
} elsif ($entry eq 'nothideprivileged') {
my @curr_nothide;
my @new_nothide;
@@ -1000,8 +1107,8 @@ sub process_changes {
$hdr .= $env{'form.printfmthdr_limit_'.$i};
}
$hdr .= $env{'form.printfmthdr_sub_'.$i};
- } elsif ($env{'form.printfmthdr_sub_'.$i} ne '') {
- $hdr = $env{'form.printfmthdr_sub_'.$i};
+ } elsif ($env{'form.printfmthdr_text_'.$i} ne '') {
+ $hdr = $env{'form.printfmthdr_text_'.$i};
}
$newhdr[$env{'form.printfmthdr_pos_'.$i}] = $hdr;
}
@@ -1019,36 +1126,47 @@ sub process_changes {
my $newtext = $maxnum-1;
$newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext};
$newvalues{$entry} = join('',@newhdr);
- } elsif ($entry eq 'languages') {
- my $langstr;
+ } elsif (($entry eq 'languages') ||
+ ($entry eq 'checkforpriv')) {
+ my $settings;
my $total = $env{'form.'.$entry.'_total'};
if ($total) {
my @deletes = &Apache::loncommon::get_env_multiple('form.'.$entry.'_delete');
for (my $i=0; $i<$total; $i++) {
unless (grep(/^$i$/,@deletes)) {
- $langstr .= $env{'form.'.$entry.'_'.$i}.',';
+ $settings .= $env{'form.'.$entry.'_'.$i}.',';
}
}
} else {
$total = 0;
}
if ($env{'form.'.$entry.'_'.$total} ne '') {
- my $newlang = $env{'form.'.$entry.'_'.$total};
- my %langchoices = &get_lang_choices();
- if ($langchoices{$newlang}) {
- $langstr .= $newlang;
+ my $new = $env{'form.'.$entry.'_'.$total};
+ if ($entry eq 'languages') {
+ my %langchoices = &get_lang_choices();
+ if ($langchoices{$new}) {
+ $settings .= $new;
+ } else {
+ $settings =~ s/,$//;
+ $disallowed->{'localization'}{$entry} = $new;
+ }
} else {
- $langstr =~ s/,$//;
- $disallowed->{'localization'}{$entry} = $newlang;
+ my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+ if ($domains{$new}) {
+ $settings .= $new;
+ } else {
+ $settings =~ s/,$//;
+ $disallowed->{'classlists'}{$entry} = $new;
+ }
}
} else {
- $langstr =~ s/,$//;
+ $settings =~ s/,$//;
}
- $newvalues{$entry} = $langstr;
+ $newvalues{$entry} = $settings;
} else {
$newvalues{$entry} = $env{'form.'.$entry};
}
- unless ($entry eq 'co-owners') {
+ unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts')) {
if ($newvalues{$entry} ne $values->{$entry}) {
$changes->{$entry} = $newvalues{$entry};
}
@@ -1175,7 +1293,7 @@ sub store_changes {
my ($displayname,$text);
$text = $prefs->{$item}->{'itemtext'}{$key};
my $displayval;
- unless ($key eq 'co-owners') {
+ unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts')) {
$displayval = $changes->{$item}{$key};
}
if ($item eq 'feedback') {
@@ -1211,6 +1329,36 @@ sub store_changes {
}
$displayval = join(', ',@longroles);
}
+ } elsif ($key eq 'discussion_post_fonts') {
+ my ($classorder,$classtitles)=&discussion_vote_classes();
+ my ($styleorder,$styleitems)=&discussion_vote_styles();
+ my $count = 1;
+ my $total = scalar(keys(%{$changes->{$item}}));
+ foreach my $class (@{$classorder}) {
+ $count ++;
+ next unless ($changes->{$item}{$key.'_'.$class});
+ my @vals = split(/,/,$changes->{$item}{$key.'_'.$class});
+ my $showval = '';
+ for (my $i=0; $i<@{$styleorder}; $i++) {
+ if ($vals[$i] ne '') {
+ $showval .= 'font-'.$styleorder->[$i].': '.$vals[$i].'; ';
+ }
+ }
+ if ($vals[3] ne '') {
+ $showval .= $vals[3];
+ }
+ if ($showval ne '') {
+ $displayval .= $classtitles->{$class}.':{ '.
+ $showval.'}';
+ $storehash{$key.'_'.$class} = $changes->{$item}{$key.'_'.$class};
+ } else {
+ $displayval .= $classtitles->{$class}.': '.&mt('None');
+ push(@delkeys,$key.'_'.$class);
+ }
+ unless ($count == $total) {
+ $displayval .= (' 'x2);
+ }
+ }
}
$displayname = &mt($text);
}
@@ -1296,7 +1444,7 @@ sub store_changes {
if ($key eq 'url') {
my $bkuptime=time;
$output .= (' 'x2).&mt('(Previous URL backed up)').': '.
- $storehash{'top level map backup '.$bkuptime} => $values->{$key};
+ $storehash{'top level map backup '.$bkuptime} = $values->{$key};
}
$output .= '';
}
@@ -1310,7 +1458,9 @@ sub store_changes {
}
}
} else {
- $storehash{$key} = $changes->{$item}{$key};
+ unless ($key eq 'discussion_post_fonts') {
+ $storehash{$key} = $changes->{$item}{$key};
+ }
}
}
if ($key eq 'cloners') {
@@ -1334,9 +1484,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.');
}
}
}
@@ -1511,9 +1661,9 @@ sub get_course {
}
sub get_jscript {
- my ($cdom,$phase,$crstype) = @_;
+ my ($cid,$cdom,$phase,$crstype) = @_;
my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
- my ($jscript,$categorize_js);
+ my ($jscript,$categorize_js,$loncaparev_js);
my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
my $cloners_js = &cloners_javascript($phase);
@@ -1530,9 +1680,25 @@ function catsbrowser() {
}
ENDSCRIPT
}
+ my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
+ if ($loncaparev) {
+ $loncaparev_js = <'.
- "\n".$stubrowse_js."\n";
+ '// '."\n".
+ ''."\n".$stubrowse_js."\n";
return $jscript;
}
@@ -1658,13 +1824,13 @@ sub print_courseinfo {
&mt('Modification may make assessment data inaccessible!').
'',
input => 'textbox',
- size => '40',
+ size => '55',
advanced => 1
},
'description' => {
text => ''.&mt($itemtext->{'description'}).'',
input => 'textbox',
- size => '25',
+ size => '55',
},
'owner' => {
text => ''.&mt($itemtext->{'owner'}).'',
@@ -1682,8 +1848,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'}).'
'.
@@ -1709,27 +1874,38 @@ sub print_courseinfo {
input => 'textbox',
size => '25',
},
+ 'loncaparev' => {
+ text => ''.&mt($itemtext->{'loncaparev'}).'',
+ },
+ 'defaultcredits' => {
+ text => ''.&mt($itemtext->{'defaultcredits'}).'',
+ },
);
my $datatable;
my $count = 0;
foreach my $item (@{$ordered}) {
+ my $colspan;
if ($item eq 'hidefromcat') {
next if (!$can_toggle_cat);
} elsif ($item eq 'categories') {
next if (!$can_categorize);
}
+ unless (($item eq 'cloners') || ($item eq 'rolenames')) {
+ $colspan = 2;
+ }
$count ++;
if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
- $datatable .= &item_table_row_start($items{$item}{text},$count,"advanced");
+ $datatable .= &item_table_row_start($items{$item}{text},$count,"advanced",$colspan);
} else {
- $datatable .= &item_table_row_start($items{$item}{text},$count);
+ $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
}
if ($items{$item}{input} eq 'radio') {
$datatable .= &yesno_radio($item,$settings);
} elsif ($item eq 'cloners') {
my $includeempty = 1;
my $num = 0;
- $datatable .= &Apache::loncommon::start_data_table().
+ $datatable .= ' | '.
+ &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
' | | '.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
- ''.
+ ''.
&Apache::loncommon::start_data_table();
my @cloners;
if ($settings->{$item} eq '') {
@@ -1800,8 +1976,8 @@ sub print_courseinfo {
''.
''.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
- ''.
+ ''.
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
''.
@@ -1812,7 +1988,8 @@ sub print_courseinfo {
' | '.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
} elsif ($item eq 'rolenames') {
- $datatable .= &Apache::loncommon::start_data_table();
+ $datatable .= ''.
+ &Apache::loncommon::start_data_table();
my @roles;
if ($crstype eq 'Community') {
@roles = ('co');
@@ -1832,7 +2009,7 @@ sub print_courseinfo {
}
$datatable .= &Apache::loncommon::end_data_table().' | ';
} elsif ($item eq 'categories') {
- my $launcher = 'onFocus="this.blur();javascript:catsbrowser();";';
+ my $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
$datatable .= ''.
&Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item},
$items{$item}{size},$launcher);
@@ -1846,7 +2023,6 @@ sub print_courseinfo {
} else {
$owner = &mt('None specified');
}
- my $domdesc = &Apache::lonnet::domain($cdom,'description');
$datatable .= $owner;
} elsif ($item eq 'co-owners') {
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -1868,6 +2044,16 @@ sub print_courseinfo {
$datatable .= &manage_coownership($cnum,$cdom,@currcoown);
}
}
+ } elsif ($item eq 'loncaparev') {
+ my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
+ my $showreqd;
+ if ($loncaparev) {
+ $showreqd = &mt('[_1] or newer',$loncaparev).' '.
+ &mt('Details').'';
+ } else {
+ $showreqd = &mt('No specific version required');
+ }
+ $datatable .= $showreqd;
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size});
}
@@ -2025,9 +2211,458 @@ ENDSCRIPT
return;
}
+sub display_loncaparev_constraints {
+ my ($r,$navmap,$loncaparev,$crstype) = @_;
+ my $cid = $env{'request.course.id'};
+ 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);
+ 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 = ('all','section/group','user');
+ my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
+ if (ref($resourcedata) eq 'HASH') {
+ foreach my $key (keys(%{$resourcedata})) {
+ foreach my $item (keys(%checkparms)) {
+ if ($key =~ /(\Q$item\E)$/) {
+ if (ref($checkparms{$item}) eq 'ARRAY') {
+ my $value = $resourcedata->{$key};
+ my ($middle,$scope,$which,$level,$map,$resource);
+ if (grep(/^\Q$value\E$/,@{$checkparms{$item}})) {
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+ my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+ my $valname = &get_param_description($stdtype,$value);
+ my $rev = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value};
+ my $start = $cid.'.';
+ if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
+ $middle = $1;
+ $which = $2;
+ $scope = 'user';
+ } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
+ $middle = $1;
+ $which = $2;
+ $scope = 'section/group';
+ } else {
+ $scope = 'all';
+ }
+ my $what="$stdname=$valname";
+ if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
+ $level = 'general';
+ if ($scope eq 'all') {
+ if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+ unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
+ push(@{$fromparam{$rev}{$scope}},$what);
+ }
+ } else {
+ push(@{$fromparam{$rev}{$scope}},$what);
+ }
+ } else {
+ if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
+ unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
+ push(@{$fromparam{$rev}{$scope}{$which}},$what);
+ }
+ } else {
+ push(@{$fromparam{$rev}{$scope}{$which}},$what);
+ }
+ }
+ $rowspan{$rev} ++;
+ } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) {
+ $level = 'folder';
+ $map = $1;
+ 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);
+ }
+ } else {
+ push(@{$bymap{$map}{$rev}{$scope}},$what);
+ }
+ } else {
+ if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
+ unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
+ push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+ }
+ } else {
+ push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+ }
+ }
+ } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
+ $level = 'resource';
+ $resource = $1;
+ 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);
+ }
+ } else {
+ push(@{$byresource{$resource}{$rev}{$scope}},$what);
+ }
+ } else {
+ if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
+ unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
+ push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+ }
+ } else {
+ push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if (keys(%fromparam)) {
+ $output .= ''.&mt('Requirements from general settings').'
'.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ''.&mt('Release').' | '.&mt('Scope').' | '.
+ ''.&mt('Extent').' | '.&mt('Setting').' | '.
+ &Apache::loncommon::end_data_table_header_row();
+ foreach my $rev (keys(%fromparam)) {
+ $output .= &Apache::loncommon::start_data_table_row().
+ ''.$rev.' | ';
+ my $newrow;
+ foreach my $scope (@scopeorder) {
+ if (ref($fromparam{$rev}{$scope}) eq 'HASH') {
+ if ($newrow) {
+ $output .= &Apache::loncommon::continue_data_table_row();
+ }
+ $output .= ''.$lt{$scope}.' | ';
+ foreach my $which (sort(keys(%{$fromparam{$rev}{$scope}}))) {
+ $output .= ''.$which.' | '.
+ join('
',@{$fromparam{$rev}{$scope}{$which}}).' | ';
+ }
+ $output .= &Apache::loncommon::end_data_table_row();
+ $newrow = 1;
+ } elsif (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+ if ($newrow) {
+ $output .= &Apache::loncommon::continue_data_table_row();
+ }
+ $output .= ''.$lt{$scope}.' | | '.
+ join('
',@{$fromparam{$rev}{$scope}}).' | '.
+ &Apache::loncommon::end_data_table_row();
+ $newrow = 1;
+ }
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table().'
';
+ }
+ }
+
+ if (defined($navmap)) {
+ my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
+ my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+ my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum);
+ my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry'};
+ my $stdtype=&Apache::lonparmset::standard_parameter_types('type');
+ my $stdname=&Apache::lonparmset::standard_parameter_names('type');
+ my $valanon=&get_param_description($stdtype,'anonsurvey');
+ my $valrandtry=&get_param_description($stdtype,'randomizetry');
+
+ foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+ my @parts = @{$res->parts()};
+ my $symb = $res->symb();
+ my $enclosing_map = &Apache::lonnet::declutter($res->enclosing_map_src());
+ foreach my $part (@parts) {
+ if (exists($anonsubms{$symb."\0".$part})) {
+ my $rev = $rev_anonsurv;
+ my $what="$stdname=$valanon";
+ if (ref($bysubmission{$symb}{$rev}) eq 'ARRAY') {
+ unless (grep(/^\Q$what\E/,@{$bysubmission{$symb}{$rev}})) {
+ push(@{$bysubmission{$symb}{$rev}},$what);
+ }
+ } else {
+ push(@{$bysubmission{$symb}{$rev}},$what);
+ }
+ $allmaps{$enclosing_map} = 1;
+ }
+ if (exists($randtrysubms{$symb."\0".$part})) {
+ my $rev = $rev_randtry;
+ my $what="$stdname=$valrandtry";
+ if (ref($bysubmission{$symb}{$rev}) eq 'ARRAY') {
+ unless (grep(/^\Q$what\E/,@{$bysubmission{$symb}{$rev}})) {
+ push(@{$bysubmission{$symb}{$rev}},$what);
+ }
+ } else {
+ push(@{$bysubmission{$symb}{$rev}},$what);
+ }
+ $allmaps{$enclosing_map} = 1;
+ }
+ }
+ my %responses = $res->responseTypes();
+ foreach my $key (keys(%responses)) {
+ if (exists($checkresponsetypes{$key})) {
+ push(@{$byresponsetype{$symb}{$checkresponsetypes{$key}}},$key);
+ $allmaps{$enclosing_map} = 1;
+ }
+ }
+ }
+ if (keys(%byresource) > 0) {
+ foreach my $symb (keys(%byresource)) {
+ my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
+ $allmaps{$map} = 1;
+ }
+ }
+ if (keys(%bymap) > 0) {
+ foreach my $map (keys(%bymap)) {
+ $allmaps{$map} = 1;
+ }
+ }
+ foreach my $map (keys(%allmaps)) {
+ my $mapres = $navmap->getResourceByUrl($map);
+ my $mapsymb = $mapres->symb();
+ $toshow{$mapsymb} = 1;
+ if (ref($mapres)) {
+ my $pcslist = $mapres->map_hierarchy();
+ if ($pcslist ne '') {
+ foreach my $pc (split(/,/,$pcslist)) {
+ my $res = $navmap->getByMapPc($pc);
+ if (ref($res)) {
+ my $symb = $res->symb();
+ unless ($symb eq '______') {
+ $toshow{$symb} = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ my $mapres_header = ''.
+ &mt('Requirements for specific folders or resources').
+ '
';
+ if ((keys(%toshow) > 0) || (keys(%byresource) > 0) ||
+ (keys(%bysubmission) > 0) || (keys(%byresponsetype))) {
+ $output .= $mapres_header;
+ }
+ my $top_header = ''.&mt('LON-CAPA version dependencies').'
';
+ my $title = 'Version Constraints';
+ my $start_page =
+ &Apache::loncommon::start_page($title,undef,{'only_body' => 1,});
+ $r->print($start_page.$top_header);
+ if ($output) {
+ $r->print($output);
+ if (defined($navmap)) {
+ &show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
+ \%byresponsetype,\@scopeorder,\%lt);
+ }
+ $r->print('
');
+ } else {
+ $r->print(''.
+ &mt('No version requirements from resource content or settings.').
+ '
');
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return;
+}
+
+sub show_contents_view {
+ my ($r,$navmap,$cid,$toshow,$bymap,$byresource,$bysubmission,$byresponsetype,
+ $scopeorder,$lt) = @_;
+ if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) ||
+ (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0)) {
+ my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+ my $whitespace = '
';
+ my $icon = '
';
+ my $topmap = $env{'course.'.$cid.'.url'};
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ''.&mt('Location').' | '.&mt('Release').' | '.
+ ''.&mt('Attribute/Setting').' | '.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row().
+ ' '.$icon.' '.&mt('Main Content').' | ');
+ &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;
+ my $depth = 0;
+ my %parent = ();
+ my $startcount = 5;
+ my $lastcontainer = $startcount;
+ while ($curRes = $it->next()) {
+ if ($curRes == $it->BEGIN_MAP()) {
+ $depth++;
+ $parent{$depth}= $lastcontainer;
+ }
+ if ($curRes == $it->END_MAP()) {
+ $depth--;
+ $lastcontainer = $parent{$depth};
+ }
+ my $indent;
+ for (my $i=0; $i<$depth; $i++) {
+ $indent.= $whitespace;
+ }
+ if (ref($curRes)) {
+ my $symb = $curRes->symb();
+ my $ressymb = $symb;
+ my $srcf = $curRes->src();
+ my $title = &Apache::lonnet::gettitle($srcf);
+ if (($curRes->is_sequence()) || ($curRes->is_page())) {
+ next unless($toshow->{$symb});
+ my ($parent,$ind,$url) = &Apache::lonnet::decode_symb($symb);
+ $icon = '';
+ if ($curRes->is_page()) {
+ $icon = '
';
+ }
+ my $rowspan = 1;
+ if (ref($bymap->{$url}) eq 'HASH') {
+ $rowspan = scalar(keys(%{$bymap->{$url}}));
+ }
+ $r->print(&Apache::loncommon::start_data_table_row().
+ ''.$indent.$icon.' '.$title.' | ');
+ &releases_by_map($r,$bymap,$url,$scopeorder,$lt);
+ $r->print(&Apache::loncommon::end_data_table_row());
+ } else {
+ my $rowspan;
+ if (ref($byresource->{$symb}) eq 'HASH') {
+ $rowspan += scalar(keys(%{$byresource->{$symb}}));
+ }
+ if (ref($bysubmission->{$symb}) eq 'HASH') {
+ $rowspan += scalar(keys(%{$bysubmission->{$symb}}));
+ }
+ if (ref($byresponsetype->{$symb}) eq 'HASH') {
+ $rowspan += scalar(keys(%{$byresponsetype->{$symb}}));
+ }
+ next if (!$rowspan);
+ $icon = '
';
+ $r->print(&Apache::loncommon::start_data_table_row().
+ ''.$indent.$icon.' '.$title.' | ');
+ my $newrow;
+ if (ref($byresource->{$symb}) eq 'HASH') {
+ foreach my $rev (sort(keys(%{$byresource->{$symb}}))) {
+ if ($newrow) {
+ $r->print(&Apache::loncommon::continue_data_table_row());
+ }
+ $r->print(''.$rev.' | ');
+ if (ref($byresource->{$symb}{$rev}) eq 'HASH') {
+ $r->print('');
+ foreach my $scope (@{$scopeorder}) {
+ if (ref($byresource->{$symb}{$rev}{$scope}) eq 'HASH') {
+ $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}}).
+ ' | ');
+ }
+ $r->print(' ');
+ } elsif (ref($byresource->{$symb}{$rev}{$scope}) eq 'ARRAY') {
+ $r->print('| '.&mt('Setting - scope: [_1]',$lt->{$scope}).' | '.
+ ' | '.
+ join('
',@{$byresource->{$symb}{$rev}{$scope}}).' | ');
+ }
+ }
+ $r->print(' ');
+ }
+ $r->print(' | ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $newrow = 1;
+ }
+ }
+ if (ref($bysubmission->{$symb}) eq 'HASH') {
+ foreach my $rev (sort(keys(%{$bysubmission->{$symb}}))) {
+ if ($newrow) {
+ $r->print(&Apache::loncommon::continue_data_table_row());
+ }
+ $r->print(''.$rev.' | ');
+ if (ref($bysubmission->{$symb}{$rev}) eq 'ARRAY') {
+ $r->print(&mt('Submissions to: ').' '.
+ join(', ',@{$bysubmission->{$symb}{$rev}}));
+ }
+ $r->print(' | ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $newrow = 1;
+ }
+ }
+ if (ref($byresponsetype->{$symb}) eq 'HASH') {
+ foreach my $rev (sort(keys(%{$byresponsetype->{$symb}}))) {
+ if ($newrow) {
+ $r->print(&Apache::loncommon::continue_data_table_row());
+ }
+ $r->print(''.$rev.' | ');
+ if (ref($byresponsetype->{$symb}{$rev}) eq 'ARRAY') {
+ $r->print(&mt('Response Type(s): ').' '.
+ join('
',@{$byresponsetype->{$symb}{$rev}}));
+ }
+ $r->print(' | ');
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
+ }
+ }
+ }
+ }
+ $r->print(&Apache::loncommon::end_data_table());
+ }
+}
+
+sub releases_by_map {
+ my ($r,$bymap,$url,$scopeorder,$lt) = @_;
+ return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
+ if (ref($bymap->{$url}) eq 'HASH') {
+ foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
+ $r->print(''.$rev.' | ');
+ if (ref($bymap->{$url}{$rev}) eq 'HASH') {
+ $r->print('');
+ foreach my $scope (@{$scopeorder}) {
+ if (ref($bymap->{$url}{$rev}{$scope}) eq 'HASH') {
+ $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}}).
+ ' | ');
+ }
+ $r->print(' ');
+ } elsif (ref($bymap->{$url}{$rev}{$scope}) eq 'ARRAY') {
+ $r->print('| '.&mt('Setting - scope: [_1]',$lt->{$scope}).
+ ' | | '.
+ join('
',@{$bymap->{$url}{$rev}{$scope}}).' | ');
+ }
+ }
+ $r->print(' ');
+ }
+ $r->print(' | ');
+ }
+ } else {
+ $r->print(' | ');
+ }
+ return;
+}
+
+sub get_param_description {
+ my ($stdtype,$value) = @_;
+ my $name = $value;
+ my $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+ unless (ref($paramstrings) eq 'ARRAY') {
+ return $name;
+ }
+ foreach my $possibilities (@{$paramstrings}) {
+ next unless (ref($possibilities) eq 'ARRAY');
+ my ($thing, $description) = @{ $possibilities };
+ if ($thing eq $value) {
+ $name = $description;
+ last;
+ }
+ }
+ return $name;
+}
+
sub show_autocoowners {
my (@currcoown) = @_;
- my $output = ''.&mt('Co-ownership is set automatically when a Course Coordinator role is assigned to official course personnel (from institutional data).').'';
+ my $output = ''.&mt('Co-ownership is set automatically when a Course Coordinator role[_1] is assigned to official course personnel (from institutional data).','
').'';
if (@currcoown > 0) {
$output .= '
'.&mt('Current co-owners are:').' '.
join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } (@currcoown));
@@ -2171,7 +2806,11 @@ sub print_localization {
my $count = 0;
foreach my $item (@{$ordered}) {
$count ++;
- $datatable .= &item_table_row_start($items{$item}{text},$count);
+ my $colspan;
+ unless ($item eq 'languages') {
+ $colspan = 2;
+ }
+ $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'timezone') {
my $includeempty = 1;
my $timezone = &Apache::lonlocal::gettimezone();
@@ -2190,12 +2829,13 @@ sub print_localization {
undef,$includeempty);
} else {
if ($settings->{$item} eq '') {
- $datatable .=
+ $datatable .= ''.
&Apache::loncommon::select_language('languages_0','',1);
} else {
my $num = 0;
my @languages = split(/\s*[,;:]\s*/,$settings->{$item});
- $datatable .= &Apache::loncommon::start_data_table();
+ $datatable .= ' |
'.
+ &Apache::loncommon::start_data_table();
if (@languages > 0) {
my %langchoices = &get_lang_choices();
foreach my $lang (@languages) {
@@ -2222,7 +2862,7 @@ sub print_localization {
&Apache::loncommon::select_language('languages_'.$num,'',1).
''.
' | '.&Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table();
+ &Apache::loncommon::end_data_table().'
';
}
}
$datatable .= &item_table_row_end();
@@ -2284,11 +2924,12 @@ sub print_feedback {
if ($position eq 'top') {
$datatable .= &item_table_row_start($items{$item}{text},$count);
} else {
- $datatable .= &item_table_row_start($items{$item}{text}."
(Custom text)",$count, "advanced");
+ $datatable .= &item_table_row_start($items{$item}{text}."
(Custom text)",$count, "advanced",2);
}
if ($position eq 'top') {
my $includeempty = 0;
- $datatable .= &user_table($cdom,$item,\@sections,
+ $datatable .= ''.
+ &user_table($cdom,$item,\@sections,
$settings->{$item},\%lt);
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
@@ -2308,7 +2949,7 @@ sub user_table {
} else {
my $num = 0;
my @curr = split(/,/,$currvalue);
- $output .= '';
+ $output .= '';
my ($currusers);
foreach my $val (@curr) {
next if ($val eq '');
@@ -2454,6 +3095,11 @@ sub print_discussion {
text => ''.&mt($itemtext->{'allow_discussion_post_editing'}).'',
input => 'checkbox',
},
+ 'discussion_post_fonts' => {
+ text => ''.&mt($itemtext->{'discussion_post_fonts'}).'',
+ input => 'textbox',
+ size => '20',
+ },
);
my $datatable;
my $count;
@@ -2467,32 +3113,52 @@ sub print_discussion {
del => 'Delete?',
sec => 'Sections:',
);
-
foreach my $item (@{$ordered}) {
$count ++;
- $datatable .= &item_table_row_start($items{$item}{text},$count);
+ my $colspan;
+ if ($item eq 'allow_limited_html_in_feedback') {
+ $colspan = 2;
+ }
+ $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'plc.roles.denied') {
- $datatable .= ''.&role_checkboxes($cdom,$cnum,$item,$settings).
+ $datatable .= ''.
+ ''.&role_checkboxes($cdom,$cnum,$item,$settings).
' ';
} elsif ($item eq 'plc.users.denied') {
- $datatable .= &user_table($cdom,$item,undef,
+ $datatable .= ' | '.
+ &user_table($cdom,$item,undef,
$settings->{$item},\%lt);
} elsif ($item eq 'pch.roles.denied') {
- $datatable .= ''.&role_checkboxes($cdom,$cnum,$item,$settings).
+ $datatable .= ''.
+ ''.&role_checkboxes($cdom,$cnum,$item,$settings).
' ';
} elsif ($item eq 'pch.users.denied') {
- $datatable .= &user_table($cdom,$item,undef,
+ $datatable .= ' | '.
+ &user_table($cdom,$item,undef,
$settings->{$item},\%lt);
} elsif ($item eq 'allow_limited_html_in_feedback') {
$datatable .= &yesno_radio($item,$settings);
} elsif ($item eq 'allow_discussion_post_editing') {
- $datatable .= &Apache::loncommon::start_data_table().
+ $datatable .= ' |
'.
+ &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
' | '.&mt('Role').' | '.
&mt('Sections').' | '.
&Apache::loncommon::end_data_table_row().
&role_checkboxes($cdom,$cnum,$item,$settings,1).
- &Apache::loncommon::end_data_table();
+ &Apache::loncommon::end_data_table().'
';
+ } elsif ($item eq 'discussion_post_fonts') {
+ $datatable .= '
'.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row().
+ ' | '.&mt('Sum of likes/dislikes').' | '.
+ ''.&mt('font-size').' | '.
+ ''.&mt('font-weight').' | '.
+ ''.&mt('font-style').' | '.
+ ''.&mt('Other css').' | '.
+ &Apache::loncommon::end_data_table_row().
+ &set_discussion_fonts($cdom,$cnum,$item,$settings).
+ &Apache::loncommon::end_data_table().'
';
}
$datatable .= &item_table_row_end();
}
@@ -2556,7 +3222,7 @@ sub role_checkboxes {
$output .= '';
}
}
- $output .= ' | ';
if ($showsections) {
@@ -2588,7 +3254,7 @@ sub role_checkboxes {
$output .= ' ';
}
}
- $output .= ' | ';
if ($showsections) {
@@ -2614,14 +3280,86 @@ sub role_checkboxes {
return $output;
}
+sub set_discussion_fonts {
+ my ($cdom,$cnum,$item,$settings) = @_;
+ my ($classorder,$classtitles) = &discussion_vote_classes();
+ my ($styleorder,$styleitems) = &discussion_vote_styles();
+ my $output;
+ if (ref($classorder) eq 'ARRAY') {
+ foreach my $cat (@{$classorder}) {
+ my %curr = ();
+ ($curr{'size'},$curr{'weight'},$curr{'style'},$curr{'other'}) =
+ split(/,/,$settings->{'discussion_post_fonts_'.$cat});
+ $output .= &Apache::loncommon::start_data_table_row().
+ ''.$classtitles->{$cat}.' | ';
+ if (ref($styleorder) eq 'ARRAY') {
+ foreach my $item (@{$styleorder}) {
+ $output .= '';
+ my $selitem = $item;
+ if ($item eq 'size') {
+ my ($currsize,$currunit);
+ if ($curr{'size'} =~ /^(\d+)(px|%)$/) {
+ ($currsize,$currunit) = ($1,$2);
+ $curr{'size'} = $currunit;
+ }
+ $output .= ''.
+ ' ';
+ $selitem = 'unit';
+ }
+ if ((ref($styleitems) eq 'HASH') && (ref($styleitems->{$item}) eq 'ARRAY')) {
+ $output .= ' | | ';
+ }
+ $output .= &Apache::loncommon::end_data_table_row();
+ }
+ return $output;
+}
+
+sub discussion_vote_classes {
+ my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
+ my %classtitles = &Apache::lonlocal::texthash(
+ 'twoplus' => 'Two sigma above mean',
+ 'oneplus' => 'One sigma above mean',
+ 'zero' => 'Within one sigma of mean',
+ 'oneminus' => 'One sigma below mean',
+ 'twominus' => 'Two sigma below mean',
+ );
+ return ($classorder,\%classtitles);
+}
+
+sub discussion_vote_styles {
+ my $styleorder = ['size','weight','style'];
+ my $styleitems = {
+ size => ['','px','%','xx-small','x-small','small','medium','large',
+ 'x-large','xx-large','smaller','larger'],
+ weight => ['','normal','bold','bolder','lighter','100','200','300','400',
+ '500','600','700','800','900'],
+ style => ['','normal','italic','oblique'],
+ };
+ return ($styleorder,$styleitems);
+}
+
sub print_classlists {
my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
my @ordered;
if ($position eq 'top') {
@ordered = ('default_enrollment_start_date',
'default_enrollment_end_date');
+ if ($crstype eq 'Course') {
+ push(@ordered,'defaultcredits');
+ }
} elsif ($position eq 'middle') {
- @ordered = ('nothideprivileged');
+ @ordered = ('nothideprivileged','checkforpriv');
} else {
@ordered = ('student_classlist_view',
'student_classlist_opt_in',
@@ -2652,12 +3390,20 @@ sub print_classlists {
text => ''.&mt($itemtext->{'default_enrollment_end_date'}).'',
input => 'dates',
},
-
+ 'defaultcredits' => {
+ text => ''.&mt($itemtext->{'defaultcredits'}).'',
+ },
+
'nothideprivileged' => {
text => ''.&mt($itemtext->{'nothideprivileged'}).'',
input => 'checkbox',
},
+ 'checkforpriv' => {
+ text => ''.&mt($itemtext->{'checkforpriv'}).'',
+ input => 'selectbox',
+ },
+
'student_classlist_view' => {
text => ''.&mt($itemtext->{'student_classlist_view'}).'',
input => 'selectbox',
@@ -2678,7 +3424,7 @@ sub print_classlists {
($settings->{'student_classlist_view'} eq 'section')) {
$settings->{'student_classlist_view'} = 'disabled';
}
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists');
}
sub print_appearance {
@@ -2727,7 +3473,7 @@ sub print_appearance {
size => 40,
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance');
}
sub print_grading {
@@ -2742,11 +3488,12 @@ sub print_grading {
input => 'selectbox',
options => {
standard => &mt('Standard: shows points'),
+ categories => &mt('Categories: shows points according to categories'),
external => &mt('External: shows number of completed parts and totals'),
externalnototals => &mt('External: shows only number of completed parts'),
spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'),
},
- order => ['standard','external','externalnototals','spreadsheet'],
+ order => ['standard','categories','external','externalnototals','spreadsheet'],
},
'rndseed' => {
text => ''.&mt($itemtext->{'rndseed'}).''.
@@ -2763,6 +3510,7 @@ sub print_grading {
'64bit5' => '64bit5',
},
order => ['32bit','64bit','64bit2','64bit3','64bit4','64bit5'],
+ advanced => 1
},
'receiptalg' => {
text => ''.&mt($itemtext->{'receiptalg'}).'
'.
@@ -2774,13 +3522,14 @@ sub print_grading {
receipt3 => 'receipt3',
},
order => ['receipt','receipt2','receipt3'],
+ advanced => 1
},
'disablesigfigs' => {
text => ''.&mt($itemtext->{'disablesigfigs'}).'',
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading');
}
sub print_printouts {
@@ -2812,7 +3561,7 @@ sub print_printouts {
A6 => &mt('A6').' [105x148 mm]',
},
order => ['Letter','Legal','Tabloid','Executive','A2','A3','A4','A5','A6'],
- nullval => 'None specified',
+ nullval => &mt('None specified'),
},
print_header_format => {
text => ''.&mt($itemtext->{'print_header_format'}).'',
@@ -2830,10 +3579,10 @@ sub print_printouts {
0 => &mt('No'),
},
order => ['1','0'],
- nullval => 'None specified - use domain default',
+ nullval => &mt('None specified - use domain default'),
}
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts');
}
sub print_spreadsheet {
@@ -2869,7 +3618,7 @@ sub print_spreadsheet {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet');
}
sub print_bridgetasks {
@@ -2911,7 +3660,7 @@ sub print_bridgetasks {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks');
}
sub print_other {
@@ -2936,7 +3685,7 @@ sub print_other {
input => 'textbox',
size => '30',
};
- my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+ my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other');
}
sub get_other_items {
@@ -2953,7 +3702,8 @@ sub get_other_items {
unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
|| ($parameter eq 'type') ||
- ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)) {
+ ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)
+ || ($parameter =~ m/^discussion_post_fonts/)) {
push(@ordered,$parameter);
}
}
@@ -2962,13 +3712,18 @@ sub get_other_items {
}
sub item_table_row_start {
- my ($text,$count,$add_class) = @_;
+ my ($text,$count,$add_class,$colspan) = @_;
my $output;
- my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
- $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
- $output .= ' '."\n";;
- $output .= '| '.$text.
- ' | ';
+ my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
+ $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
+ $output .= ' | '."\n".
+ '| '.$text.
+ ' | ';
+ if ($colspan) {
+ $output .= '';
+ } else {
+ $output .= ' | ';
+ }
return $output;
}
@@ -3039,15 +3794,35 @@ sub select_from_options {
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
foreach my $item (@{$ordered}) {
$count ++;
- $datatable .= &item_table_row_start($items->{$item}{text},$count);
- if ($item eq 'nothideprivileged') {
+ my $colspan;
+ if ((($caller eq 'classlists') && ($item eq 'nothideprivileged')) ||
+ (($caller eq 'printouts') && ($item ne 'print_header_format'))) {
+ $colspan = 2;
+ }
+ if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) {
+ $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced",$colspan);
+ } else {
+ $datatable .= &item_table_row_start($items->{$item}{text},$count,undef,$colspan);
+ }
+ if ($item eq 'defaultcredits') {
+ my $defaultcredits = $env{'course.'.$env{'request.course.id'}.'.internal.defaultcredits'};
+ my $showcredits;
+ if ($defaultcredits ne '') {
+ $showcredits = &mt('Default is [quant,_1,credit]',$defaultcredits);
+ } else {
+ $showcredits = &mt('No default set');
+ }
+ $datatable .= $showcredits;
+ } elsif ($item eq 'nothideprivileged') {
$datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype);
+ } elsif ($item eq 'checkforpriv') {
+ $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype);
} elsif ($item eq 'print_header_format') {
$datatable .= &print_hdrfmt_row($item,$settings);
} elsif ($items->{$item}{input} eq 'dates') {
@@ -3079,8 +3854,7 @@ sub make_item_rows {
sub nothidepriv_row {
my ($cdom,$item,$settings,$crstype) = @_;
my ($cnum) = &get_course();
- my %nothide;
- my $datatable;
+ my ($datatable,%nothide,@checkdoms);
if (ref($settings) eq 'HASH') {
if ($settings->{$item} ne '') {
foreach my $user (split(/\s*\,\s*/,$settings->{$item})) {
@@ -3091,38 +3865,30 @@ sub nothidepriv_row {
}
}
}
+ if ($settings->{'checkforpriv'}) {
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ }
}
- my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
- my $now = time;
+ push(@checkdoms,$cdom);
+ my %coursepersonnel =
+ &Apache::lonnet::get_my_roles($cnum,$cdom,'',['previous','future','active']);
my @privusers;
- my %privileged;
foreach my $person (keys(%coursepersonnel)) {
- my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
- $user =~ s/:$//;
- my ($end,$start) = split(/:/,$coursepersonnel{$person});
+ my ($uname,$udom,$role) = split(/:/,$person);
+ my $user = $uname.':'.$udom;
+ my ($start,$end) = split(/:/,$coursepersonnel{$person});
if ($end == -1 || $start == -1) {
next;
}
- my ($uname,$udom) = split(':',$user);
- unless (ref($privileged{$udom}) eq 'HASH') {
- my %dompersonnel = &Apache::lonnet::get_domain_roles($udom,['dc'],undef,$now);
- $privileged{$udom} = {};
- if (keys(%dompersonnel)) {
- foreach my $server (keys(%dompersonnel)) {
- foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
- my ($trole,$uname,$udom) = split(/:/,$user);
- $privileged{$udom}{$uname} = $trole;
- }
+ foreach my $dom (@checkdoms) {
+ if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
+ unless (grep(/^\Q$user\E$/,@privusers)) {
+ push(@privusers,$user);
}
}
}
- if (exists($privileged{$udom}{$uname})) {
- unless (grep(/^\Q$user\E$/,@privusers)) {
- push(@privusers,$user);
- }
- }
}
- if (@privusers) {
+ if (@privusers > 0) {
$datatable .= '';
foreach my $user (sort(@privusers)) {
my $hideon = ' checked="checked" ';
@@ -3154,6 +3920,65 @@ sub nothidepriv_row {
return $datatable;
}
+sub checkforpriv_row {
+ my ($cdom,$item,$settings,$crstype) = @_;
+ my $datatable;
+ my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+ if (keys(%domains) == 1) {
+ $datatable = '| '.
+ &mt("Course's domain is only domain");
+ return $datatable;
+ }
+ my @excdoms = ($cdom);
+ my $num = 0;
+ if ($settings->{$item} eq '') {
+ $datatable = ' | '.
+ &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,
+ 1,1,undef,undef,\@excdoms);
+ } else {
+ my @privdoms = split(/,/,$settings->{$item});
+ my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+ $datatable = ' |
'.
+ &Apache::loncommon::start_data_table();
+ if (@privdoms > 0) {
+ foreach my $currdom (@privdoms) {
+ next unless ($domains{$currdom});
+ my $domdesc = &Apache::lonnet::domain($currdom,'description');
+ if ($domdesc eq '') {
+ $domdesc = $currdom;
+ }
+ $datatable .=
+ &Apache::loncommon::start_data_table_row().
+ ' | '.
+ &mt('Domain:').' '.$domdesc.
+ '
'.
+ ' | '.
+ &Apache::loncommon::end_data_table_row();
+ $num ++;
+ unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+ push(@excdoms,$currdom);
+ }
+ }
+ }
+ if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
+ $datatable .=
+ &Apache::loncommon::start_data_table_row().
+ ''.
+ &mt('Additional domain:'). '
'.
+ &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,1,
+ 1,undef,undef,\@excdoms).
+ ' | '.&Apache::loncommon::end_data_table_row();
+ }
+ $datatable .= &Apache::loncommon::end_data_table().
+ ''.
+ '
';
+ }
+ return $datatable;
+}
+
sub print_hdrfmt_row {
my ($item,$settings) = @_;
my @curr;
@@ -3226,7 +4051,8 @@ function getIndexByName(item) {
ENDJS
- $output .= $currstr.'';
+ $output .= '
'.
+ $currstr.'';
if (@curr > 0) {
for (my $i=0; $i<@curr; $i++) {
my $pos = $i+1;
@@ -3266,7 +4092,7 @@ ENDJS
''.
''.
- ' ';
+ ' |
';
return $output;
}
@@ -3301,7 +4127,7 @@ sub substitution_selector {
a => 'assignment note',
);
my $output .= &mt('Substitution').'
'.
- ' | | |