- '.$msg.'
'.(' 'x5).$tzovertext; - } - } - if ($displayval ne '') { - $output .= '
'); - } else { - $displayval = &mt('[_1]In tab[_2],[_3] with new tab for each external resource in course', - "'","'",'
'); - } - } elsif ($selected eq 'window') { - if ($reuse) { - $displayval = &mt('[_1]In pop-up window[_2],[_3] and window re-used for different external resources in course', - "'","'",'
'); - } else { - $displayval = &mt('[_1]In pop-up window[_2],[_3] with new window for each external resource in course', - "'","'",'
'); - } - if (($width ne '') || ($height ne '')) { - if ($width ne '') { - $displayval .= '
'.&mt('Window width: [_1]px',$width); - } - if ($height ne '') { - $displayval .= '
'.&mt('Window height: [_1]px',$height); - } - } - } - } } if ($key eq 'co-owners') { if (ref($changes->{$item}{$key}) eq 'HASH') { @@ -2122,7 +1908,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 .= '
'. $displayval.'
$extra
"; + } + 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); } } } @@ -3754,7 +3326,7 @@ sub display_loncaparev_constraints { if (ref($fromblocks{$type}) eq 'HASH') { foreach my $rev (keys(%{$fromblocks{$type}})) { my ($major,$minor) = split(/\./,$rev); - ($reqdmajor,$reqdminor) = + ($reqdmajor,$reqdminor) = &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); $output .= &Apache::loncommon::start_data_table_row(). '
'. &mt('Requirements for specific folders or resources'). '
'; @@ -3885,9 +3468,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(''); } else { @@ -3905,22 +3488,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 = '
';
- my $icon = '
';
+ $bycrsrestype,$scopeorder,$lt,$supptools) = @_;
+ my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+ my $whitespace = '';
+ 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 = '';
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().
'
';
@@ -4035,10 +3629,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('';
+ $r->print(&Apache::loncommon::start_data_table_header_row().
+ ''.
- ''.
- &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();
@@ -4319,7 +3975,7 @@ sub print_localization {
undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
+ unless ($noedit) {
$datatable .= ''. &Apache::loncommon::select_language('languages_'.$num,'',1). ''. '
'; + } + $datatable .= &Apache::loncommon::end_data_table().'
'; } } $datatable .= &item_table_row_end(); @@ -4445,7 +4101,7 @@ sub user_table { if ($currvalue eq '') { unless ($noedit) { $output .= &select_recipient($item,'0',$cdom,$sections); - } + } } else { my $num = 0; my @curr = split(/,/,$currvalue); @@ -4597,6 +4253,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('(role-based)'), + input => 'checkbox', + }, + + 'pac.users.denied' => { + text => ''.&mt($itemtext->{'pac.users.denied'}).'
'. + &mt('(specific user(s))'), + input => 'checkbox', + }, + 'allow_limited_html_in_feedback' => { text => ''.&mt($itemtext->{'allow_limited_html_in_feedback'}).'', input => 'radio', @@ -4629,7 +4299,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 .= '
'; @@ -4718,7 +4396,7 @@ sub role_checkboxes { my $count = 0; my $disabled; if ($noedit) { - $disabled = ' disabled="disabled"'; + $disabled = ' disabled="disabled"'; } foreach my $role (@roles) { my $checked = ''; @@ -4846,7 +4524,7 @@ sub set_discussion_fonts { sub discussion_vote_classes { my $classorder = ['twoplus','oneplus','zero','oneminus','twominus']; - my %classtitles = &Apache::lonlocal::texthash( + my %classtitles = &Apache::lonlocal::texthash( 'twoplus' => 'Two sigma above mean', 'oneplus' => 'One sigma above mean', 'zero' => 'Within one sigma of mean', @@ -4912,7 +4590,7 @@ sub print_classlists { 'defaultcredits' => { text => ''.&mt($itemtext->{'defaultcredits'}).'', }, - + 'nothideprivileged' => { text => ''.&mt($itemtext->{'nothideprivileged'}).'', input => 'checkbox', @@ -5003,16 +4681,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); } @@ -5029,11 +4697,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'}).''. @@ -5203,6 +4872,134 @@ sub print_bridgetasks { return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit); } +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 => ''.&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'}).'
'.$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 = '
| '; + $count ++; + } + my $rem = $count%($numinrow); + my $colsleft = $numinrow - $rem; + if ($colsleft > 1 ) { + $output .= ' | '. + ' | '; + } elsif ($colsleft == 1) { + $output .= ''; + } + $output .= ' |
'; - } + } foreach my $field (@{$categories{$category}}) { if ($field eq 'disc') { $output .= '
'.&mt('Footer Text').'
'; @@ -5470,60 +5268,30 @@ sub menucollections_display { } sub print_linkprotection { - my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_; + my ($cdom,$settings,$rowtotal,$crstype,$noedit) = @_; + unless (ref($settings) eq 'HASH') { + return; + } my %linkprotection; my $count = 0; my $next = 1; - my ($datatable,$disabled,$css_class,$dest); + my ($datatable,$disabled,$css_class); if ($noedit) { $disabled = ' disabled="disabled"'; } - my %desc = &linkprot_names(); - my %lt = &Apache::lonlocal::texthash ( - 'requ' => 'Required settings', - 'opti' => 'Optional settings', - ); + my %lt = &linkprot_names(); my $itemcount = 0; - my $ltiauth; - if ($context eq 'domain') { - $ltiauth = 1; - } else { - if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) { - $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'}; - } else { - my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); - $ltiauth = $domdefs{'crsltiauth'}; - } - } - if ($context eq 'domain') { - $dest = '/adm/domainprefs'; - } else { - $dest = '/adm/courseprefs'; - } - - my ($switchserver,$switchmessage); - $switchserver = &check_switchserver($cdom,$cnum,$context,$dest); - if ($switchserver) { - if ($context eq 'domain') { - $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver); - } elsif ($crstype eq 'Community') { - $switchmessage = &mt("submit from community's home server: [_1].",$switchserver); - } else { - $switchmessage = &mt("submit from course's home server: [_1].",$switchserver); - } - } - - if ((ref($settings) eq 'HASH') && (ref($settings->{'linkprot'}) eq 'HASH')) { - if (keys(%{$settings->{'linkprot'}})) { - my @current = sort { $a <=> $b } keys(%{$settings->{'linkprot'}}); + if (ref($settings->{'linkprotection'}) eq 'HASH') { + if (keys(%{$settings->{'linkprotection'}})) { + my @current = sort { $a <=> $b } keys(%{$settings->{'linkprotection'}}); $next += $current[-1]; for (my $i=0; $i<@current; $i++) { my $num = $current[$i]; my %values; - if (ref($settings->{'linkprot'}->{$num}) eq 'HASH') { - %values = %{$settings->{'linkprot'}->{$num}}; + if (ref($settings->{'linkprotection'}->{$num}) eq 'HASH') { + %values = %{$settings->{'linkprotection'}->{$num}}; } else { next; } @@ -5535,117 +5303,24 @@ sub print_linkprotection { $datatable .= '
'. + ''.$lt{'key'}. + ': '. + (' 'x2). + ''.$lt{'secret'}.':'. + ''. + ''. + ''. + ''; $itemcount ++; } } @@ -5654,188 +5329,33 @@ sub print_linkprotection { $datatable .= '
'. + ''.$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', - '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 .= ''.
- ($option eq 'other' ? '' : (' 'x2) );
- }
- $output .= '
'.
- ''.
- '
';
- $output .= ''. - '
'.
- &mt('Action when username is not for an enrolled student').': ';
- foreach my $option ('reject','auth') {
- $output .= ''.
- ($option eq 'auth' ? '' : (' 'x2) );
- }
- $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 .= ''.
- ''.
- ''.
- '
'.
- '';
- return $output;
+ return %lt;
}
sub print_other {
@@ -6009,16 +5529,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'};
@@ -6035,8 +5549,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) {
@@ -6054,6 +5568,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') {
@@ -6101,7 +5617,7 @@ sub nothidepriv_row {
}
}
if ($settings->{'checkforpriv'}) {
- @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
}
}
push(@checkdoms,$cdom);
@@ -6115,7 +5631,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);
@@ -6191,7 +5707,7 @@ sub checkforpriv_row {
my $domdesc = &Apache::lonnet::domain($currdom,'description');
if ($domdesc eq '') {
$domdesc = $currdom;
- }
+ }
$datatable .=
&Apache::loncommon::start_data_table_row().
''. @@ -6322,8 +5838,8 @@ ENDJS $output .= ''; } } - my $pos = $currnum+1; - unless ($noedit) { + my $pos = $currnum+1; + unless ($noedit) { $output .= '