';
$editsyllabus = &mt('[_1]Edit[_2]','',
- ' ');
+ '');
}
my %items = (
'url' => {
@@ -3993,7 +2636,7 @@ sub print_courseinfo {
next if (!$env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'});
}
unless (($item eq 'cloners') || ($item eq 'rolenames')) {
- $colspan = 2;
+ $colspan = 2;
}
$count ++;
if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
@@ -4176,12 +2819,12 @@ sub print_courseinfo {
if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
if ($clonesrcinfo{'description'}) {
- $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
+ $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
}
}
$datatable .= $clonedfrom;
} elsif ($item eq 'uniquecode') {
- my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
+ my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
if ($code) {
$datatable .= $code;
}
@@ -4228,12 +2871,12 @@ sub print_courseinfo {
} elsif ($uploaded) {
$datatable .= &mt('Uploaded file');
} else {
- $datatable .= &mt('Standard template');
+ $datatable .= &mt('Standard template');
}
$datatable .= (' ' x 2).
&mt('[_1]View[_2]',
'',
- ' ');
+ '');
} elsif ($item eq 'loncaparev') {
my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
my $showreqd;
@@ -4258,7 +2901,7 @@ sub new_cloners_dom_row {
my ($output,$checkedon,$checkedoff);
if ($newdom ne '') {
if ($num eq $default) {
- $checkedon = 'checked="checked" ';
+ $checkedon = 'checked="checked" ';
} else {
$checkedoff = 'checked="checked" ';
}
@@ -4409,7 +3052,7 @@ ENDSCRIPT
sub display_loncaparev_constraints {
my ($r,$navmap,$loncaparev,$crstype) = @_;
- my ($reqdmajor,$reqdminor);
+ my ($reqdmajor,$reqdminor);
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
@@ -4426,116 +3069,160 @@ sub display_loncaparev_constraints {
$Apache::lonrelrequtils::checkcrstypes{$crstype}).'';
}
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 .= "'.$rev.' '.$lt{$type}.' ';
@@ -4653,18 +3340,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;
@@ -4715,7 +3409,7 @@ sub display_loncaparev_constraints {
&Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
$reqdmajor,$reqdminor);
$checkedrev{$key} = 1;
- }
+ }
push(@{$byresponsetype{$symb}{$rev}},$key);
$allmaps{$enclosing_map} = 1;
}
@@ -4752,6 +3446,10 @@ sub display_loncaparev_constraints {
}
}
}
+ my $suppmap = 'supplemental.sequence';
+ my ($suppcount,$supptools,$errors) = (0,0,0);
+ ($suppcount,$supptools,$errors) = &Apache::loncommon::recurse_supplemental($cnum,$cdom,
+ $suppmap,$suppcount,$supptools,$errors);
my $mapres_header = ''.
&mt('Requirements for specific folders or resources').
' ';
@@ -4766,9 +3464,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(' '.&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());
+ &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;
@@ -4852,6 +3558,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 = ''.$rev.' '.$bycrsrestype->{$symb}{$rev}.' ');
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
}
}
+ }
+ if ($supptools) {
+ my $icon = ''.&mt('Location').' '.&mt('Release').' '.
+ ''.&mt('Resource Type').' '.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row().
+ ' '.$icon.' '.&mt('Supplemental Content').' '.
+ ''.
+ $Apache::lonrelrequtils::exttool{'major'}.'.'.
+ $Apache::lonrelrequtils::exttool{'minor'}.
+ ' '.&mt('[quant,_1,External Tool,External Tools]',
+ $supptools).' '.
+ &Apache::loncommon::end_data_table_row());
+ }
+ if ($showmaincontent || $supptools) {
$r->print(&Apache::loncommon::end_data_table());
}
return;
@@ -4928,7 +3664,7 @@ sub show_contents_view {
sub releases_by_map {
my ($r,$bymap,$url,$scopeorder,$lt) = @_;
return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
- my $newrow = 0;
+ my $newrow = 0;
if (ref($bymap->{$url}) eq 'HASH') {
foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
if ($newrow) {
@@ -4965,18 +3701,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;
+ }
+ }
+ 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 (@{$paramstrings}) {
+ 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;
@@ -5021,7 +3806,7 @@ sub coowner_invitations {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -5085,7 +3870,7 @@ sub manage_coownership {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -5171,23 +3956,9 @@ sub print_localization {
if ($item eq 'timezone') {
my $includeempty = 1;
my $timezone = &Apache::lonlocal::gettimezone();
- my $onchange;
- unless ($noedit) {
- $onchange = ' onchange="javascript:toggleTimeZone();"';
- }
- my $id = ' id="LC_set_timezone"';
$datatable .=
- &Apache::loncommon::select_timezone($item,$timezone,$onchange,
- $includeempty,$id,$disabled);
- my $tzsty = 'none';
- if ($timezone ne '') {
- $tzsty = 'block';
- }
- $datatable .= ''.
- ''.
- &mt('Override individual user preference?').
- &yesno_radio('tzover',$settings,undef,1,'',$noedit).
- '
';
+ &Apache::loncommon::select_timezone($item,$timezone,undef,
+ $includeempty,$disabled);
} elsif ($item eq 'datelocale') {
my $includeempty = 1;
my $locale_obj = &Apache::lonlocal::getdatelocale();
@@ -5200,7 +3971,7 @@ sub print_localization {
undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
+ unless ($noedit) {
$datatable .= ''.
&Apache::loncommon::select_language('languages_0','',1);
}
@@ -5237,8 +4008,8 @@ sub print_localization {
&Apache::loncommon::select_language('languages_'.$num,'',1).
' '.&Apache::loncommon::end_data_table_row();
- }
- $datatable .= &Apache::loncommon::end_data_table().''.&mt($itemtext->{'pac.roles.denied'}).' '.
+ &Apache::loncommon::help_open_topic("Course_Disable_Anonymous_Discussion").''.&mt($itemtext->{'pac.users.denied'}).' '.&mt($itemtext->{'allow_limited_html_in_feedback'}).' ',
input => 'radio',
@@ -5510,7 +4295,7 @@ sub print_discussion {
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 .= ''.
@@ -5528,6 +4313,14 @@ sub print_discussion {
$datatable .= ' '.
&user_table($cdom,$item,undef,
$settings->{$item},\%lt,$noedit);
+ } elsif ($item eq 'pac.roles.denied') {
+ $datatable .= ' '.
+ ''.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+ '
';
+ } elsif ($item eq 'pac.users.denied') {
+ $datatable .= ' '.
+ &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') {
@@ -5547,7 +4340,7 @@ sub print_discussion {
' '.&mt('font-size').' '.
''.&mt('font-weight').' '.
''.&mt('font-style').' '.
- ''.&mt('Other css').' '.
+ ''.&mt('Other css').' '.
&Apache::loncommon::end_data_table_row().
&set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
&Apache::loncommon::end_data_table().''.&mt($itemtext->{'defaultcredits'}).' ',
},
-
+
'nothideprivileged' => {
text => ''.&mt($itemtext->{'nothideprivileged'}).' ',
input => 'checkbox',
@@ -5884,16 +4677,6 @@ sub print_appearance {
text => ''.&mt($itemtext->{'inline_chem'}).' ',
input => 'radio',
},
- 'extresource' => {
- text => ''.&mt($itemtext->{'extresource'}).' ',
- input => 'selectbox',
- options => {
- iframe => 'In iframe',
- tab => 'In new tab',
- window => 'In pop-up window',
- },
- order => ['iframe','tab','window'],
- },
);
return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance',$noedit);
}
@@ -5910,11 +4693,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'}).' '.
@@ -6084,551 +4868,132 @@ sub print_bridgetasks {
return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
}
-sub print_ltitools {
- my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
- my ($datatable,$disabled,$css_class,$dest);
- if ($noedit) {
- $disabled = ' disabled="disabled"';
+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 $itemcount = 1;
- unless ($context eq 'domain') {
- my %tooltypes = &Apache::loncommon::usable_exttools();
- unless ($tooltypes{'crs'}) {
- my $showtype = 'course';
- if ($crstype eq 'Community') {
- $showtype = lc($crstype);
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable = ''.
- &mt("Definition of external tools is not enabled for this $showtype.").''.$cdom.' ').
- ''.$cdom.' ');
+ $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 => ''.&mt($itemtext->{'lti.override'}).' '.$domdefs,
+ input => 'radio',
+ },
+ 'lti.topmenu' => {
+ text => ''.&mt($itemtext->{'lti.topmenu'}).' ',
+ input => 'radio',
+ },
+ 'lti.inlinemenu' => {
+ text => ''.&mt($itemtext->{'lti.inlinemenu'}).' ',
+ input => 'radio',
+ },
+ 'lti.lcmenu' => {
+ text => ''.&mt($itemtext->{'lti.lcmenu'}).' '
- .'';
- for (my $k=0; $k<=$maxnum; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $i) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
- }
- $datatable .= ' '.(' 'x2).
- ' '.
- ''.&mt('Required settings').' '.
- ''.$lt{'title'}.': '.
- (' 'x2).
- ''.$lt{'version'}.':'.
- '1.1 '.
- (' 'x2).
- ''.$lt{'msgtype'}.':'.
- 'Launch '.
- (' 'x2).
- ''.$lt{'sigmethod'}.':'.
- 'HMAC-SHA1 '.
- 'HMAC-SHA256 '.
- ''.$lt{'url'}.': '.
- (' 'x2).
- ''.$lt{'lifetime'}.':'.
- ' '.$lt{'key'};
- if ($noedit) {
- $datatable .= ': ['.&mt('not shown').']';
- } elsif ($switchserver) {
- $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
- } else {
- $datatable .= ': '.(' 'x2);
- } elsif (!$switchserver) {
- $datatable .= ''.$lt{'key'}.':'.
- ' '.(' 'x2);
- }
- if ($switchserver) {
- if ($usable ne '') {
- $datatable .= '
'.
- $lt{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change secret?').
- '
'.
- ' - '.$switchmessage.' '.
- '';
- } elsif ($key eq '') {
- $datatable .= ''.&mt('Key and Secret are required').' - '.$switchmessage.' '."\n";
- } else {
- $datatable .= ''.&mt('Secret required').' - '.$switchmessage.' '."\n";
- }
- $datatable .= '
'.
- $lt{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change?').
- '
'.
- ''.&mt('New Secret').':'.
- ' ';
- } else {
- $datatable .=
- ''.$lt{'secret'}.':'.
- ' ';
- }
- }
- $datatable .= ''.&mt('Optional settings').' '.
- ''.&mt('Display target:');
- my %currdisp;
- if (ref($settings->{$item}->{'display'}) eq 'HASH') {
- if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
- $currdisp{'window'} = ' checked="checked"';
- } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
- $currdisp{'tab'} = ' checked="checked"';
- } else {
- $currdisp{'iframe'} = ' checked="checked"';
- }
- if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
- $currdisp{'width'} = $1;
- }
- if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
- $currdisp{'height'} = $1;
- }
- $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
- $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
- } else {
- $currdisp{'iframe'} = ' checked="checked"';
- }
- foreach my $disp ('iframe','tab','window') {
- $datatable .= ''.$lt{$dimen}.' '.
- ' '.
- (' 'x2);
- }
- $datatable .= ' '.$lt{'linktext'}.'
'.
- ''.$lt{'explanation'}.'
'.$lt{$extra}.' '.
- '
'.
- '
';
- }
- $datatable .= ''.$lt{'icon'}.': ';
- if ($imgsrc) {
- $datatable .= $imgsrc.
- ' '.
- ' '.&mt('Replace:').' ';
- } else {
- $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').') ';
- }
- if ($switchserver) {
- $datatable .= &mt('Upload to library server: [_1]',$switchserver);
- } else {
- $datatable .= ' '.&mt('User data sent on launch').' '.
- '';
- my $userfieldstyle = 'display:none;';
- my $seluserdom = '';
- my $unseluserdom = ' selected="selected"';
- foreach my $field (@fields) {
- my ($checked,$onclick,$id,$spacer);
- if ($checkedfields{$field}) {
- $checked = ' checked="checked"';
- }
- if ($field eq 'user') {
- $id = ' id="ltitools_user_field_'.$i.'"';
- $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"';
- if ($checked) {
- $userfieldstyle = 'display:inline-block';
- if ($userincdom) {
- $seluserdom = $unseluserdom;
- $unseluserdom = '';
- }
- }
- } else {
- $spacer = (' ' x2);
- }
- $datatable .= ''.
- ' '.$spacer;
- }
- $datatable .= ' ';
- $datatable .= ''.
- ' : '.
- ''.
- ''.&mt('Select').' '.
- ''.&mt('username').' '.
- ''.&mt('username:domain').' '.
- '
';
- $datatable .= ''.&mt('Role mapping').' ';
- foreach my $role (@courseroles) {
- my ($selected,$selectnone);
- if (!$rolemaps{$role}) {
- $selectnone = ' selected="selected"';
- }
- $datatable .= ''.
- &Apache::lonnet::plaintext($role,'Course').''.
- ''.&mt('Select').' ';
- foreach my $ltirole (@ltiroles) {
- unless ($selectnone) {
- if ($rolemaps{$role} eq $ltirole) {
- $selected = ' selected="selected"';
- } else {
- $selected = '';
- }
- }
- $datatable .= ''.$ltirole.' ';
- }
- $datatable .= ' ';
- }
- $datatable .= '
'.&mt('Configurable in course').' ';
- foreach my $item ('label','title','target','linktext','explanation','append') {
- my $checked;
- if ($courseconfig{$item}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '."\n";
- }
- $datatable .= ' '.&mt('Custom items sent on launch').' '.
- ' ';
+ 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 .= '';
+ }
+ $output .= '';
+ }
+ $output .= ' '."\n".
- '';
- for (my $k=0; $k<$maxnum+1; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $maxnum) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
- }
- $datatable .= ' '."\n".
- ' '.
- ''.&mt('Required settings').' '.
- ''.$lt{'title'}.': '."\n".
- (' 'x2).
- ''.$lt{'version'}.':'.
- '1.1 '."\n".
- (' 'x2).
- ''.$lt{'msgtype'}.':'.
- 'Launch '.
- ''.$lt{'sigmethod'}.':'.
- 'HMAC-SHA1 '.
- 'HMAC-SHA256 '.
- ''.$lt{'url'}.': '."\n".
- (' 'x2).
- ''.$lt{'lifetime'}.': '.&mt('Key and Secret are required').' - '.$switchmessage.' '."\n";
- } else {
- $datatable .= ''.$lt{'key'}.': '."\n".
- (' 'x2).
- ''.$lt{'secret'}.': '."\n";
- }
- $datatable .= ''.&mt('Optional settings').' '.
- ''.&mt('Display target:');
- my %defaultdisp;
- $defaultdisp{'iframe'} = ' checked="checked"';
- foreach my $disp ('iframe','tab','window') {
- $datatable .= ''.$lt{$dimen}.' '.
- ' '.
- (' 'x2);
- }
- $datatable .= ' '.$lt{'linktext'}.'
'.
- ''.$lt{'explanation'}.'
'.$lt{$extra}.' '.
- ' '.(' 'x2).''.
- '
'.
- '
';
- }
- $datatable .= ''.$lt{'icon'}.': '.
- '('.&mt('if larger than 21x21 pixels, image will be scaled').') ';
- if ($switchserver) {
- $datatable .= &mt('Upload to library server: [_1]',$switchserver);
- } else {
- $datatable .= ' '.
+ ' ';
+ } elsif ($colsleft == 1) {
+ $output .= ' ';
}
- $datatable .= ''.&mt('User data sent on launch').' '.
- '';
- foreach my $field (@fields) {
- my ($id,$onclick,$spacer);
- if ($field eq 'user') {
- $id = ' id="ltitools_user_field_add"';
- $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"';
- } else {
- $spacer = (' ' x2);
- }
- $datatable .= ''.
- ' '.$spacer;
- }
- $datatable .= ' '.
- ''.
- ' : '.
- ''.
- ''.&mt('Select').' '.
- ''.&mt('username').' '.
- ''.&mt('username:domain').' '.
- '
'.&mt('Role mapping').' ';
- foreach my $role (@courseroles) {
- my ($checked,$checkednone);
- $datatable .= ''.
- &Apache::lonnet::plaintext($role,'Course').''.
- ''.&mt('Select').' ';
- foreach my $ltirole (@ltiroles) {
- $datatable .= ''.$ltirole.' ';
- }
- $datatable .= ' ';
- }
- $datatable .= '
'.&mt('Configurable in course').' ';
- foreach my $item ('label','title','target','linktext','explanation','append') {
- $datatable .= ''.
- ' '.(' ' x2)."\n";
- }
- $datatable .= ' '.&mt('Custom items sent on launch').' '.
- ' '."\n".
- '
';
}
sub ltimenu_titles {
@@ -6780,7 +5145,7 @@ sub menuitems_categories {
my %categories = (
shown => ['top','inline','foot','main'],
text => ['name','role','crs','disc','fdbk'],
- links => ['pers','logo','comm','roles','help','logout'],
+ links => ['pers','logo','menu','comm','roles','help','logout'],
list => ['about','prefs','port','wish','anno','rss'],
inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
);
@@ -6805,6 +5170,7 @@ sub menuitems_fields {
main => 'Access to main menu',
pers => 'Personal',
logo => 'LON-CAPA',
+ menu => 'Home',
comm => 'Messages',
roles => 'Roles/Courses',
help => 'Help',
@@ -6875,7 +5241,7 @@ sub menucollections_display {
''.$menutitles{$category}.' '."\n";
if ($category eq 'text') {
$output .= ''.&mt('Header Text').' '.&mt('Footer Text').' '.
' ';
- my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
- $onclickpassback,%checkedpassback,$passbacksty,%checkedpassbackfmt);
- $passbacksty = 'none';
- $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','$i'".');"';
- %checkedpassback = (
- 'no' => ' checked="checked"',
- 'yes' => '',
- );
- %checkedpassbackfmt = (
- '1p1' => ' checked="checked"',
- '1p0' => '',
- );
- if ($values{'passback'} ne '') {
- $passbacksty = 'inline-block';
- $checkedpassback{'yes'} = ' checked="checked"';
- $checkedpassback{'no'} = '';
- if ($values{'passbackformat'} eq '1.0') {
- $checkedpassbackfmt{'1p0'} = ' checked="checked"';
- $checkedpassbackfmt{'1p1'} = '';
- }
- }
- if ($ltiauth) {
- $usersty = 'display:none';
- $onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','$i'".');"';
- %checkedrequser = (
- no => ' checked="checked"',
- yes => '',
- );
- if ($values{'requser'}) {
- $checkedrequser{'yes'} = $checkedrequser{'no'};
- $checkedrequser{'no'} = '';
- }
- $datatable .= ''.$lt{'requ'}.' ';
- if ($values{'requser'}) {
- $usersty = 'display:inline-block';
- }
- }
- $onclickreturnurl = ' onclick="toggleLinkProtExtra(this.form,'."'returnurl','divurlparam','1','inline-block','$i'".');"';
- %checkedreturnurl = (
- no => ' checked="checked"',
- yes => '',
- );
- if ($values{'returnurl'} ne '') {
- $checkedreturnurl{'yes'} = $checkedreturnurl{'no'};
- $checkedreturnurl{'no'} = '';
- }
- $datatable .=
- ''.$desc{'name'}.
- ': '.
+ &mt('Delete?').' '.
+ ''.$lt{'name'}.
+ ': '.
(' 'x2).
- ''.$desc{'version'}.':'.
+ ''.$lt{'version'}.':'.
'1.1 '."\n".
(' 'x2).
- ''.$desc{'lifetime'}.': '.$desc{'key'};
- if ($noedit) {
- $datatable .= ': ['.&mt('not shown').']';
- } elsif ($switchserver) {
- $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
- } else {
- $datatable .= ': '.(' 'x2);
- } elsif (!$switchserver) {
- $datatable .= ''.$desc{'key'}.':'.
- ' '.(' 'x2);
- }
- if ($switchserver) {
- if ($values{'usable'} ne '') {
- $datatable .= '
'.
- $desc{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change secret?').
- '
'.
- ' - '.$switchmessage.' '.
- '';
- } elsif ($values{'key'} eq '') {
- $datatable .= ''.&mt('Key and Secret are required').' - '.$switchmessage.' '."\n";
- } else {
- $datatable .= ''.&mt('Secret required').' - '.$switchmessage.' '."\n";
- }
- $datatable .= '
'.
- $desc{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change?').
- '
'.
- ''.&mt('New Secret').':'.
- ' ';
- } else {
- $datatable .=
- ''.$desc{'secret'}.':'.
- ' ';
- }
- }
- $datatable .= ''.$desc{'passback'}.'?'.
- '
'.
- ''.&mt('Grade format').
- ' '.
- '
'.
- ''.$desc{'returnurl'}.'?'.
- ' '.
- '
'.
- ''.&mt('Parameter name').':'.
- ' ';
- if ($ltiauth) {
- $datatable .= (' 'x2).''.$desc{'requser'}.'?'.
- ' '.
- ''.
- ''.$lt{'opti'}.' '.
- &linkprot_options($i,$itemcount,$disabled,\%values,\%desc).
- ''.$lt{'lifetime'}.': '.
+ ''.$lt{'key'}.
+ ': '.
+ (' 'x2).
+ ''.$lt{'secret'}.':'.
+ ' '.
+ '';
$itemcount ++;
}
}
@@ -7114,213 +5324,34 @@ sub print_linkprotection {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .= ''."\n".
' ';
- my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
- $onclickpassback,%checkedpassback,%checkedpassbackfmt);
- if ($ltiauth) {
- $usersty = 'display:none';
- $onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','add'".');"';
- %checkedrequser = (
- no => ' checked="checked"',
- yes => '',
- );
- $datatable .= ''.$lt{'requ'}.' ';
- }
- $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','add'".');"';
- %checkedpassback = (
- 'no' => ' checked="checked"',
- 'yes' => '',
- );
- %checkedpassbackfmt = (
- '1p1' => ' checked="checked"',
- '1p0' => '',
- );
- $onclickreturnurl = ' onclick="toggleLinkProtExtra(this.form,'."'returnurl','divurlparam','1','inline-block','add'".');"';
- %checkedreturnurl = (
- no => ' checked="checked"',
- yes => '',
- );
- $datatable .= ''.$desc{'name'}.
- ': '."\n".
+ ' '."\n".
+ ''.
+ ''.$lt{'name'}.
+ ': '."\n".
(' 'x2).
- ''.$desc{'version'}.':'.
+ ''.$lt{'version'}.':'.
'1.1 '."\n".
(' 'x2).
- ''.$desc{'lifetime'}.': '."\n".
- ''.&mt('Key and Secret are required').' - '.$switchmessage.' '."\n";
- } else {
- $datatable .= ''.$desc{'key'}.': '."\n".
- (' 'x2).
- ''.$desc{'secret'}.': '."\n";
- }
- $datatable .= ''.$desc{'passback'}.'?'.
- ' '.
- '
'.
- ''.&mt('Grade format').
- ' '.
- '
'.
- ''.$desc{'returnurl'}.'?'.
- ' '.
- '
'.
- ''.&mt('Parameter name').':'.
- ' ';
- if ($ltiauth) {
- $datatable .= (' 'x2).''.$desc{'requser'}.'?'.
- ' '.
- ''.
- ''.$lt{'opti'}.' '.
- &linkprot_options('add',$itemcount,$disabled,{},\%desc).
- ' '.$lt{'lifetime'}.': '."\n".
+ ''.$lt{'key'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'secret'}.': '."\n".
+ '';
$$rowtotal ++;
- return $datatable;
+ return $datatable;;
}
sub linkprot_names {
- return &Apache::lonlocal::texthash(
+ my %lt = &Apache::lonlocal::texthash(
'version' => 'LTI Version',
'key' => 'Key',
'lifetime' => 'Nonce lifetime (s)',
- 'name' => 'Launcher Application',
+ 'name' => 'Launcher Application Name',
'secret' => 'Secret',
- 'passback' => 'Can return grades to Launcher',
- 'returnurl' => 'Launcher return URL',
- 'requser' => 'Use identity',
- 'email' => 'Email address',
- 'sourcedid' => 'User ID',
- 'other' => 'Other',
- 'auth' => 'Display LON-CAPA login page',
- 'reject' => 'Discontinue launch process',
);
-}
-
-sub check_switchserver {
- my ($cdom,$cnum,$context,$dest) = @_;
- my ($allowed,$switchserver,$home);
- if ($context eq 'domain') {
- $home = &Apache::lonnet::domain($cdom,'primary');
- } else {
- $home = &Apache::lonnet::homeserver($cnum,$cdom);
- }
- unless (($home eq 'no_host') || ($home eq '')) {
- my @ids=&Apache::lonnet::current_machine_ids();
- foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
- if (!$allowed) {
- $switchserver=''.&mt('Switch Server').' ';
- }
- }
- return $switchserver;
-}
-
-sub linkprot_options {
- my ($num,$itemcount,$disabled,$current,$desc) = @_;
- my %lt;
- if (ref($desc) eq 'HASH') {
- %lt = %{$desc};
- }
- my $userfieldsty = 'none';
- my (%checked,$userfield);
- $checked{'sourcedid'} = ' checked="checked"';
- $checked{'reject'} = ' checked="checked"';
- if (ref($current) eq 'HASH') {
- if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
- $checked{'sourcedid'} = '';
- if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') {
- $checked{'email'} = ' checked="checked"';
- } else {
- $checked{'other'} = ' checked="checked"';
- $userfield = $current->{'mapuser'};
- $userfieldsty = 'inline-block';
- }
- }
- if (($current->{'notstudent'} ne '') && ($current->{'notstudent'} ne 'reject')) {
- $checked{'reject'} = '';
- $checked{'auth'} = ' checked="checked"';
- }
- }
- my $onclickuser = ' onclick="toggleLinkProtExtra(this.form,'."'mapuser','userfield','other','inline-block','$num'".');"';
- my $output = ''.
- &mt('Source of LON-CAPA username in LTI request').': ';
- foreach my $option ('sourcedid','email','other') {
- $output .= '
'.
- ''.
- '
';
- $output .= ''.
- &mt('Action when username is not for an enrolled student').': ';
- foreach my $option ('reject','auth') {
- $output .= '
';
- return $output;
-}
-
-sub print_extresource_row {
- my ($item,$config,$curr,$noedit) = @_;
- my $onchange;
- unless ($noedit) {
- $onchange = ' onchange="javascript:toggleExtRes();"';
- }
- my $id = 'LC_'.$item;
- my ($selected,$reuse,$width,$height) = split(/:/,$curr);
- my $output = &select_from_options($item,$config->{'order'},
- $config->{'options'},$selected,
- $config->{'nullval'},
- undef,undef,$onchange,$noedit,$id);
- my ($checked,$reusesty,$sizesty);
- if ($reuse) {
- $checked = ' checked="checked"';
- }
- $reusesty = 'none';
- $sizesty = 'none';
- if (($selected eq 'window') || ($selected eq 'tab')) {
- $reusesty = 'inline-block';
- if ($selected eq 'window') {
- $sizesty = 'inline-block';
- }
- }
- $output .= ''.
- ''.
- '
'.
- ''.
- ''.&mt('Window size (optional)').' '.
- ''.
- &mt('width').': ';
- return $output;
+ return %lt;
}
sub print_other {
@@ -7494,16 +5525,10 @@ sub make_item_rows {
(($caller eq 'printouts') && ($item ne 'print_header_format'))) {
$colspan = 2;
}
- my $rowdesc;
- if ($caller eq 'appearance') {
- $rowdesc = ''.$items->{$item}{text}.' ';
- } else {
- $rowdesc = $items->{$item}{text};
- }
if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) {
- $datatable .= &item_table_row_start($rowdesc,$count,"advanced",$colspan);
+ $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced",$colspan);
} else {
- $datatable .= &item_table_row_start($rowdesc,$count,undef,$colspan);
+ $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'};
@@ -7520,8 +5545,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 'extresource') {
- $datatable .= &print_extresource_row($item,$items->{$item},$settings->{$item},$noedit);
+ } elsif ($item eq 'lti.lcmenu') {
+ $datatable .= &lcmenu_checkboxes($cdom,$item,$settings,$crstype,$noedit);
} elsif ($items->{$item}{input} eq 'dates') {
my $disabled;
if ($noedit) {
@@ -7539,6 +5564,8 @@ 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') {
@@ -7586,7 +5613,7 @@ sub nothidepriv_row {
}
}
if ($settings->{'checkforpriv'}) {
- @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
}
}
push(@checkdoms,$cdom);
@@ -7600,7 +5627,7 @@ sub nothidepriv_row {
if ($end == -1 || $start == -1) {
next;
}
- foreach my $dom (@checkdoms) {
+ foreach my $dom (@checkdoms) {
if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
unless (grep(/^\Q$user\E$/,@privusers)) {
push(@privusers,$user);
@@ -7676,7 +5703,7 @@ sub checkforpriv_row {
my $domdesc = &Apache::lonnet::domain($currdom,'description');
if ($domdesc eq '') {
$domdesc = $currdom;
- }
+ }
$datatable .=
&Apache::loncommon::start_data_table_row().
''.
@@ -7688,13 +5715,13 @@ sub checkforpriv_row {
&mt('Delete').' '.
&mt('Additional domain:'). ' '.
''.
@@ -7946,30 +5973,6 @@ sub change_clone {
}
}
}
- return;
-}
-
-sub devalidate_remote_courseprefs {
- my ($cdom,$cnum,$cachekeys) = @_;
- return unless (ref($cachekeys) eq 'HASH');
- my %servers = &Apache::lonnet::internet_dom_servers($cdom);
- my %thismachine;
- map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
- my @posscached = ('courselti','courseltitools');
- if (keys(%servers)) {
- foreach my $server (keys(%servers)) {
- next if ($thismachine{$server});
- my @cached;
- foreach my $name (@posscached) {
- if ($cachekeys->{$name}) {
- push(@cached,&escape($name).':'.&escape($cdom.'_'.$cnum));
- }
- }
- if (@cached) {
- &Apache::lonnet::remote_devalidate_cache($server,\@cached);
- }
- }
- }
return;
}
';
- my $icon = '
';
+ $bycrsrestype,$scopeorder,$lt,$supptools) = @_;
+ my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+ my $whitespace = '
';
@@ -4916,10 +3625,37 @@ sub show_contents_view {
$r->print('');
}
$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('