';
$editsyllabus = &mt('[_1]Edit[_2]','',
- ' ');
+ '');
}
my %items = (
'url' => {
@@ -4031,7 +2431,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) {
@@ -4214,12 +2614,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;
}
@@ -4266,12 +2666,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;
@@ -4296,7 +2696,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" ';
}
@@ -4447,7 +2847,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'};
@@ -4464,116 +2864,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}.' ';
@@ -4691,18 +3135,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;
@@ -4753,7 +3204,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;
}
@@ -4790,6 +3241,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').
' ';
@@ -4804,9 +3259,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;
@@ -4890,6 +3353,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;
@@ -4966,7 +3459,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) {
@@ -5003,18 +3496,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;
@@ -5059,7 +3601,7 @@ sub coowner_invitations {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -5123,7 +3665,7 @@ sub manage_coownership {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -5209,23 +3751,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();
@@ -5238,7 +3766,7 @@ sub print_localization {
undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
+ unless ($noedit) {
$datatable .= ''.
&Apache::loncommon::select_language('languages_0','',1);
}
@@ -5275,8 +3803,8 @@ sub print_localization {
&Apache::loncommon::select_language('languages_'.$num,'',1).
' '.&Apache::loncommon::end_data_table_row();
- }
- $datatable .= &Apache::loncommon::end_data_table().''.
- &user_table($cdom,$item,\@sections,
+ $datatable .= ' '.
+ &user_table($cdom,$item,\@sections,
$settings->{$item},\%lt,$noedit);
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
@@ -5450,7 +3978,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 +3994,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 = ''.
- ' '.&mt('All').' ';
+ $output = ''.
+ ' '.&mt('All').' ';
foreach my $sec (@{$sections}) {
my $is_sel;
if ((@currsecs) && (grep(/^\Q$sec\E$/,@currsecs))) {
- $is_sel = ' selected="selected"';
+ $is_sel = 'selected="selected"';
}
$output .= ''.$sec.' ';
}
@@ -5524,6 +4044,20 @@ sub print_discussion {
&mt('(specific user(s))'),
input => 'checkbox',
},
+
+ 'pac.roles.denied' => {
+ text => ''.&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',
@@ -5556,15 +4090,15 @@ 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 .= ' '.
''.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
'
';
} elsif ($item eq 'plc.users.denied') {
- $datatable .= ' '.
- &user_table($cdom,$item,undef,
+ $datatable .= ' '.
+ &user_table($cdom,$item,undef,
$settings->{$item},\%lt,$noedit);
} elsif ($item eq 'pch.roles.denied') {
$datatable .= ' '.
@@ -5574,6 +4108,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') {
@@ -5593,7 +4135,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',
@@ -5926,26 +4468,12 @@ sub print_appearance {
text => ''.&mt($itemtext->{'usejsme'}).' ',
input => 'radio',
},
- 'inline_chem' => {
- 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);
}
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 +4484,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 => ''.&mt($itemtext->{'rndseed'}).' '.
- ''.''.' ',
input => 'selectbox',
@@ -5996,7 +4525,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 {
@@ -6130,551 +4659,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'}).' ';
+ 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 .= ' '
- .'';
- 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').' '.
- ' '."\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 {
@@ -6751,7 +4861,7 @@ sub print_menuitems {
my %checked;
my $on = ' checked="checked"';
foreach my $key (keys(%{$menu{$num}})) {
- if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
+ if (($key eq 'top') || ($key eq 'inline') || ($key eq 'main')) {
if ($menu{$num}{$key} eq 'y') {
$checked{$key} = $on;
}
@@ -6768,13 +4878,7 @@ sub print_menuitems {
foreach my $category (@order) {
if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
$datatable .= ''.$menutitles{$category}.' '."\n";
- if ($category eq 'text') {
- $datatable .= ''.&mt('Header').' '.&mt('Footer').' '.
''.$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'}.
- ': '.
- (' 'x2).
- ''.$desc{'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).
- ' '."\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".
- (' 'x2).
- ''.$desc{'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).
- ' '.&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;
-}
-
sub print_other {
my ($cdom,$settings,$allitems,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
@@ -7391,7 +5060,7 @@ sub print_other {
input => 'textbox',
size => '30',
};
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
+ my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
}
sub get_other_items {
@@ -7446,7 +5115,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 '')) {
@@ -7468,22 +5137,12 @@ sub yesno_radio {
my $disabled;
if ($noedit) {
$disabled = ' disabled="disabled"';
- } elsif ($onclick) {
- $onclick = ' onclick="'.$onclick.'"';
- }
- if ($reverse) {
- return ''.
- ' '.
- ''.
- ' '.
- ''.
+ ' '.
+ ''.$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'};
@@ -7576,8 +5229,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) {
@@ -7588,75 +5241,28 @@ sub make_item_rows {
$settings->{$item},$disabled);
} elsif ($items->{$item}{input} eq 'radio') {
my ($unsetdefault,$valueyes,$valueno);
- if (($item eq 'usejsme') || ($item eq 'uselcmath') || ($item eq 'inline_chem')) {
+ if (($item eq 'usejsme') || ($item eq 'uselcmath')) {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
unless ($domdefs{$item} eq '0') {
$unsetdefault = 1;
}
$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 = '';
- my $reverse = 1;
- if (@sections) {
- $sectionbox .= ' ... '.&mt('hidden in sections').': '.
- '
'.
- &select_sections('hidetotals','',\@sections,\@selsec,$noedit,'all').
- '
';
- }
- $sectionbox .= '
'.
- ''.
- &mt('Hide Course Points Totals').' '.
- ''.
- &yesno_radio('hidetotals',\%current,$unsetdefault,$valueyes,$valueno,$noedit,
- $onclick,$reverse).'
'.
- $sectionbox.
- '
';
- }
+ undef,undef,undef,$noedit,$id);
} elsif ($items->{$item}{input} eq 'textbox') {
my $disabled;
if ($noedit) {
@@ -7691,7 +5297,7 @@ sub nothidepriv_row {
}
}
if ($settings->{'checkforpriv'}) {
- @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
}
}
push(@checkdoms,$cdom);
@@ -7705,7 +5311,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);
@@ -7781,7 +5387,7 @@ sub checkforpriv_row {
my $domdesc = &Apache::lonnet::domain($currdom,'description');
if ($domdesc eq '') {
$domdesc = $currdom;
- }
+ }
$datatable .=
&Apache::loncommon::start_data_table_row().
''.
@@ -7793,13 +5399,13 @@ sub checkforpriv_row {
&mt('Delete').' '.
&mt('Additional domain:'). ' '.
''.
@@ -8051,30 +5657,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 = '
';
@@ -4954,10 +3420,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('