'.&mt('Search for a placement test in the [_1] domain',$domdesc).'
');
} else {
$r->print('
'.&mt('Search for a course in the [_1] domain',$domdesc).'
');
}
@@ -185,6 +194,8 @@ sub print_course_search_page {
my ($actiontext,$roleoption,$settingsoption);
if ($type eq 'Community') {
$actiontext = &mt('Actions available after searching for a community:');
+ } elsif ($type eq 'Placement') {
+ $actiontext = &mt('Actions available after searching for a placement test:')
} else {
$actiontext = &mt('Actions available after searching for a course:');
}
@@ -192,6 +203,9 @@ sub print_course_search_page {
if ($type eq 'Community') {
$roleoption = &mt('Enter the community with the role of [_1]',$cctitle);
$settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle);
+ $settingsoption = &mt('View or modify placement test settings which only a [_1] may modify.',$dctitle);
} else {
$roleoption = &mt('Enter the course with the role of [_1]',$cctitle);
$settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle);
@@ -202,6 +216,8 @@ sub print_course_search_page {
if (@{$roles_by_num} > 1) {
if ($type eq 'Community') {
$roleoption = &mt('Enter the community with one of the available ad hoc roles');
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.');
} else {
$roleoption = &mt('Enter the course with one of the available ad hoc roles.');
}
@@ -209,6 +225,8 @@ sub print_course_search_page {
my $rolename = $description->{$roles_by_num->[0]};
if ($type eq 'Community') {
$roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename);
} else {
$roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
}
@@ -216,6 +234,8 @@ sub print_course_search_page {
}
if ($type eq 'Community') {
$settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle);
} else {
$settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
}
@@ -391,7 +411,8 @@ sub get_filters {
sub print_modification_menu {
my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
&print_header($r,$type);
- my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum,
+ $extendedtype);
if (ref($coursehash) eq 'HASH') {
$cdom = $coursehash->{'domain'};
$cnum = $coursehash->{'num'};
@@ -410,6 +431,8 @@ sub print_modification_menu {
'setanon' => 'View/Modify responders threshold for anonymous survey submissions display',
'selfenroll' => 'View/Modify Self-Enrollment configuration',
'setpostsubmit' => 'View/Modify submit button behavior, post-submission',
+ 'setltiauth' => 'View/Modify re-authentication requirement for LTI launch of deep-linked item',
+ 'setexttool' => 'View/Modify External Tools permissions',
);
} else {
%linktext = (
@@ -417,20 +440,22 @@ sub print_modification_menu {
'setanon' => 'View responders threshold for anonymous survey submissions display',
'selfenroll' => 'View Self-Enrollment configuration',
'setpostsubmit' => 'View submit button behavior, post-submission',
+ 'setltiauth' => 'View re-authentication requirement for LTI launch of deep-linked item',
+ 'setexttool' => 'View External Tools permissions',
);
}
if ($type eq 'Community') {
- if ($permission->{'setparms'} eq 'edit') {
+ if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Community Settings';
- $linktext{'setparms'} = 'View/Modify community owner';
+ $linktext{'setparms'} = 'View/Modify community owner, self-enrollment and table lifetime';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
} else {
$categorytitle = 'View Community Settings';
- $linktext{'setparms'} = 'View community owner';
+ $linktext{'setparms'} = 'View community owner, self-enrollment and table lifetime';
$linktext{'catsettings'} = 'View catalog settings for community';
}
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
- $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
} else {
if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Course Settings';
@@ -451,10 +476,15 @@ sub print_modification_menu {
}
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
$setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook'],
+ $cdom,$cnum);
+ $extendedtype = ucfirst(&Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings));
}
my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.');
my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.');
+ my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item.');
+ my $exttool_text = &mt('Override default permissions for external tools use for this specific course.');
$linktext{'viewparms'} = 'Display current settings for automated enrollment';
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
@@ -515,7 +545,7 @@ sub print_modification_menu {
{
linktext => $linktext{'viewparms'},
url => &phaseurl('viewparms'),
- permission => ($permission->{'viewparms'} && ($type ne 'Community')),
+ permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')),
#help => '',
icon => 'roles.png',
linktitle => ''
@@ -536,66 +566,39 @@ sub print_modification_menu {
permission => $permission->{'setpostsubmit'},
linktitle => '',
},
+ {
+ linktext => $linktext{'setltiauth'},
+ icon => 'system-lock-screen.png',
+ #help => '',
+ url => &phaseurl('setltiauth'),
+ permission => $permission->{'setltiauth'},
+ linktitle => '',
+ },
+ {
+ linktext => $linktext{'setexttool'},
+ icon => 'exttool.png',
+ #help => '',
+ url => &phaseurl('setexttool'),
+ permission => $permission->{'setexttool'},
+ linktitle => '',
+ },
]
},
);
- my $menu_html =
+ $r->print(
'
';
- if ($type eq 'Community') {
- $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
- } else {
- $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
+ .&mt($type).': '.$cdesc.''
+ .''."\n");
+ if ($extendedtype) {
+ $r->print('
'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'
'."\n".
- '
'.&mt('Override defaults for who configures self-enrollment for this specific community').'
'."\n";
- } else {
- $menu_html .= '
'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'
'."\n".
- '
'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'
'."\n";
- if (&showcredits($dom)) {
- $menu_html .= '
'.&mt('Default credits earned by student on course completion.').'
'."\n";
- }
- $menu_html .= '
'.&mt('Override defaults for who configures self-enrollment for this specific course.').'
'."\n";
- }
- $menu_html .= '
'.$mysqltables_text.'
'."\n".
- '
'.$setquota_text.'
'."\n".
- '
'.$setuploadquota_text.'
'."\n".
- '
'.$anon_text.'
'."\n".
- '
'.$postsubmit_text.'
'."\n";
- my ($categories_link_start,$categories_link_end);
- if ($permission->{'catsettings'} eq 'edit') {
- $categories_link_start = '';
- $categories_link_end = '';
- }
- foreach my $item (@additional_params) {
- if ($type eq 'Community') {
- if ($item eq 'togglecats') {
- $menu_html .= '
'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
'."\n";
- }
- }
- }
- $menu_html .=
- '
'
- .'');
+ .&hidden_form_elements()
+ .&Apache::lonhtmlcommon::generate_menu(@menu)
+ .'');
return;
}
@@ -612,9 +615,9 @@ sub print_adhocrole_selected {
}
$selectrole = 1;
} elsif ($permission->{'adhocrole'} eq 'custom') {
- my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
+ my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
if (ref($okroles) eq 'ARRAY') {
- my $possrole = $env{'form.adhocrole'};
+ my $possrole = $env{'form.adhocrole'};
if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {
my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
$newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
@@ -664,9 +667,34 @@ sub print_settings_display {
"
$lt{'dcon'}
\n".
&Apache::loncommon::end_data_table_header_row()."\n";
foreach my $item (@items) {
+ my $shown = $enrollvar{$item};
+ if ($item eq 'crosslistings') {
+ my (@xlists,@lcsecs);
+ foreach my $entry (split(/,/,$enrollvar{$item})) {
+ my ($xlist,$lc_sec) = split(/:/,$entry);
+ push(@xlists,$xlist);
+ push(@lcsecs,$lc_sec);
+ }
+ if (@xlists) {
+ my $crskey = $cnum.':'.$enrollvar{'coursecode'};
+ my %reformatted =
+ &Apache::lonnet::auto_instsec_reformat($cdom,'declutter',
+ {$crskey => \@xlists});
+ if (ref($reformatted{$crskey}) eq 'ARRAY') {
+ my @show;
+ my @xlcodes = @{$reformatted{$crskey}};
+ for (my $i=0; $i<@xlcodes; $i++) {
+ push(@show,$xlcodes[$i].':'.$lcsecs[$i]);
+ }
+ if (@show) {
+ $shown = join(',',@show);
+ }
+ }
+ }
+ }
$disp_table .= &Apache::loncommon::start_data_table_row()."\n".
"
$longtype{$item}
\n".
- "
$enrollvar{$item}
\n";
+ "
$shown
\n";
if (grep(/^\Q$item\E$/,@modifiable_params)) {
$disp_table .= '
'.
+ ''."\n");
+ my @actions =
+ (''.
+ $lt{'back'}.'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
}
sub print_setquota {
my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
my $lctype = lc($type);
- my $headline = &mt("Set disk space quotas for $lctype: [_1]",
- ''.$cdesc.'');
+ my $headline = '
'.&mt("Set disk space quotas for $lctype").'
'."\n".
+ '
'.&mt($type).': '.$cdesc.'
'."\n";
my %lt = &Apache::lonlocal::texthash(
'gpqu' => 'Disk space for storage of group portfolio files',
'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor',
@@ -726,15 +756,20 @@ sub print_setquota {
$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
my $uploadquota = $settings{'internal.uploadquota'};
- if ($coursequota eq '') {
- $coursequota = $staticdefaults{'coursequota'};
- }
- if ($uploadquota eq '') {
+ if (($uploadquota eq '') || ($coursequota eq '')) {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
- $uploadquota = $domdefs{$quotatype.'quota'};
if ($uploadquota eq '') {
- $uploadquota = $staticdefaults{'uploadquota'};
+ $uploadquota = $domdefs{$quotatype.'quota'};
+ if ($uploadquota eq '') {
+ $uploadquota = $staticdefaults{'uploadquota'};
+ }
+ }
+ if ($coursequota eq '') {
+ $coursequota = $domdefs{$quotatype.'coursequota'};
+ if ($coursequota eq '') {
+ $coursequota = $staticdefaults{'coursequota'};
+ }
}
}
&print_header($r,$type);
@@ -748,8 +783,8 @@ sub print_setquota {
$submit = '';
}
$r->print(<
-
$headline
$porthelpitem $lt{'gpqu'}: MB
@@ -762,9 +797,12 @@ $uploadhelpitem $lt{'upqu'}:
$hidden_elements
-$lt{'back'}
ENDDOCUMENT
+ my @actions =
+ (''.
+ $lt{'back'}.'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -794,22 +832,26 @@ sub print_set_anonsurvey_threshold {
my $hidden_elements = &hidden_form_elements();
my ($disabled,$submit);
if ($readonly) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
} else {
$submit = '';
}
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
+ my $showtype = &mt($type);
$r->print(<$lt{'resp'}
+
+
+ENDDOCUMENT
+ my @actions =
+ (''.
+ $titles{'back'}.'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
+sub exttool_titles {
+ my ($type) = @_;
+ my %titles = &Apache::lonlocal::texthash(
+ 'extt' => 'External Tool permissions',
+ 'none' => 'Use of external tools not permitted',
+ 'crs' => 'Only external tools defined in course may be used',
+ 'dom' => 'Only external tools defined in domain may be used',
+ 'both' => 'External tools defined/configured in either domain or course may be used',
+ 'used' => 'Use domain default',
+ 'cour' => 'Use course-specific setting',
+ 'curd' => 'Current domain default is',
+ 'valu' => 'Value for this course',
+ 'modi' => 'Save',
+ 'back' => 'Pick another action',
+ );
+ if ($type eq 'Community') {
+ $titles{'crs'} = &mt('Only external tools defined in community may be used');
+ $titles{'both'} = &mt('External tools defined/configured in either domain or community may be used');
+ $titles{'cour'} = &mt('Use community-specific setting');
+ $titles{'valu'} = &mt('Value for this community');
+ }
+ return %titles;
+}
+
sub modify_selfenrollconfig {
my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
@@ -1221,13 +1510,17 @@ sub modify_selfenrollconfig {
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print('
'.&mt('Self-enrollment with a student role in: [_1]',
- ''.$cdesc.'').'
'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1259,9 +1552,9 @@ sub modifiable_only_title {
my ($type) = @_;
my $dctitle = &Apache::lonnet::plaintext('dc');
if ($type eq 'Community') {
- return &mt('Community settings modifiable only by [_1] for:',$dctitle);
+ return &mt('Community settings modifiable only by [_1]',$dctitle);
} else {
- return &mt('Course settings modifiable only by [_1] for:',$dctitle);
+ return &mt('Course settings modifiable only by [_1]',$dctitle);
}
}
@@ -1277,6 +1570,8 @@ sub gather_authenitems {
$curr_authtype = 'int';
} elsif ($enrollvar->{'authtype'} eq 'localauth' ) {
$curr_authtype = 'loc';
+ } elsif ($enrollvar->{'authtype'} eq 'lti' ) {
+ $curr_authtype = 'lti';
}
}
unless ($curr_authtype eq '') {
@@ -1297,7 +1592,8 @@ sub gather_authenitems {
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
$authform{'int'} = &Apache::loncommon::authform_internal(%param);
$authform{'loc'} = &Apache::loncommon::authform_local(%param);
- foreach my $item ('krb','int','loc') {
+ $authform{'lti'} = &Apache::loncommon::authform_lti(%param);
+ foreach my $item ('krb','int','loc','lti') {
if ($authform{$item} ne '') {
$authenitems .= $authform{$item}.' ';
}
@@ -1312,7 +1608,7 @@ sub modify_course {
'internal.pendingco-owners','internal.selfenrollmgrdc',
'internal.selfenrollmgrcc','internal.mysqltables');
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
'internal.sectionnums','internal.crosslistings'));
if (&showcredits($cdom)) {
@@ -1368,6 +1664,8 @@ sub modify_course {
if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
$newattr{'autharg'} = $env{'form.locarg'};
}
+ } elsif ($env{'form.login'} eq 'lti') {
+ $newattr{'authtype'} = 'lti';
}
if ( $newattr{'authtype'}=~ /^krb/) {
if ($newattr{'autharg'} eq '') {
@@ -1545,7 +1843,7 @@ sub modify_course {
$nochgresponse .= '
'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'
';
}
}
- if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
+ if (($type ne 'Community') && ($type ne 'Placement') && ($changed{'code'} || $changed{'owner'})) {
if ( $newattr{'courseowner'} eq '') {
push(@warnings,&mt('There is no owner associated with this LON-CAPA course.').
' '.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
@@ -1640,8 +1938,8 @@ sub modify_course {
$reply = $chgresponse.$nochgresponse.$warning;
}
&print_header($r,$type);
- my $mainheader = &modifiable_only_title($type);
- $reply = '
'.$mainheader.' '.$cdesc.'
'."\n".
+ $reply = '
'.&modifiable_only_title($type).'
'."\n".
+ '
'.&mt($type).': '.$cdesc.'
'."\n".
'
'.$reply.'
'."\n".
'';
+ $reply .= ''.
+ ' '.&Apache::lonhtmlcommon::actionbox(\@actions);
$r->print($reply);
return;
}
@@ -1825,10 +2124,9 @@ sub modify_quota {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
my $lctype = lc($type);
- my $headline = &mt("Disk space quotas for $lctype: [_1]",
- ''.$cdesc.'');
- $r->print('');
+ my @actions =
+ (''.
+ &mt('Pick another action').'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub modify_anonsurvey_threshold {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
- $r->print('');
+ my @actions =
+ (''.
+ &mt('Pick another action').'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2001,10 +2301,11 @@ sub modify_postsubmit_config {
unch => 'Post submission behavior of the Submit button is unchanged.',
erro => 'An error occurred when saving your proposed changes.',
inva => 'An invalid response was recorded.',
- pick => 'Pick another action',
+ back => 'Pick another action',
);
- $r->print('');
+ $r->print(''.&hidden_form_elements().'');
+ my @actions =
+ (''.
+ $lt{'back'}.'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2082,9 +2384,9 @@ sub modify_catsettings {
$desc{'categories'} = &mt('Assigned categories for this course');
$ccrole = 'cc';
}
- $r->print('
-');
+ $r->print(' '.&hidden_form_elements().'');
+ my @actions =
+ (''.
+ &mt('Pick another action').'');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ return;
+}
+
+sub modify_ltiauth {
+ my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'requ' => 'Requirement for re-authentication for student LTI-limited launch of deep-linked item',
+ 'link' => 'Link protection can be set to accept username for an enrolled student (if sent by Consumer)',
+ 'logi' => 'Login needed, regardless of user information sent by LTI Consumer in (signed) parameters',
+ 'used' => 'Use domain default',
+ 'cour' => 'Use course-specific setting',
+ 'modi' => 'Save',
+ 'back' => 'Pick another action',
+ );
+ &print_header($r,$type);
+ $r->print('