--- loncom/interface/courseprefs.pm 2023/12/29 19:44:06 1.49.2.28.2.19
+++ loncom/interface/courseprefs.pm 2023/09/02 12:51:32 1.126
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.49.2.28.2.19 2023/12/29 19:44:06 raeburn Exp $
+# $Id: courseprefs.pm,v 1.126 2023/09/02 12:51:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -412,7 +412,7 @@ sub handler {
my @prefs_order = ('courseinfo','localization','feedback','discussion',
'classlists','appearance','grading','printouts',
'menuitems','ltitools','linkprot','spreadsheet',
- 'bridgetasks','other');
+ 'bridgetasks','lti','other');
my %prefs = (
'courseinfo' =>
{ text => $lt{'gens'},
@@ -463,6 +463,7 @@ sub handler {
{ text => 'Discussion and Chat',
help => 'Course_Prefs_Discussions',
ordered => ['pch.roles.denied','pch.users.denied',
+ 'pac.roles.denied','pac.users.denied',
'plc.roles.denied','plc.users.denied',
'allow_limited_html_in_feedback',
'allow_discussion_post_editing',
@@ -472,6 +473,8 @@ sub handler {
'pch.users.denied' => 'No Resource Discussion',
'plc.roles.denied' => 'No Chat room use',
'plc.users.denied' => 'No Chat room use',
+ 'pac.roles.denied' => 'No Anonymous Resource Discussion',
+ 'pac.users.denied' => 'No Anonymous Resource Discussion',
allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
allow_discussion_post_editing => 'Users can edit/delete own discussion posts',
discussion_post_fonts => 'Discussion post fonts based on likes/unlikes',
@@ -540,7 +543,7 @@ sub handler {
help => 'Course_Prefs_Printouts',
ordered => ['problem_stream_switch','suppress_tries',
'default_paper_size','print_header_format',
- 'disableexampointprint'],
+ 'disableexampointprint','canuse_pdfforms'],
itemtext => {
problem_stream_switch => 'Allow problems to be split over pages',
suppress_tries => 'Suppress number of tries in printing',
@@ -574,6 +577,18 @@ sub handler {
suppress_embed_prompt => 'Hide upload references prompt if uploading file to portfolio',
},
},
+ 'lti' =>
+ {
+ text => 'LTI provider settings',
+ help => 'Course_Prefs_LTIProvider',
+ ordered => ['lti.override','lti.topmenu','lti.inlinemenu','lti.lcmenu'],
+ itemtext => {
+ 'lti.override' => 'Override domain defaults',
+ 'lti.topmenu' => 'Display LON-CAPA page header',
+ 'lti.inlinemenu' => 'Display LON-CAPA inline menu',
+ 'lti.lcmenu' => 'Menu items',
+ },
+ },
'menuitems' =>
{
text => 'Menu display',
@@ -807,7 +822,7 @@ sub print_config_box {
} elsif ($action eq 'appearance') {
$output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'grading') {
- $output .= &print_grading($cdom,$cnum,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'printouts') {
$output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'spreadsheet') {
@@ -820,6 +835,8 @@ sub print_config_box {
$currtools = $settings->{'ltitools'};
}
$output .= &print_ltitools($cdom,$cnum,$currtools,\$rowtotal,$crstype,$noedit,'course');
+ } elsif ($action eq 'lti') {
+ $output .= &print_lti($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'menuitems') {
$output .= &print_menuitems('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'linkprot') {
@@ -1260,7 +1277,8 @@ sub process_changes {
}
}
}
- } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied')) {
+ } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied') ||
+ ($entry eq 'pac.roles.denied')) {
my @denied = &Apache::loncommon::get_env_multiple('form.'.$entry);
@denied = sort(@denied);
my $deniedstr = '';
@@ -1268,7 +1286,8 @@ sub process_changes {
$deniedstr = join(',',@denied);
}
$newvalues{$entry} = $deniedstr;
- } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied')) {
+ } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied') ||
+ ($entry eq 'pac.users.denied')) {
my $total = $env{'form.'.$entry.'_total'};
my $userstr = '';
my @denied;
@@ -1456,6 +1475,38 @@ sub process_changes {
$settings =~ s/,$//;
}
$newvalues{$entry} = $settings;
+ } elsif ($action eq 'lti') {
+ if ($entry eq 'lti.override') {
+ $newvalues{$entry} = $env{'form.'.$entry};
+ } elsif (($entry eq 'lti.topmenu') || ($entry eq 'lti.inlinemenu')) {
+ if ($env{'form.lti.override'}) {
+ $newvalues{$entry} = $env{'form.'.$entry};
+ } else {
+ $newvalues{$entry} = '';
+ }
+ } elsif ($entry eq 'lti.lcmenu') {
+ if (($env{'form.lti.override'}) &&
+ (($env{'form.lti.topmenu'}) || ($env{'form.lti.inlinemenu'}))) {
+ my @lcmenu = &Apache::loncommon::get_env_multiple('form.lti.lcmenu');
+ my @newlcmenu;
+ if (@lcmenu) {
+ my @menuitems = ('fullname','coursetitle','role','logout','grades');
+ foreach my $item (@menuitems) {
+ next if (($item eq 'grades') && (!$newvalues{'lti.inlinemenu'}));
+ if (grep(/^\Q$item\E$/,@lcmenu)) {
+ push(@newlcmenu,$item);
+ }
+ }
+ }
+ if (@newlcmenu) {
+ $newvalues{$entry} = join(',',@newlcmenu);
+ } else {
+ $newvalues{$entry} = 'none';
+ }
+ } else {
+ $newvalues{$entry} = '';
+ }
+ }
} elsif ($entry eq 'extresource') {
if ($env{'form.'.$entry} =~ /^iframe|tab|window$/) {
$newvalues{$entry} = $env{'form.'.$entry};
@@ -1499,33 +1550,6 @@ sub process_changes {
} elsif ($values->{$entry}) {
$changes->{$entry} = '';
}
- } elsif ($entry eq 'grading') {
- if ($env{'form.'.$entry} eq 'standard') {
- if ($env{'form.hidetotals'}) {
- my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
- if (keys(%sections)) {
- my @secs = &Apache::loncommon::get_env_multiple('form.hidetotals_sections');
- if (grep(/^all$/,@secs)) {
- $newvalues{'hidetotals'} = 'all';
- } elsif (@secs) {
- $newvalues{'hidetotals'} = '';
- foreach my $sec (sort {$a <=> $b} @secs) {
- if (exists($sections{$sec})) {
- $newvalues{'hidetotals'} .= $sec.','
- }
- }
- $newvalues{'hidetotals'} =~ s/,$//;
- }
- } else {
- $newvalues{'hidetotals'} = 'all';
- }
- }
- }
- if ($newvalues{'hidetotals'} ne $values->{'hidetotals'}) {
- $changes->{'hidetotals'} = $newvalues{'hidetotals'};
- $changes->{'grading'} = $env{'form.'.$entry};
- }
- $newvalues{$entry} = $env{'form.'.$entry};
} else {
$newvalues{$entry} = $env{'form.'.$entry};
}
@@ -2607,40 +2631,6 @@ sub store_changes {
unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts') || ($key eq 'extresource')) {
$displayval = $changes->{$item}{$key};
}
- if (($item eq 'grading') && ($key eq 'grading')) {
- if ($displayval eq 'standard') {
- my $hidetotals;
- if (exists($changes->{$item}{'hidetotals'})) {
- if ($changes->{$item}{'hidetotals'} eq '') {
- if (exists($values->{'hidetotals'})) {
- push(@delkeys,'hidetotals');
- }
- } else {
- $hidetotals = $changes->{$item}{'hidetotals'};
- }
- } elsif (exists($values->{'hidetotals'})) {
- $hidetotals = $values->{'hidetotals'};
- }
- if ($hidetotals eq '') {
- $displayval = &mt('standard with "hide course totals" set to "No"');
- if (exists($values->{'hidetotals'})) {
- push(@delkeys,'hidetotals');
- }
- } elsif ($hidetotals =~ /^([\w,]+)$/) {
- my $secstr = $1;
- my @secs = split(/,/,$secstr);
- if (grep(/^all$/,@secs)) {
- $displayval = &mt('standard with "hide course totals" set to "Yes" for all users');
- $hidetotals = 'all';
- } else {
- $displayval = &mt('standard with "hide course totals" set to "Yes" for users in section(s): [_1]',join(', ',@secs));
- }
- $storehash{'hidetotals'} = $hidetotals;
- }
- } elsif (exists($values->{'hidetotals'})) {
- push(@delkeys,'hidetotals');
- }
- }
if ($item eq 'feedback') {
if ($key =~ /^(question|policy|comment)(\.email)\.text$/) {
$text = $prefs->{$item}->{'itemtext'}{$1.$2};
@@ -2718,6 +2708,22 @@ sub store_changes {
}
}
$displayname = &mt($text);
+ } elsif ($item eq 'lti') {
+ if ($key eq 'lti.lcmenu') {
+ if ($changes->{$item}{$key} eq 'none') {
+ $displayval = &mt('None of the configurable menu items displayed');
+ } else {
+ my %ltititles = <imenu_titles();
+ $displayval = join(', ', map { $ltititles{$_}; } split(/,/,$changes->{$item}{$key}));
+ }
+ } else {
+ if ($changes->{$item}{$key} eq '1') {
+ $displayval = &mt('Yes');
+ } elsif ($changes->{$item}{$key} eq '') {
+ $displayval = &mt('No');
+ }
+ }
+ $displayname = &mt($text);
} elsif ($item eq 'menuitems') {
unless ($changes->{$item}{$key} eq '') {
if ($key eq 'menudefault') {
@@ -2822,7 +2828,20 @@ sub store_changes {
}
} elsif ($changes->{$item}{$key} eq '') {
push(@delkeys,$key);
- if ($item eq 'menuitems') {
+ if ($item eq 'lti') {
+ if (($key eq 'lti.override') || (($key ne 'lti.override') && ($env{'form.lti.override'} ne ''))) {
+ if (($key eq 'lti.lcmenu') &&
+ ((!$env{'form.lti.topmenu'}) && (!$env{'form.lti.inlinemenu'}))) {
+ $output .= '<li>'.&mt('LTI settings for menu items only saved if page header and/or inline menu is set to be displayed').'</li>';
+ } else {
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
+ '<i>'.$displayname.'</i>',
+ "'<b>$displayval</b>'")).'</li>';
+ }
+ } elsif (!exists($changes->{$item}{'lti.override'})) {
+ $output .= '<li>'.&mt('LTI settings only saved if Override is set to "Yes"').'</li>';
+ }
+ } elsif ($item eq 'menuitems') {
if ($key eq 'menudefault') {
$output .= '<li>'.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'</li>';
} elsif ($key eq 'menucollections') {
@@ -2875,7 +2894,9 @@ sub store_changes {
}
if (($key eq 'description') || ($key eq 'cloners') ||
($key eq 'hidefromcat') || ($key eq 'categories') ||
- ($key eq 'co-owners')) {
+ ($key eq 'co-owners') || ($key eq 'lti.override') ||
+ ($key eq 'lti.topmenu') || ($key eq 'lti.inlinemenu') ||
+ ($key eq 'lti.lcmenu')) {
push(@need_env_update,$key);
}
}
@@ -3334,6 +3355,8 @@ sub update_env {
my @coowners = split(',',$storehash->{'internal.'.$key});
$crsinfo{$env{'request.course.id'}}{'co-owners'} = \@coowners;
$count ++;
+ } elsif ($key =~ /^lti\./) {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash->{$key}});
}
}
if ($count) {
@@ -3568,7 +3591,7 @@ function syllabusinfo() {
}
}
ENDSCRIPT
- my ($menuitems_js,$grading_js);
+ my $menuitems_js;
unless ($noedit) {
my $collections;
my $next = 1;
@@ -3650,48 +3673,6 @@ function toggleAddmenucoll() {
}
}
ENDSCRIPT
- $grading_js = <<"ENDSCRIPT";
-function toggleGrading(form) {
- if (document.getElementById('hidetotalsdiv')) {
- var totalsdivid = document.getElementById('hidetotalsdiv');
- var selname = form.elements['grading'];
- if (selname) {
- var current = selname.options[selname.selectedIndex].value
- if (current == 'standard') {
- totalsdivid.style.display = 'inline-block';
- } else {
- totalsdivid.style.display = 'none';
- }
- }
- }
- return;
-}
-
-function toggleHiddenTotalsSec(form) {
- if (document.getElementById('sectotalsdiv')) {
- var sectotalsdivid = document.getElementById('sectotalsdiv');
- var radioname = form.elements['hidetotals'];
- if (radioname) {
- if (radioname.length > 0) {
- var setvis;
- for (var i=0; i<radioname.length; i++) {
- if (radioname[i].checked == true) {
- if (radioname[i].value == 1) {
- sectotalsdivid.style.display = 'inline-block';
- setvis = 1;
- }
- break;
- }
- }
- if (!setvis) {
- sectotalsdivid.style.display = 'none';
- }
- }
- }
- }
- return;
-}
-ENDSCRIPT
}
$extresource_js = <<"ENDSCRIPT";
function toggleExtRes() {
@@ -3740,7 +3721,7 @@ ENDSCRIPT
$browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
$cloners_js."\n".$instcode_js."\n".$localization_js."\n".
$syllabus_js."\n".$menuitems_js."\n".$extresource_js."\n".
- $grading_js."\n".&linkprot_javascript()."\n".'//]]>'."\n".
+ &linkprot_javascript()."\n".'//]]>'."\n".
'</script>'."\n".$stubrowse_js."\n".$ltitools_js."\n";
return $jscript;
}
@@ -4464,116 +4445,160 @@ sub display_loncaparev_constraints {
$Apache::lonrelrequtils::checkcrstypes{$crstype}).'</h4>';
}
my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
- %byresponsetype,%bysubmission,%fromblocks);
+ %byresponsetype,%bysubmission,%fromblocks,%bycrsrestype);
@scopeorder = ('all','section/group','user');
my $now = time;
my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
if (ref($resourcedata) eq 'HASH') {
foreach my $key (keys(%{$resourcedata})) {
+ my %found;
foreach my $item (keys(%Apache::lonrelrequtils::checkparms)) {
if ($key =~ /(\Q$item\E)$/) {
- if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
- my $value = $resourcedata->{$key};
- if ($item eq 'examcode') {
- if (&Apache::lonnet::validCODE($value)) {
- $value = 'valid';
- } else {
- $value = '';
- }
- } elsif ($item eq 'printstartdate') {
- if ($value =~ /^\d+$/) {
- if ($value > $now) {
- $value = 'future';
- }
- }
- } elsif ($item eq 'printenddate') {
- if ($value =~ /^\d+$/) {
- if ($value < $now) {
- $value = 'past';
- }
- }
-
- }
- my ($middle,$scope,$which,$level,$map,$resource);
- if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::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 (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
+ my $value = $resourcedata->{$key};
+ if ($item eq 'examcode') {
+ if (&Apache::lonnet::validCODE($value)) {
+ $value = 'valid';
+ } else {
+ $value = '';
+ }
+ } elsif ($item eq 'printstartdate') {
+ if ($value =~ /^\d+$/) {
+ if ($value > $now) {
+ $value = 'future';
+ }
+ }
+ } elsif ($item eq 'printenddate') {
+ if ($value =~ /^\d+$/) {
+ if ($value < $now) {
+ $value = 'past';
+ }
+ }
+ }
+ if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+ $found{$item}{'valname'} = &get_param_description($stdtype,$value);
+ $found{$item}{'rev'} = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value.'::'};
+ }
+ }
+ }
+ }
+ foreach my $item (keys(%Apache::lonrelrequtils::checkparmvalsmatch)) {
+ if (ref($Apache::lonrelrequtils::checkparmvalsmatch{$item}) eq 'ARRAY') {
+ my $value = $resourcedata->{$key};
+ foreach my $valuematch (@{$Apache::lonrelrequtils::checkparmvalsmatch{$item}}) {
+ if ($value =~ /$valuematch/) {
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+ $found{$item}{'valname'} = &get_param_description($stdtype,$value,1);
+ $found{$item}{'rev'} =
+ $Apache::lonnet::needsrelease{'parameter:'.$item.'::'.$valuematch.':'};
+ last;
+ }
+ }
+ }
+ }
+ foreach my $item (keys(%Apache::lonrelrequtils::checkparmnamesmatch)) {
+ my $regexp;
+ if ($item eq 'maplevelrecurse') {
+ $regexp = '\.(?:sequence|page)___\(rec\)\.';
+ }
+ if ($regexp ne '') {
+ if ($key =~ /$regexp.*\.(\w+)$/) {
+ my $name = $1;
+ my $value = $resourcedata->{$key};
+ if ($name eq 'type') {
+ last unless (($value eq 'problem') || ($value eq 'practice') || ($value eq 'exam') ||
+ ($value eq 'survey') || ($value eq 'surveycred') || ($value eq 'anonsurvey') ||
+ ($value eq 'anonsurveycred') || ($value eq 'randomizetry') || ($value eq 'library'));
+ }
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($name);
+ $found{$name}{'valname'} = &get_param_description($stdtype,$value);
+ $found{$name}{'extra'} = &mt('Recursive into sub-folders');
+ $found{$name}{'rev'} =
+ $Apache::lonnet::needsrelease{'parameter::::'.$item};
+ }
+ }
+ }
+ foreach my $item (keys(%found)) {
+ my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+ my $rev = $found{$item}{'rev'};
+ my $valname = $found{$item}{'valname'};
+ my $extra = $found{$item}{'extra'};
+ my ($middle,$scope,$which,$level,$map,$resource);
+ 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 ($extra) {
+ $what .= "<br/>$extra<br />";
+ }
+ 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|rec)\).\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);
}
}
}
@@ -4691,18 +4716,25 @@ sub display_loncaparev_constraints {
if (defined($navmap)) {
my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
- my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+ 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 $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry::'};
+ my $rev_exttool=$Apache::lonnet::needsrelease{'course:courserestype:exttool'};
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');
my %checkedrev;
- foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+ foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0)) {
my @parts = @{$res->parts()};
my $symb = $res->symb();
my $enclosing_map = &Apache::lonnet::declutter($res->enclosing_map_src());
+ if ($res->is_tool()) {
+ my $rev = $rev_exttool;
+ $bycrsrestype{$symb}{$rev} = &mt('External Tool');
+ $allmaps{$enclosing_map} = 1;
+ next;
+ }
foreach my $part (@parts) {
if (exists($anonsubms{$symb."\0".$part})) {
my $rev = $rev_anonsurv;
@@ -4790,6 +4822,7 @@ sub display_loncaparev_constraints {
}
}
}
+ my $supptools = &Apache::lonnet::count_supptools($cnum,$cdom,1,1);
my $mapres_header = '<h4>'.
&mt('Requirements for specific folders or resources').
'</h4>';
@@ -4804,9 +4837,9 @@ sub display_loncaparev_constraints {
$r->print($start_page.$top_header);
if ($output) {
$r->print($output);
- if (defined($navmap)) {
+ if (defined($navmap) || $supptools) {
&show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
- \%byresponsetype,\@scopeorder,\%lt);
+ \%byresponsetype,\%bycrsrestype,\@scopeorder,\%lt,$supptools);
}
$r->print('<br /><br />');
} else {
@@ -4824,22 +4857,30 @@ sub display_loncaparev_constraints {
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 = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
- my $icon = '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+ $bycrsrestype,$scopeorder,$lt,$supptools) = @_;
+ my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+ my $whitespace = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
+ my $showmaincontent;
+ if ((ref($navmap)) &&
+ ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) ||
+ (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0) ||
+ (keys(%{$bycrsrestype}) > 0))) {
+ $showmaincontent = 1;
+ }
+ if ($showmaincontent || $supptools) {
+ $r->print(&Apache::loncommon::start_data_table());
+ }
+ if ($showmaincontent) {
+ my $icon = '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
my $topmap = $env{'course.'.$cid.'.url'};
- $r->print(&Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
+ $r->print(&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Location').'</th><th>'.&mt('Release').'</th>'.
'<th>'.&mt('Attribute/Setting').'</th>'.
&Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row().
'<td> '.$icon.' '.&mt('Main Content').'</td>');
- &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
- $r->print(&Apache::loncommon::end_data_table_row());
+ &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;
@@ -4890,6 +4931,9 @@ sub show_contents_view {
if (ref($byresponsetype->{$symb}) eq 'HASH') {
$rowspan += scalar(keys(%{$byresponsetype->{$symb}}));
}
+ if (ref($bycrsrestype->{$symb}) eq 'HASH') {
+ $rowspan += scalar(keys(%{$bycrsrestype->{$symb}}));
+ }
next if (!$rowspan);
$icon = '<img class="LC_contentImage" src="'.$location.'/problem.gif" alt="'.
&mt('Problem').'" />';
@@ -4954,10 +4998,37 @@ sub show_contents_view {
$r->print('</td>');
}
$r->print(&Apache::loncommon::end_data_table_row());
+ $newrow = 1;
+ }
+ if (ref($bycrsrestype->{$symb}) eq 'HASH') {
+ foreach my $rev (sort(keys(%{$bycrsrestype->{$symb}}))) {
+ if ($newrow) {
+ $r->print(&Apache::loncommon::continue_data_table_row());
+ }
+ $r->print('<td>'.$rev.'</td><td>'.$bycrsrestype->{$symb}{$rev}.'</td>');
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
}
}
+ }
+ if ($supptools) {
+ my $icon = '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+ $r->print(&Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Location').'</th><th>'.&mt('Release').'</th>'.
+ '<th>'.&mt('Resource Type').'</th>'.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row().
+ '<td> '.$icon.' '.&mt('Supplemental Content').'</td>'.
+ '<td valign="middle">'.
+ $Apache::lonrelrequtils::exttool{'major'}.'.'.
+ $Apache::lonrelrequtils::exttool{'minor'}.
+ '</td><td>'.&mt('[quant,_1,External Tool,External Tools]',
+ $supptools).'</td>'.
+ &Apache::loncommon::end_data_table_row());
+ }
+ if ($showmaincontent || $supptools) {
$r->print(&Apache::loncommon::end_data_table());
}
return;
@@ -5003,18 +5074,67 @@ sub releases_by_map {
}
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;
+ my ($stdtype,$value,$regexp) = @_;
+ my ($name,$parammatches,$paramstrings,@possibles);
+ if ($stdtype =~ /^string/) {
+ $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+ } elsif ($stdtype eq 'date_interval') {
+ $paramstrings = &Apache::lonparmset::standard_interval_options($stdtype);
+ }
+ if ($regexp) {
+ if ($stdtype =~ /^string/) {
+ $parammatches = &Apache::lonparmset::standard_string_matches($stdtype);
+ } elsif ($stdtype eq 'date_interval') {
+ $parammatches = &Apache::lonparmset::standard_interval_matches($stdtype);
+ }
+ if (ref($parammatches) eq 'ARRAY') {
+ @possibles = @{$parammatches};
+ } else {
+ undef($regexp);
+ $name = $value;
+ }
}
- foreach my $possibilities (@{$paramstrings}) {
+ unless ($regexp) {
+ $name = $value;
+ if (ref($paramstrings) eq 'ARRAY') {
+ @possibles = @{$paramstrings};
+ } else {
+ if (($stdtype eq 'date_start') || ($stdtype eq 'date_end')) {
+ if ($name == 0) {
+ $name = &mt('Never');
+ } elsif (($name ne '') && ($name !~ /\D/)) {
+ $name = &Apache::lonlocal::locallocaltime($name);
+ }
+ }
+ return $name;
+ }
+ }
+ foreach my $possibilities (@possibles) {
next unless (ref($possibilities) eq 'ARRAY');
- my ($thing, $description) = @{ $possibilities };
- if ($thing eq $value) {
- $name = $description;
- last;
+ my $gotregexmatch = '';
+ if ($regexp) {
+ last if ($gotregexmatch);
+ my ($item,$pattern) = @{ $possibilities };
+ if ($value =~ /$pattern/) {
+ if (ref($paramstrings) eq 'ARRAY') {
+ foreach my $possibles (@{$paramstrings}) {
+ next unless (ref($possibles) eq 'ARRAY');
+ my ($thing,$description) = @{$possibles};
+ if ($thing eq $item) {
+ $name = $description;
+ $gotregexmatch = 1;
+ last;
+ }
+ }
+ last if ($gotregexmatch);
+ }
+ }
+ } else {
+ my ($thing,$description) = @{ $possibilities };
+ if ($thing eq $value) {
+ $name = $description;
+ last;
+ }
}
}
return $name;
@@ -5450,7 +5570,7 @@ sub select_recipient {
}
sub select_sections {
- my ($item,$num,$sections,$selected,$noedit,$allval) = @_;
+ my ($item,$num,$sections,$selected,$noedit) = @_;
my ($output,@currsecs,$allsec,$disabled);
if (ref($selected) eq 'ARRAY') {
@currsecs = @{$selected};
@@ -5466,24 +5586,16 @@ sub select_sections {
my $mult;
if (@{$sections} > 1) {
$mult = ' multiple="multiple"';
- my $size;
if (@{$sections} > 3) {
- $size = 4;
- } else {
- $size = 1 + scalar(@{$sections});
+ $mult .= ' size="4"';
}
- $mult .= ' size="'.$size.'"';
- }
- my $name = $item.'_sections';
- unless ($item eq 'hidetotals') {
- $name .= '_'.$num;
}
- $output = '<select name="'.$name.'"'.$mult.$disabled.'>'.
- ' <option value="'.$allval.'"'.$allsec.'>'.&mt('All').'</option>';
+ $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.$disabled.'>'.
+ ' <option value=""'.$allsec.'>'.&mt('All').'</option>';
foreach my $sec (@{$sections}) {
my $is_sel;
if ((@currsecs) && (grep(/^\Q$sec\E$/,@currsecs))) {
- $is_sel = ' selected="selected"';
+ $is_sel = 'selected="selected"';
}
$output .= '<option value="'.$sec.'"'.$is_sel.'>'.$sec.'</option>';
}
@@ -5524,6 +5636,20 @@ sub print_discussion {
&mt('(specific user(s))'),
input => 'checkbox',
},
+
+ 'pac.roles.denied' => {
+ text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pac.roles.denied'}).'</b>'.
+ &Apache::loncommon::help_open_topic("Course_Disable_Anonymous_Discussion").'</span><br />'.
+ &mt('(role-based)'),
+ input => 'checkbox',
+ },
+
+ 'pac.users.denied' => {
+ text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pac.users.denied'}).'</b><br />'.
+ &mt('(specific user(s))'),
+ input => 'checkbox',
+ },
+
'allow_limited_html_in_feedback' => {
text => '<b>'.&mt($itemtext->{'allow_limited_html_in_feedback'}).'</b>',
input => 'radio',
@@ -5574,6 +5700,14 @@ sub print_discussion {
$datatable .= '</td><td align="right">'.
&user_table($cdom,$item,undef,
$settings->{$item},\%lt,$noedit);
+ } elsif ($item eq 'pac.roles.denied') {
+ $datatable .= '</td><td align="right">'.
+ '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+ '</table>';
+ } elsif ($item eq 'pac.users.denied') {
+ $datatable .= '</td><td align="right">'.
+ &user_table($cdom,$item,undef,
+ $settings->{$item},\%lt,$noedit);
} elsif ($item eq 'allow_limited_html_in_feedback') {
$datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
} elsif ($item eq 'allow_discussion_post_editing') {
@@ -5945,7 +6079,7 @@ sub print_appearance {
}
sub print_grading {
- my ($cdom,$cnum,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -5956,15 +6090,16 @@ 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 => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
- '<br /><span class="LC_warning LC_nobreak">'.'<br />'.
+ '<span class="LC_warning">'.'<br />'.
&mt('Modifying this will make problems have different numbers and answers!').
'</span>',
input => 'selectbox',
@@ -5996,7 +6131,7 @@ sub print_grading {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit,$cnum);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit);
}
sub print_printouts {
@@ -6677,6 +6812,134 @@ sub ltitools_names {
return %lt;
}
+sub print_lti {
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
+ return;
+ }
+ my @menuitems = ('fullname','coursetitle','role','logout','grades');
+ my %menutitles = <imenu_titles();
+ my ($domdefs,$displaydefs);
+ if ($env{'request.lti.login'}) {
+ my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+ my @domdefsmenu;
+ if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+ if ($lti{$env{'request.lti.login'}}{'topmenu'}) {
+ $domdefs = &mt('Header shown').', ';
+ }
+ if ($lti{$env{'request.lti.login'}}{'inlinemenu'}) {
+ $domdefs .= &mt('Inline menu shown');
+ }
+ $domdefs =~ s/,\s$//;
+ if (!$domdefs) {
+ $domdefs = &mt('No header or inline menu shown');
+ }
+ $domdefs = ' ('.&mt('Domain default').': '.$domdefs.')';
+ if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
+ @domdefsmenu = @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
+ }
+ }
+ $displaydefs = &mt('Domain defaults');
+ if (@domdefsmenu) {
+ my @diffs = &Apache::loncommon::compare_arrays(\@menuitems,\@domdefsmenu);
+ if (@diffs) {
+ my $missing;
+ foreach my $item (@menuitems) {
+ unless (grep(/^\Q$item\E$/,@domdefsmenu)) {
+ $missing .= ' '.$menutitles{$item}.',';
+ }
+ }
+ $missing =~ s/,$//;
+ $displaydefs .= ': '.&mt('Not shown').' --'.$missing;
+ } else {
+ $displaydefs .= ': '.&mt('All shown');
+ }
+ } else {
+ $displaydefs .= ': '.&mt('Not shown').' -- '.join(', ', map { $menutitles{$_}; } @menuitems);
+ }
+ } else {
+ $displaydefs = &mt('Domain defaults only available in LTI context');
+ }
+ my %items = (
+ 'lti.override' => {
+ text => '<b>'.&mt($itemtext->{'lti.override'}).'</b>'.$domdefs,
+ input => 'radio',
+ },
+ 'lti.topmenu' => {
+ text => '<b>'.&mt($itemtext->{'lti.topmenu'}).'</b>',
+ input => 'radio',
+ },
+ 'lti.inlinemenu' => {
+ text => '<b>'.&mt($itemtext->{'lti.inlinemenu'}).'</b>',
+ input => 'radio',
+ },
+ 'lti.lcmenu' => {
+ text => '<b>'.&mt($itemtext->{'lti.lcmenu'}).'</b><br />'.$displaydefs,
+ input => 'custom',
+ },
+ );
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'lti',$noedit);
+}
+
+sub lcmenu_checkboxes {
+ my ($cdom,$caller,$settings,$crstype,$noedit) = @_;
+ my @menuitems = ('fullname','coursetitle','role','logout','grades');
+ my %menutitles = <imenu_titles();
+ my (@current,@domdefs);
+ if ($env{'request.lti.login'}) {
+ my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+ if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+ if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
+ @domdefs = @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
+ }
+ }
+ }
+ if (ref($settings) eq 'HASH') {
+ if ($settings->{'lti.lcmenu'}) {
+ unless ($settings->{'lti.lcmenu'} eq 'none') {
+ @current = split(',',$settings->{'lti.lcmenu'});
+ }
+ } else {
+ @current = @domdefs;
+ }
+ } else {
+ @current = @domdefs;
+ }
+ my $numinrow = 3;
+ my $count = 0;
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
+ my $output = '<table>';
+ foreach my $item (@menuitems) {
+ my $checked = '';
+ if (grep(/^\Q$item\E$/,@current)) {
+ $checked = ' checked="checked" ';
+ }
+ my $rem = $count%($numinrow);
+ if ($rem == 0) {
+ if ($count > 0) {
+ $output .= '</tr>';
+ }
+ $output .= '<tr>';
+ }
+ $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" '.
+ 'name="lti.lcmenu" value="'.$item.'"'.$checked.$disabled.'/> '.
+ $menutitles{$item}.'</label></span></td>';
+ $count ++;
+ }
+ my $rem = $count%($numinrow);
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1 ) {
+ $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+ ' </td>';
+ } elsif ($colsleft == 1) {
+ $output .= '<td class="LC_left_item"> </td>';
+ }
+ $output .= '</tr></table>';
+}
+
sub ltimenu_titles {
return &Apache::lonlocal::texthash(
fullname => 'Full name',
@@ -6826,8 +7089,8 @@ sub menuitems_categories {
my %categories = (
shown => ['top','inline','foot','main'],
text => ['name','role','crs','disc','fdbk'],
- links => ['pers','logo','comm','roles','help','logout'],
- list => ['about','prefs','port','wish','anno','rss','srch','brse'],
+ links => ['pers','logo','menu','comm','roles','help','logout'],
+ list => ['about','prefs','port','wish','anno','rss'],
inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
);
return (\@order,\%categories);
@@ -6851,6 +7114,7 @@ sub menuitems_fields {
main => 'Access to main menu',
pers => 'Personal',
logo => 'LON-CAPA',
+ menu => 'Home',
comm => 'Messages',
roles => 'Roles/Courses',
help => 'Help',
@@ -6866,8 +7130,6 @@ sub menuitems_fields {
wish => 'Stored Links',
anno => 'Calendar',
rss => 'RSS Feeds',
- srch => 'Search Library',
- brse => 'Browse Library',
cont => 'Contents',
grades => 'Grades',
chat => 'Chat',
@@ -7448,7 +7710,7 @@ sub item_table_row_end {
}
sub yesno_radio {
- my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit,$onclick,$reverse) = @_;
+ my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit) = @_;
my $itemon = ' ';
my $itemoff = ' checked="checked" ';
if (($valueyes eq '') && ($valueno eq '')) {
@@ -7470,22 +7732,12 @@ sub yesno_radio {
my $disabled;
if ($noedit) {
$disabled = ' disabled="disabled"';
- } elsif ($onclick) {
- $onclick = ' onclick="'.$onclick.'"';
- }
- if ($reverse) {
- return '<span class="LC_nobreak"><label>'.
- '<input type="radio" name="'.$item.'"'.
- $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label> '.
- '<label><input type="radio" name="'.$item.'"'.
- $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label></span>';
- } else {
- return '<span class="LC_nobreak"><label>'.
- '<input type="radio" name="'.$item.'"'.
- $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label> '.
- '<label><input type="radio" name="'.$item.'"'.
- $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label></span>';
}
+ return '<span class="LC_nobreak"><label>'.
+ '<input type="radio" name="'.$item.'"'.
+ $itemon.' value="'.$valueyes.'"'.$disabled.' />'.&mt('Yes').'</label> '.
+ '<label><input type="radio" name="'.$item.'"'.
+ $itemoff.' value="'.$valueno.'"'.$disabled.' />'.&mt('No').'</label></span>';
}
sub select_from_options {
@@ -7541,7 +7793,7 @@ sub select_from_options {
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit,$cnum) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
@@ -7578,6 +7830,8 @@ sub make_item_rows {
$datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype,$noedit);
} elsif ($item eq 'print_header_format') {
$datatable .= &print_hdrfmt_row($item,$settings,$noedit);
+ } elsif ($item eq 'lti.lcmenu') {
+ $datatable .= &lcmenu_checkboxes($cdom,$item,$settings,$crstype,$noedit);
} elsif ($item eq 'extresource') {
$datatable .= &print_extresource_row($item,$items->{$item},$settings->{$item},$noedit);
} elsif ($items->{$item}{input} eq 'dates') {
@@ -7597,68 +7851,21 @@ sub make_item_rows {
}
$valueyes = "1";
$valueno = "0";
+ } elsif (($item eq 'lti.topmenu') || ($item eq 'lti.inlinemenu')) {
+ $valueyes = '1';
}
$datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
} elsif ($items->{$item}{input} eq 'selectbox') {
- my ($id,$onchange);
+ my $id;
if ($caller eq 'menuitems') {
$id = $item;
- } elsif ($caller eq 'grading') {
- if ($item eq 'grading') {
- $onchange = ' onchange="javascript:toggleGrading(this.form);"';
- $id = $item;
- }
}
my $curr = $settings->{$item};
$datatable .=
&select_from_options($item,$items->{$item}{'order'},
$items->{$item}{'options'},$curr,
$items->{$item}{'nullval'},
- undef,undef,$onchange,$noedit,$id);
- if ($item eq 'grading') {
- my ($unsetdefault,$valueyes,$valueno,$sectionbox);
- my $gradingsty = 'none';
- my $gradingsecsty = 'none';
- $unsetdefault = 0;
- my (@selsec,@sections,%current);
- if ($curr eq 'standard') {
- $gradingsty = 'inline-block';
- if (ref($settings) eq 'HASH') {
- $current{'hidetotals'} = $settings->{'hidetotals'};
- if ($settings->{'hidetotals'} =~ /^([\w,]+)$/) {
- my $secstr = $1;
- unless ($secstr eq 'all') {
- @selsec = split(/,/,$secstr);
- }
- $current{'hidetotals'} = 1;
- }
- }
- }
- $valueyes = "1";
- $valueno = "0";
- my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
- if (keys(%sections)) {
- @sections = sort( { $a <=> $b } keys(%sections));
- }
- my $onclick = 'javascript:toggleHiddenTotalsSec(this.form);';
- my $sectionbox = '<div id="sectotalsdiv" style="display:'.$gradingsecsty.'; float:right">';
- my $reverse = 1;
- if (@sections) {
- $sectionbox .= ' ... '.&mt('hidden in sections').': '.
- '<div style="position: relative; top: 0%;">'.
- &select_sections('hidetotals','',\@sections,\@selsec,$noedit,'all').
- '</div>';
- }
- $sectionbox .= '</div>';
- $datatable .= '<fieldset id="hidetotalsdiv" style="display:'.$gradingsty.';">'.
- '<legend style="font-weight: normal;">'.
- &mt('Hide Course Points Totals').'</legend>'.
- '<div style="position: relative; top: 0%; float:left">'.
- &yesno_radio('hidetotals',\%current,$unsetdefault,$valueyes,$valueno,$noedit,
- $onclick,$reverse).'</div>'.
- $sectionbox.
- '</fieldset><div style="padding:0;clear:both;margin:0;border:0"></div>';
- }
+ undef,undef,undef,$noedit,$id);
} elsif ($items->{$item}{input} eq 'textbox') {
my $disabled;
if ($noedit) {