--- loncom/interface/lonmodifycourse.pm 2025/01/16 06:06:09 1.79.2.9.2.8
+++ loncom/interface/lonmodifycourse.pm 2019/04/29 22:19:24 1.94
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.79.2.9.2.8 2025/01/16 06:06:09 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.94 2019/04/29 22:19:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,9 +39,6 @@ use Apache::lonpickcourse;
use lib '/home/httpd/lib/perl';
use LONCAPA qw(:DEFAULT :match);
-my $registered_cleanup;
-my $modified_dom;
-
sub get_dc_settable {
my ($type,$cdom) = @_;
if ($type eq 'Community') {
@@ -79,6 +76,13 @@ sub catalog_settable {
if ($confhash->{'categorizecomm'} ne 'comm') {
push(@settable,'categorize');
}
+ } elsif ($type eq 'Placement') {
+ if ($confhash->{'togglecatsplace'} ne 'place') {
+ push(@settable,'togglecats');
+ }
+ if ($confhash->{'categorizeplace'} ne 'place') {
+ push(@settable,'categorize');
+ }
} else {
if ($confhash->{'togglecats'} ne 'crs') {
push(@settable,'togglecats');
@@ -97,7 +101,7 @@ sub get_enrollment_settings {
my ($cdom,$cnum) = @_;
my ($internals,$accessdates) = &autoenroll_keys();
my @items;
- if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+ if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
@items = map { 'internal.'.$_; } (@{$internals});
push(@items,@{$accessdates});
}
@@ -175,6 +179,8 @@ sub print_course_search_page {
$r->print(&Apache::loncommon::js_changer());
if ($type eq 'Community') {
$r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
+ } elsif ($type eq 'Placement') {
+ $r->print('<h3>'.&mt('Search for a placement test in the [_1] domain',$domdesc).'</h3>');
} else {
$r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
}
@@ -185,6 +191,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 +200,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 +213,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 +222,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 +231,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,8 +408,7 @@ 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,
- $extendedtype);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum);
if (ref($coursehash) eq 'HASH') {
$cdom = $coursehash->{'domain'};
$cnum = $coursehash->{'num'};
@@ -411,9 +427,6 @@ 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',
- 'setcrseditors' => 'View/Modify permitted course resource editors',
);
} else {
%linktext = (
@@ -421,23 +434,20 @@ 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',
- 'setcrseditors' => 'View permitted course resource editors',
);
}
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, self-enrollment and table lifetime';
+ $linktext{'setparms'} = 'View/Modify community owner';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
} else {
$categorytitle = 'View Community Settings';
- $linktext{'setparms'} = 'View community owner, self-enrollment and table lifetime';
+ $linktext{'setparms'} = 'View community owner';
$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';
@@ -458,15 +468,10 @@ 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 $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);
@@ -527,7 +532,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 => ''
@@ -548,47 +553,66 @@ 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 => '',
- },
- {
- linktext => $linktext{'setcrseditors'},
- icon => 'crseditors.png',
- #help => '',
- url => &phaseurl('setcrseditors'),
- permission => $permission->{'setcrseditors'},
- linktitle => '',
- },
]
},
);
- $r->print(
+ my $menu_html =
'<h3>'
- .&mt($type).': <span class="LC_nobreak">'.$cdesc.'</span>'
- .'</h3>'."\n");
- if ($extendedtype) {
- $r->print('<h4>'.&mt('Type').': '.&mt("$extendedtype $type").'</h4>');
+ .&mt('View/Modify settings for: [_1]',
+ '<span class="LC_nobreak">'.$cdesc.'</span>')
+ .'</h3>'."\n".'<p>';
+ 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:');
+ }
+ $menu_html .= '</p>'."\n".'<ul>';
+ if ($type eq 'Community') {
+ $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>'."\n".
+ '<li>'.&mt('Override defaults for who configures self-enrollment for this specific community').'</li>'."\n";
+ } else {
+ $menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n".
+ '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>'."\n";
+ if (($type ne 'Placement') && &showcredits($dom)) {
+ $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>'."\n";
+ }
+ $menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
+ }
+ $menu_html .= '<li>'.$mysqltables_text.'</li>'."\n".
+ '<li>'.$setquota_text.'</li>'."\n".
+ '<li>'.$setuploadquota_text.'</li>'."\n".
+ '<li>'.$anon_text.'</li>'."\n".
+ '<li>'.$postsubmit_text.'</li>'."\n";
+ my ($categories_link_start,$categories_link_end);
+ if ($permission->{'catsettings'} eq 'edit') {
+ $categories_link_start = '<a href="/adm/domainprefs?actions=coursecategories&phase=display">';
+ $categories_link_end = '</a>';
+ }
+ foreach my $item (@additional_params) {
+ if ($type eq 'Community') {
+ if ($item eq 'togglecats') {
+ $menu_html .= ' <li>'.&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).'</li>'."\n";
+ } elsif ($item eq 'categorize') {
+ $menu_html .= ' <li>'.&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).'</li>'."\n";
+ }
+ } else {
+ if ($item eq 'togglecats') {
+ $menu_html .= ' <li>'.&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).'</li>'."\n";
+ } elsif ($item eq 'categorize') {
+ $menu_html .= ' <li>'.&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).'</li>'."\n";
+ }
+ }
}
- $r->print(
- '<form name="menu" method="post" action="/adm/modifycourse">'
+ $menu_html .=
+ ' </ul>'
+ .'<form name="menu" method="post" action="/adm/modifycourse">'
."\n"
- .&hidden_form_elements()
- .&Apache::lonhtmlcommon::generate_menu(@menu)
- .'</form>');
+ .&hidden_form_elements();
+
+ $r->print($menu_html);
+ $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+ $r->print('</form>');
return;
}
@@ -605,9 +629,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";
@@ -657,34 +681,9 @@ sub print_settings_display {
"<th>$lt{'dcon'}</th>\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".
"<td><b>$longtype{$item}</b></td>\n".
- "<td>$shown</td>\n";
+ "<td>$enrollvar{$item}</td>\n";
if (grep(/^\Q$item\E$/,@modifiable_params)) {
$disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n";
} else {
@@ -706,32 +705,30 @@ sub print_settings_display {
$setparms_link_start = '<a href="javascript:changePage(document.viewparms,'."'setparms'".');">';
$setparms_link_end = '</a>';
}
- $r->print('<h3>'.&mt('Current automated enrollment settings').'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+ $r->print('<h3>'.&mt('Current automated enrollment settings for:').
+ ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.
'<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".
- '<p>'.$lt{'cose'}.'</p><ul>'.
+ '<p>'.$lt{'cose'}.'<ul>'.
'<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',
$cctitle,$enroll_link_start,$enroll_link_end).'</li>');
if (&showcredits($cdom)) {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
} else {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
}
- $r->print('</li></ul><p>'.
- $lt{'cour'}.'</p>'.$disp_table.'<p>'."\n".
- &hidden_form_elements().'</p>'.
- '</form>'."\n");
- my @actions =
- ('<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.
- $lt{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print('</li></ul></p>'.
+ '<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
+ '<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
+ &hidden_form_elements().
+ '</p></form>'
+ );
}
sub print_setquota {
my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
my $lctype = lc($type);
- my $headline = '<h3>'.&mt("Set disk space quotas for $lctype").'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n";
+ my $headline = &mt("Set disk space quotas for $lctype: [_1]",
+ '<span class="LC_nobreak">'.$cdesc.'</span>');
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',
@@ -746,20 +743,15 @@ sub print_setquota {
$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
my $uploadquota = $settings{'internal.uploadquota'};
- if (($uploadquota eq '') || ($coursequota eq '')) {
+ if ($coursequota eq '') {
+ $coursequota = $staticdefaults{'coursequota'};
+ }
+ if ($uploadquota 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 = $domdefs{$quotatype.'quota'};
- if ($uploadquota eq '') {
- $uploadquota = $staticdefaults{'uploadquota'};
- }
- }
- if ($coursequota eq '') {
- $coursequota = $domdefs{$quotatype.'coursequota'};
- if ($coursequota eq '') {
- $coursequota = $staticdefaults{'coursequota'};
- }
+ $uploadquota = $staticdefaults{'uploadquota'};
}
}
&print_header($r,$type);
@@ -773,8 +765,8 @@ sub print_setquota {
$submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
}
$r->print(<<ENDDOCUMENT);
-$headline
<form action="/adm/modifycourse" method="post" name="setquota" onsubmit="return verify_quota();">
+<h3>$headline</h3>
<p><span class="LC_nobreak">
$porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" $disabled /> MB
</span>
@@ -787,12 +779,9 @@ $uploadhelpitem $lt{'upqu'}: <input type
$submit
</p>
$hidden_elements
+<a href="javascript:changePage(document.setquota,'menu')">$lt{'back'}</a>
</form>
ENDDOCUMENT
- my @actions =
- ('<a href="javascript:changePage(document.setquota,'."'menu'".')">'.
- $lt{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -807,7 +796,7 @@ sub print_set_anonsurvey_threshold {
my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
my $threshold = $settings{'internal.anonsurvey_threshold'};
if ($threshold eq '') {
- my %domconfig =
+ my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
$threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
@@ -822,26 +811,22 @@ sub print_set_anonsurvey_threshold {
my $hidden_elements = &hidden_form_elements();
my ($disabled,$submit);
if ($readonly) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
} else {
$submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
}
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
- my $showtype = &mt($type);
$r->print(<<ENDDOCUMENT);
-<h3>$lt{'resp'}</h3>
-<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
<form action="/adm/modifycourse" method="post" name="setanon" onsubmit="return verify_anon_threshold();">
+<h3>$lt{'resp'} <span class="LC_nobreak">$cdesc</span></h3>
<p>
-$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" $disabled /> </p>
+$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" $disabled />
$submit
+</p>
$hidden_elements
+<a href="javascript:changePage(document.setanon,'menu')">$lt{'back'}</a>
</form>
ENDDOCUMENT
- my @actions =
- ('<a href="javascript:changePage(document.setanon,'."'menu'".')">'.
- $lt{'back'}.'</a>');
- $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -862,11 +847,11 @@ sub print_postsubmit_config {
if ($postsubmit eq '') {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- $postsubmit = 1;
+ $postsubmit = 1;
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
- $postsubmit = 0;
+ $postsubmit = 0;
}
}
}
@@ -894,37 +879,40 @@ sub print_postsubmit_config {
$submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
}
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
- my $showtype = &mt($type);
$r->print(<<ENDDOCUMENT);
-<h3>$lt{'conf'}</h3>
-<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
<form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
+<h3>$lt{'conf'} <span class="LC_nobreak">($cdesc)</span></h3>
<p>
-$helpitem $lt{'disa'}:
+$helpitem $lt{'disa'}:
<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" $disabled />
$lt{'yes'}</label>
<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" $disabled />
-$lt{'no'}</label></p>
+$lt{'no'}</label>
<div id="studentsubmission" style="display: $display">
$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" $disabled /><br />
$zero</div>
-<p>
+<br />
$submit
</p>
$hidden_elements
+<a href="javascript:changePage(document.setpostsubmit,'menu')">$lt{'back'}</a>
</form>
ENDDOCUMENT
- my @actions =
- ('<a href="javascript:changePage(document.setpostsubmit,'."'menu'".')">'.
- $lt{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
- return unless (ref($settings) eq 'HASH');
- my $lctype = &get_lctype($type,$settings);
+ return unless (ref($settings) eq 'HASH');
+ my $lctype = lc($type);
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
+ $lctype = 'unofficial';
+ if ($settings->{'internal.coursecode'}) {
+ $lctype = 'official';
+ } elsif ($settings->{'internal.textbook'}) {
+ $lctype = 'textbook';
+ }
+ }
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
my $postsubtimeout = 60;
@@ -940,22 +928,6 @@ sub domain_postsubtimeout {
return $postsubtimeout;
}
-sub get_lctype {
- my ($type,$settings) = @_;
- my $lctype = lc($type);
- unless ($type eq 'Community') {
- $lctype = 'unofficial';
- if (ref($settings) eq 'HASH') {
- if ($settings->{'internal.coursecode'}) {
- $lctype = 'official';
- } elsif ($settings->{'internal.textbook'}) {
- $lctype = 'textbook';
- }
- }
- }
- return $lctype;
-}
-
sub print_catsettings {
my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
&print_header($r,$type);
@@ -973,9 +945,8 @@ sub print_catsettings {
$lt{'categ'} = &mt('Categorize Community');
$lt{'assi'} = &mt('Assign one or more subcategories to this community.');
}
- $r->print('<h3>'.$lt{'catset'}.'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="catsettings">'."\n");
+ $r->print('<form action="/adm/modifycourse" method="post" name="catsettings">'.
+ '<h3>'.$lt{'catset'}.' <span class="LC_nobreak">'.$cdesc.'</span></h3>');
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
if (@cat_params > 0) {
@@ -983,63 +954,50 @@ sub print_catsettings {
if ($readonly) {
$disabled = ' disabled="disabled"';
}
- my %currsettings =
+ my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
if (grep(/^togglecats$/,@cat_params)) {
my $excludeon = '';
my $excludeoff = ' checked="checked" ';
if ($currsettings{'hidefromcat'} eq 'yes') {
$excludeon = $excludeoff;
- $excludeoff = '';
+ $excludeoff = '';
}
$r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
- '<p>'.
$lt{'exclude'}.
- ' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label></p><p>');
+ ' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label><br /><p>');
if ($type eq 'Community') {
- $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.").'</p>');
+ $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
} else {
- $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':</p><ul>'.
+ $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':<ul>'.
'<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'.
'<li>'.&mt('The course has been categorized using at least one of the course categories defined for the domain.').'</li></ul>');
}
+ $r->print('</ul></p>');
}
- my $savebutton;
- unless ($readonly) {
- $savebutton = '<p><br /><input type="button" name="chgcatsettings" value="'.
- &mt('Save').'" onclick="javascript:changePage(document.catsettings,'.
- "'processcat'".');" /></p>';
- }
- my $shownsave;
if (grep(/^categorize$/,@cat_params)) {
- my $categheader = '<br /><h4>'.$lt{'categ'}.'</h4>';
+ $r->print('<br /><h4>'.$lt{'categ'}.'</h4>');
if (ref($domconf{'coursecategories'}) eq 'HASH') {
my $cathash = $domconf{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
- $r->print($categheader.
- '<p>'.$lt{'assi'}.'</p>'.
+ $r->print($lt{'assi'}.'<br /><br />'.
&Apache::loncommon::assign_categories_table($cathash,
$currsettings{'categories'},$type,$disabled));
} else {
- $r->print($savebutton.$categheader.
- '<p>'.&mt('No categories defined for this domain.'));
- $shownsave = 1;
+ $r->print(&mt('No categories defined for this domain'));
}
} else {
- $r->print($savebutton.$categheader.
- '<p>'.&mt('No categories defined for this domain.'));
- $shownsave = 1;
+ $r->print(&mt('No categories defined for this domain'));
}
- if ($type eq 'Community') {
- $r->print('</p>');
- } elsif ($shownsave) {
- $r->print('<br />'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses.').'</p>');
- } else {
- $r->print('</p><p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
+ $r->print('<p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
}
}
- unless ($readonly || $shownsave) {
- $r->print($savebutton);
+ unless ($readonly) {
+ $r->print('<p><input type="button" name="chgcatsettings" value="'.
+ &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
}
} else {
$r->print('<span class="LC_warning">');
@@ -1048,13 +1006,11 @@ sub print_catsettings {
} else {
$r->print(&mt('Catalog settings in this domain are set in course context via "Course Configuration".'));
}
- $r->print('</span>'."\n");
+ $r->print('</span><br /><br />'."\n".
+ '<a href="javascript:changePage(document.catsettings,'."'menu'".');">'.
+ $lt{'back'}.'</a>');
}
$r->print(&hidden_form_elements().'</form>'."\n");
- my @actions =
- ('<a href="javascript:changePage(document.catsettings,'."'menu'".')">'.
- $lt{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1071,7 +1027,7 @@ sub print_course_modification_page {
'gobt' => "Save",
'sett' => 'Setting',
'domd' => 'Domain default',
- 'whom' => 'Who configures',
+ 'whom' => 'Who configures',
);
my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled);
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
@@ -1105,11 +1061,11 @@ sub print_course_modification_page {
$cc_status{$uname.':'.$udom} = $lt{'actv'};
}
}
- if (($enrollvar{'courseowner'} ne '') &&
+ if (($enrollvar{'courseowner'} ne '') &&
(!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) {
push(@local_ccs,$enrollvar{'courseowner'});
my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
- $pname{$enrollvar{'courseowner'}} =
+ $pname{$enrollvar{'courseowner'}} =
&Apache::loncommon::plainname($owneruname,$ownerdom);
my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
$cdom,$cnum,$ccrole);
@@ -1139,7 +1095,7 @@ sub print_course_modification_page {
} else {
$ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
}
- $ownertable .=
+ $ownertable .=
'<td>'.$pname{$cc}.'</td>'."\n".
'<td>'.$cc.'</td>'."\n".
'<td>'.$cc_status{$cc}.' '.$ccname.'</td>'."\n".
@@ -1149,14 +1105,10 @@ sub print_course_modification_page {
}
&print_header($r,$crstype,$javascript_validations);
my $dctitle = &Apache::lonnet::plaintext('dc');
+ my $mainheader = &modifiable_only_title($crstype);
my $hidden_elements = &hidden_form_elements();
- my $showtype;
- if (($type eq 'official') || ($type eq 'unofficial') || ($type eq 'textbook')) {
- $showtype = ' ('.&mt($type).')';
- }
- $r->print('<h3>'.&modifiable_only_title($crstype).'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($crstype).': '.$cdesc.$showtype.'</span></h4><br />'."\n".
- '<form action="/adm/modifycourse" method="post" name="'.$env{'form.phase'}.'">'."\n".
+ $r->print('<form action="/adm/modifycourse" method="post" name="'.$env{'form.phase'}.'">'."\n".
+ '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3><p>'.
&Apache::lonhtmlcommon::start_pick_box());
if ($crstype eq 'Community') {
$r->print(&Apache::lonhtmlcommon::row_title(
@@ -1194,7 +1146,7 @@ sub print_course_modification_page {
&Apache::loncommon::help_open_topic('Modify_Course_Chgpasswd').
' '.&mt('Changing passwords (internal)'))."\n".
'<label><input type="checkbox" value="1" name="nopasswdchg"'.$checked.$disabled.' />'.
- &mt('Disable changing password for users with student role by course owner').'</label>'."\n".
+ &mt('Disable changing password for users with student role by course owner').'<label>'."\n".
&Apache::lonhtmlcommon::row_closure());
}
}
@@ -1216,7 +1168,7 @@ sub print_course_modification_page {
'<th>'.$lt{'whom'}.'</th>'.
&Apache::loncommon::end_data_table_header_row()."\n");
my %optionname;
- $optionname{''} = &mt('Use domain default');
+ $optionname{''} = &mt('Use domain default');
$optionname{'0'} = $dctitle;
$optionname{'1'} = $cctitle;
foreach my $item (@{$selfenrollrows}) {
@@ -1231,12 +1183,12 @@ sub print_course_modification_page {
$checked{'1'} = ' checked="checked"';
} else {
$checked{''} = ' checked="checked"';
- }
+ }
$r->print(&Apache::loncommon::start_data_table_row()."\n".
'<td>'.$selfenrolltitles->{$item}.'</td>'."\n".
'<td>'.&mt('[_1] configures',$default).'</td>'."\n".
'<td>');
- foreach my $option ('','0','1') {
+ foreach my $option ('','0','1') {
$r->print('<span class="LC_nobreak"><label>'.
'<input type="radio" name="selfenrollmgr_'.$item.'" '.
'value="'.$option.'"'.$checked{$option}.$disabled.' />'.
@@ -1252,7 +1204,7 @@ sub print_course_modification_page {
' '.&mt('"Temporary" Tables Lifetime (s)'))."\n".
'<input type="text" size="10" name="mysqltables" value="'.$settings{'internal.mysqltables'}.'"'.$disabled.' />'.
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'<br />'.$hidden_elements);
+ &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements);
unless ($readonly) {
$r->print('<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
if ($crstype eq 'Community') {
@@ -1262,11 +1214,7 @@ sub print_course_modification_page {
}
$r->print(' value="'.$lt{'gobt'}.'" />');
}
- $r->print('</form>');
- my @actions =
- ('<a href="javascript:changePage(document.'.$env{'form.phase'}.','."'menu'".')">'.
- &mt('Pick another action').'</a>');
- $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print('</p></form>');
return;
}
@@ -1277,257 +1225,14 @@ sub print_selfenrollconfig {
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n");
+ $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
+ '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
&Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
$cdom,$cnum,\%currsettings,
&hidden_form_elements(),$readonly);
- my @actions =
- ('<a href="javascript:changePage(document.selfenroll,'."'menu'".')">'.
- &mt('Pick another action').'</a>');
- $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
- return;
-}
-
-sub print_default_overrides {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly,$item) = @_;
- my (%titles,$checkeddom,$checkedcrs,$divsty,$currcrsval,$crsdefault,%crschecked,
- $helpfile,$title,$crselements,@currcrseditors);
- %titles = &default_overrides_titles($type);
- my ($title,$domdefdisplay,$settings,$optiontext,$options) =
- &default_overrides_common($item,$cdom,$cnum,$type,\%titles);
- $checkeddom = ' checked="checked"';
- $divsty = 'display:none';
-
- if ($item eq 'ltiauth') {
- $helpfile = 'Modify_Course_LTI_Authen';
- $crsdefault = 0;
- } else {
- if ($item eq 'exttool') {
- $helpfile = 'Modify_Course_External_Tool';
- $crsdefault = 'both';
- } elsif ($item eq 'crsauthor') {
- $helpfile = 'Modify_Course_Crsauthor';
- $crsdefault = 1;
- } elsif ($item eq 'crseditors') {
- $helpfile = 'Modify_Course_Resource_Editors';
- $crsdefault = 'edit,xml';
- }
- }
- $currcrsval = $settings->{'internal.'.$item};
- if ($currcrsval ne '') {
- $checkedcrs = $checkeddom;
- $checkeddom = '';
- $divsty = 'display:inline-block';
- if ($item eq 'crseditors') {
- @currcrseditors = split(/,/,$currcrsval);
- }
- foreach my $option (@{$options}) {
- if ($item eq 'crseditors') {
- if (grep(/^\Q$option\E$/,@currcrseditors)) {
- $crschecked{$option} = ' checked="checked"';
- }
- } elsif ($currcrsval eq $option) {
- $crschecked{$option} = ' checked="checked"';
- } else {
- $crschecked{$option} = '';
- }
- }
- } else {
- if ($item eq 'crseditors') {
- my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
- @currcrseditors = split(/,/,$domdefs{'crseditors'});
- }
- foreach my $option (@{$options}) {
- if ($item eq 'crseditors') {
- if (grep(/^\Q$option\E$/,@currcrseditors)) {
- $crschecked{$option} = ' checked="checked"';
- }
- } elsif ($crsdefault eq $option) {
- $crschecked{$option} = ' checked="checked"';
- } else {
- $crschecked{$option} = '';
- }
- }
- }
- my ($disabled,$submit,$inputtype,$separator);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = '<input type="button" onclick="javascript:changePage(this.form,'."'process${item}'".');" value="'.$titles{'modi'}.'" />';
- }
- if ($item eq 'crseditors') {
- $inputtype = 'checkbox';
- $separator = ' 'x2;
- } else {
- $inputtype = 'radio';
- $separator = '<br />';
- }
- foreach my $option (@{$options}) {
- $crselements .= '<span class="LC_nobreak">'.
- '<label><input type="'.$inputtype.'" name="'.$item.'" value="'.$option.'"'.
- $crschecked{$option}.$disabled.' />'.$optiontext->{$option}.'</label>'.
- '</span>'.$separator."\n";
- }
- &print_header($r,$type);
- my $hidden_elements = &hidden_form_elements();
- my $helpitem = &Apache::loncommon::help_open_topic($helpfile);
- my $showtype = &mt($type);
- $r->print(<<ENDDOCUMENT);
-<h3>$helpitem $title</h3>
-<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
-<form action="/adm/modifycourse" method="post" name="set$item">
-<p><span class="LC_nobreak">$titles{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span></p>
-<p><span class="LC_nobreak">
-<label><input type="radio" name="${item}set" value="dom" onclick="toggleOptions(this.form,'set$item');"$checkeddom$disabled />$titles{'used'}</label></span><br />
-<span class="LC_nobreak">
-<label><input type="radio" name="${item}set" value="course" onclick="toggleOptions(this.form,'set$item');"$checkedcrs$disabled />$titles{'cour'}</label></span></p>
-<fieldset id="crs$item" style="$divsty">
-<legend>$titles{'valu'}</legend>
-$crselements
-</fieldset><p>
-$submit
-$hidden_elements
-</p>
-</form>
-ENDDOCUMENT
- my @actions =
- ('<a href="javascript:changePage(document.set'.$item.','."'menu'".')">'.
- $titles{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
-sub default_overrides_titles {
- my ($type) = @_;
- my %titles = &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',
- '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',
- 'stan' => "'In-course' authoring of standard LON-CAPA problems",
- 'perc' => 'Permitted course resource editors',
- 'edit' => 'Standard editor (Edit)',
- 'xml' => 'Text editor (EditXML)',
- 'daxe' => 'Daxe editor (Daxe)',
- 'on' => 'In-course authoring available',
- 'off' => 'In-course authoring unavailable',
- '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 default_overrides_common {
- my ($item,$cdom,$cnum,$type,$titles) = @_;
- my ($title,$domdef,$domdefdom,$domdefdisplay,%settings,%optiontext,@options);
- if ($item eq 'ltiauth') {
- %settings = &Apache::lonnet::get('environment',['internal.'.$item],$cdom,$cnum);
- $title = $titles->{'requ'};
- $domdef = 0;
- @options = ('0','1');
- %optiontext = (
- 0 => $titles->{'logi'},
- 1 => $titles->{'link'},
- );
- } else {
- %settings =
- &Apache::lonnet::get('environment',['internal.'.$item,'internal.coursecode',
- 'internal.textbook'],$cdom,$cnum);
- if ($item eq 'exttool') {
- $title = $titles->{'extt'};
- $domdefdom = 1;
- $domdef = 0;
- @options = ('both','dom','crs','none');
- map { $optiontext{$_} = $titles->{$_}; } @options;
- } elsif ($item eq 'crsauthor') {
- $title = $titles->{'stan'};
- $domdef = 1;
- @options = ('1','0');
- %optiontext = (
- 1 => $titles->{'on'},
- 0 => $titles->{'off'},
- );
- } elsif ($item eq 'crseditors') {
- $title = $titles->{'perc'};
- $domdef = 1;
- @options = ('edit','xml','daxe');
- map { $optiontext{$_} = $titles->{$_}; } @options;
- }
- }
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
- if (($item eq 'ltiauth') || ($item eq 'crseditors')) {
- $domdef = $domconfig{'coursedefaults'}{$item};
- } else {
- my $lctype = &get_lctype($type,\%settings);
- if (ref($domconfig{'coursedefaults'}{$item}) eq 'HASH') {
- if (exists($domconfig{'coursedefaults'}{$item}{$lctype})) {
- $domdef = $domconfig{'coursedefaults'}{$item}{$lctype};
- }
- }
- if ($item eq 'exttool') {
- if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
- if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) {
- $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype};
- }
- }
- }
- }
- }
- if ($item eq 'ltiauth') {
- if ($domdef) {
- $domdefdisplay = $titles->{'link'};
- } else {
- $domdefdisplay = $titles->{'logi'};
- }
- } elsif ($item eq 'exttool') {
- if ($domdef && $domdefdom) {
- $domdefdisplay = $titles->{'both'};
- } elsif ($domdef) {
- $domdefdisplay = $titles->{'crs'};
- } elsif ($domdefdom) {
- $domdefdisplay = $titles->{'dom'};
- } else {
- $domdefdisplay = $titles->{'none'};
- }
- } elsif ($item eq 'crsauthor') {
- if ($domdef) {
- $domdefdisplay = $titles->{'on'};
- } else {
- $domdefdisplay = $titles->{'off'};
- }
- } elsif ($item eq 'crseditors') {
- if (ref($domdef) eq 'ARRAY') {
- if (@{$domdef} == 0) {
- $domdefdisplay = &mt('No permitted editors');
- } elsif (@{$domdef} == 1) {
- $domdefdisplay = $titles->{$domdef->[0]}.' ('.&mt('only').')';
- } else {
- $domdefdisplay = join(', ', map { $titles->{$_}; } @{$domdef});
- }
- } else {
- $domdefdisplay = join(', ', map { $titles->{$_}; } ('edit','xml'));
- }
- }
- return ($title,$domdefdisplay,\%settings,\%optiontext,\@options);
-}
-
sub modify_selfenrollconfig {
my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
@@ -1535,17 +1240,13 @@ sub modify_selfenrollconfig {
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'.
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="selfenrollchg">'."\n".
+ $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
+ '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
+ $r->print('<form action="/adm/modifycourse" method="post" name="selfenroll">'."\n".
&hidden_form_elements().'<br />');
&Apache::loncreateuser::update_selfenroll_config($r,$env{'form.pickedcourse'},
$cdom,$cnum,'domain',$type,\%currsettings);
$r->print('</form>');
- my @actions =
- ('<a href="javascript:changePage(document.selfenrollchg,'."'menu'".')">'.
- &mt('Pick another action').'</a>');
- $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1577,9 +1278,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]',$dctitle);
+ return &mt('Community settings modifiable only by [_1] for:',$dctitle);
} else {
- return &mt('Course settings modifiable only by [_1]',$dctitle);
+ return &mt('Course settings modifiable only by [_1] for:',$dctitle);
}
}
@@ -1602,7 +1303,7 @@ sub gather_authenitems {
unless ($curr_authtype eq '') {
$curr_authfield = $curr_authtype.'arg';
}
- my $javascript_validations =
+ my $javascript_validations =
&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
$curr_authtype,$curr_authfield);
my %param = ( formname => 'document.'.$env{'form.phase'},
@@ -1633,10 +1334,10 @@ 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)) {
+ if (&showcredits($cdom)) {
push(@items,'internal.defaultcredits');
}
my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
@@ -1759,7 +1460,7 @@ sub modify_course {
$newattr{'courseowner'}=$env{'form.courseowner'};
unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
$changed{'owner'} = 1;
- }
+ }
}
if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) {
@@ -1783,18 +1484,6 @@ sub modify_course {
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
if (($putres eq 'ok') && (($changed{'owner'} || $changed{'code'}))) {
&update_coowners($cdom,$cnum,$chome,\%settings,\%newattr);
- if ($changed{'code'}) {
- &Apache::lonnet::devalidate_cache_new('instcats',$cdom);
- # Update cache of self-cataloging courses on institution's server(s).
- if (&Apache::lonnet::shared_institution($cdom)) {
- unless ($registered_cleanup) {
- my $handlers = $r->get_handlers('PerlCleanupHandler');
- $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]);
- $registered_cleanup=1;
- $modified_dom = $cdom;
- }
- }
- }
}
}
}
@@ -1826,7 +1515,7 @@ sub modify_course {
} else {
if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
my %newenv;
- map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
+ map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
&Apache::lonnet::appenv(\%newenv);
}
foreach my $attr (@modifiable_params) {
@@ -1868,7 +1557,7 @@ sub modify_course {
$nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
}
- 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.').
'<br />'.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
@@ -1885,6 +1574,7 @@ sub modify_course {
if ($course_check eq 'ok') {
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
unless ($outcome eq 'ok') {
+
push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
}
} else {
@@ -1948,7 +1638,7 @@ sub modify_course {
$nochgresponse .= "</ul><br/><br/>";
}
my ($warning,$numwarnings);
- my $numwarnings = scalar(@warnings);
+ my $numwarnings = scalar(@warnings);
if ($numwarnings) {
$warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'<p><ul>';
foreach my $warn (@warnings) {
@@ -1962,8 +1652,8 @@ sub modify_course {
$reply = $chgresponse.$nochgresponse.$warning;
}
&print_header($r,$type);
- $reply = '<h3>'.&modifiable_only_title($type).'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+ my $mainheader = &modifiable_only_title($type);
+ $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
'<p>'.$reply.'</p>'."\n".
'<form action="/adm/modifycourse" method="post" name="processparms">'.
&hidden_form_elements();
@@ -1978,8 +1668,7 @@ sub modify_course {
push(@actions, '<a href="'.$escuri.'">'.
&mt('Go to Automated Enrollment Manager for course').'</a>');
}
- $reply .= '</form>'.
- '<br />'.&Apache::lonhtmlcommon::actionbox(\@actions);
+ $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
$r->print($reply);
return;
}
@@ -2148,9 +1837,10 @@ sub modify_quota {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
my $lctype = lc($type);
- $r->print('<h3>'.&mt("Disk space quotas for $lctype")."</h3>\n".
- '<h4><span class="LC_nobreak">'.&mt($type).' :'.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="processquota">'."\n");
+ my $headline = &mt("Disk space quotas for $lctype: [_1]",
+ '<span class="LC_nobreak">'.$cdesc.'</span>');
+ $r->print('<form action="/adm/modifycourse" method="post" name="processquota">'."\n".
+ '<h3>'.$headline.'</h3>');
my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota'],$cdom,$cnum);
my %staticdefaults = (
coursequota => 20,
@@ -2180,7 +1870,7 @@ sub modify_quota {
$showresult{$item} = 1;
}
} else {
- if ($item eq 'coursequota') {
+ if ($item eq 'coursequota') {
$r->print(&mt('The proposed group portfolio quota contained invalid characters, so the quota is unchanged.').'<br />');
} else {
$r->print(&mt('The proposed quota for content uploaded via the Content Editor contained invalid characters, so the quota is unchanged.').'<br />');
@@ -2193,7 +1883,7 @@ sub modify_quota {
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
$cnum);
foreach my $key (sort(keys(%showresult))) {
- if (($oldsettings{'internal.'.$key} eq '') &&
+ if (($oldsettings{'internal.'.$key} eq '') &&
($env{'form.'.$key} == $default{$key})) {
if ($key eq 'uploadquota') {
if ($type eq 'Community') {
@@ -2203,7 +1893,7 @@ sub modify_quota {
$r->print(&mt('The disk space allocated for files uploaded to this course via the Content Editor is the default quota for this domain: [_1] MB.',
$default{$key}).'<br />');
}
- } else {
+ } else {
if ($type eq 'Community') {
$r->print(&mt('The disk space allocated for group portfolio files in this community is the default quota for this domain: [_1] MB.',
$default{$key}).'<br />');
@@ -2246,24 +1936,23 @@ sub modify_quota {
$putreply);
}
}
+ $r->print('<p>'.
+ '<a href="javascript:changePage(document.processquota,'."'menu'".')">'.
+ &mt('Pick another action').'</a>');
$r->print(&hidden_form_elements().'</form>');
- my @actions =
- ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
- &mt('Pick another action').'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub modify_anonsurvey_threshold {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
- $r->print('<h3>'.&mt('Responder threshold required for display of anonymous survey submissions').'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="processthreshold">'."\n");
+ $r->print('<form action="/adm/modifycourse" method="post" name="processthreshold">'."\n".
+ '<h3>'.&mt('Responder threshold required for display of anonymous survey submissions:').
+ ' <span class="LC_nobreak">'.$cdesc.'</span></h3><br />');
my %oldsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- my $defaultthreshold;
+ my $defaultthreshold;
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
$defaultthreshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
if ($defaultthreshold eq '') {
@@ -2309,11 +1998,10 @@ sub modify_anonsurvey_threshold {
$r->print(&mt('The proposed responder threshold for display of anonymous submissions contained invalid characters, so the threshold is unchanged.'));
}
}
+ $r->print('<p>'.
+ '<a href="javascript:changePage(document.processthreshold,'."'menu'".')">'.
+ &mt('Pick another action').'</a></p>');
$r->print(&hidden_form_elements().'</form>');
- my @actions =
- ('<a href="javascript:changePage(document.processthreshold,'."'menu'".')">'.
- &mt('Pick another action').'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2325,19 +2013,18 @@ 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.',
- back => 'Pick another action',
+ pick => 'Pick another action',
);
- $r->print('<h3>'.$lt{'subb'}.'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="processpostsubmit"><p>'."\n");
- my %oldsettings =
+ $r->print('<form action="/adm/modifycourse" method="post" name="processpostsubmit">'."\n".
+ '<h3>'.$lt{'subb'}.' <span class="LC_nobreak">('.$cdesc.')</span></h3><br />');
+ my %oldsettings =
&Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout','internal.coursecode','internal.textbook'],$cdom,$cnum);
my $postsubmit = $env{'form.postsubmit'};
if ($postsubmit eq '1') {
my $postsubtimeout = $env{'form.postsubtimeout'};
$postsubtimeout =~ s/[^\d\.]+//g;
if (($oldsettings{'internal.postsubmit'} eq $postsubmit) && ($oldsettings{'internal.postsubtimeout'} eq $postsubtimeout)) {
- $r->print($lt{'unch'});
+ $r->print($lt{'unch'});
} else {
my %cenv = (
'internal.postsubmit' => $postsubmit,
@@ -2353,12 +2040,12 @@ sub modify_postsubmit_config {
} else {
$r->print($lt{'erro'});
}
- } else {
+ } else {
$cenv{'internal.postsubtimeout'} = $postsubtimeout;
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
if ($putreply eq 'ok') {
if ($postsubtimeout eq '0') {
- $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.'));
+ $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.'));
} else {
$r->print(&mt('Submit button will be disabled after student submission for [quant,_1,second].',$postsubtimeout));
}
@@ -2372,7 +2059,7 @@ sub modify_postsubmit_config {
$r->print($lt{'unch'});
} else {
if (exists($oldsettings{'internal.postsubtimeout'})) {
- &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
+ &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
}
my %cenv = (
'internal.postsubmit' => $postsubmit,
@@ -2387,11 +2074,10 @@ sub modify_postsubmit_config {
} else {
$r->print($lt{'inva'}.' '.$lt{'unch'});
}
- $r->print('</p>'.&hidden_form_elements().'</form>');
- my @actions =
- ('<a href="javascript:changePage(document.processpostsubmit,'."'menu'".')">'.
- $lt{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print('<p>'.
+ '<a href="javascript:changePage(document.processpostsubmit,'."'menu'".')">'.
+ &mt('Pick another action').'</a></p>');
+ $r->print(&hidden_form_elements().'</form>');
return;
}
@@ -2408,16 +2094,16 @@ sub modify_catsettings {
$desc{'categories'} = &mt('Assigned categories for this course');
$ccrole = 'cc';
}
- $r->print('<h3>'.&mt('Category settings').'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="processcat"><br />'."\n");
+ $r->print('
+<form action="/adm/modifycourse" method="post" name="processcat">
+<h3>'.&mt('Category settings').'</h3>');
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
if (@cat_params > 0) {
my (%cenv,@changes,@nochanges);
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
- my (@newcategories,%showitem);
+ my (@newcategories,%showitem);
if (grep(/^togglecats$/,@cat_params)) {
if ($currsettings{'hidefromcat'} ne $env{'form.hidefromcat'}) {
push(@changes,'hidefromcat');
@@ -2463,9 +2149,9 @@ sub modify_catsettings {
foreach my $cat (@newcategories) {
if (!grep(/^\Q$cat\E$/,@currcategories)) {
$catchg = 1;
- last;
- }
- }
+ last;
+ }
+ }
}
} else {
if (@newcategories > 0) {
@@ -2525,134 +2211,10 @@ sub modify_catsettings {
$r->print(&mt('Category settings for courses in this domain should be modified in course context (via "[_1]Course Configuration[_2]").','<a href="$escuri">','</a>').'<br />');
}
}
- $r->print('<br />'.&hidden_form_elements().'</form>');
- my @actions =
- ('<a href="javascript:changePage(document.processcat,'."'menu'".')">'.
- &mt('Pick another action').'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
- return;
-}
-
-sub modify_default_overrides {
- my ($r,$cdom,$cnum,$cdesc,$domdesc,$type,$item) = @_;
- my (%titles,$oldcrsval,$newcrsval,%resulttext,$itemvalue,$nochange,$change,$status,$error);
- %titles = &default_overrides_titles($type);
- my ($title,$domdefdisplay,$oldsettings,$optiontext,$options) =
- &default_overrides_common($item,$cdom,$cnum,$type,\%titles);
- $oldcrsval = $oldsettings->{'internal.'.$item};
- if ($item eq 'ltiauth') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'Re-authentication requirement for LTI launch of deep-linked changed',
- nochg => 'Re-authentication requirement for LTI launch of deep-linked item is unchanged',
- );
- } elsif ($item eq 'exttool') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'External Tool permissions changed',
- nochg => 'External Tool permissions unchanged',
- );
- } elsif ($item eq 'crsauthor') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'In-course authoring permissions changed',
- nochg => 'In-course authoring permissions unchanged',
- );
- } elsif ($item eq 'crseditors') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'Permitted course resource editors changed',
- nochg => 'Permitted course resource editors unchanged',
- );
- }
- &print_header($r,$type);
- $r->print('<h3>'.$title.'</h3>'."\n".
- '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
- '<form action="/adm/modifycourse" method="post" name="process'.$item.'">'."\n");
- if ($env{'form.'.$item.'set'} eq 'dom') {
- if ($oldcrsval eq '') {
- $nochange = 1;
- } else {
- $change = 1;
- }
- } elsif ($env{'form.'.$item.'set'} eq 'course') {
- if ($item eq 'crseditors') {
- my @neweditors;
- my @posseditors = &Apache::loncommon::get_env_multiple('form.'.$item);
- foreach my $editor (@posseditors) {
- if (grep(/^\Q$editor\E$/,@{$options})) {
- push(@neweditors,$editor);
- }
- }
- $newcrsval = join(',',@neweditors);
- } else {
- my $posscrsval = $env{'form.'.$item};
- if (grep(/^\Q$posscrsval\E$/,@{$options})) {
- $newcrsval = $posscrsval;
- }
- }
- if ($oldcrsval eq $newcrsval) {
- $nochange = 1;
- } else {
- $change = 1;
- }
- }
- if ($change) {
- if ($newcrsval ne '') {
- my %cenv = (
- 'internal.'.$item => $newcrsval,
- );
- if (&Apache::lonnet::put('environment',\%cenv,$cdom,$cnum) eq 'ok') {
- if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
- &Apache::lonnet::appenv(
- {'course.'.$cdom.'_'.$cnum.'.internal.'.$item => $newcrsval});
- }
- } else {
- $error = 1;
- }
- } else {
- if (&Apache::lonnet::del('environment',['internal.'.$item],$cdom,$cnum) eq 'ok') {
- if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.'.$item})) {
- &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.internal.'.$item);
- }
- } else {
- $error = 1;
- }
- }
- }
- if ($error) {
- $nochange = 1;
- }
- if ($nochange) {
- $itemvalue = $oldcrsval;
- } else {
- $itemvalue = $newcrsval;
- }
- if ($itemvalue eq '') {
- $status = $titles{'used'}.': '.
- '<span style="font-style:italic">'.$domdefdisplay.'</span>';
- } elsif ($item eq 'crseditors') {
- $status = $titles{'cour'}.': '.
- '<span style="font-style:italic">'.join(', ', map { $titles{$_}; } split(/,/,$itemvalue)).'</span>';
- } else {
- $status = $titles{'cour'}.': '.
- '<span style="font-style:italic">'.$optiontext->{$itemvalue}.'</span>';
- }
- if ($error) {
- $r->print('<p class="LC_warning">'.&mt('An error occurred when saving your changes').'</p>');
- }
- $r->print('<p>');
- if ($nochange) {
- $r->print($resulttext{'nochg'});
- } elsif ($change) {
- $r->print($resulttext{'chg'});
- }
- $r->print('<br />'.$status.'</p>'.
- &hidden_form_elements().'</form>');
- my @actions =
- ('<a href="javascript:changePage(document.process'.$item.','."'menu'".')">'.
- $titles{'back'}.'</a>');
- $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print('<br />'."\n".
+ '<a href="javascript:changePage(document.processcat,'."'menu'".')">'.
+ &mt('Pick another action').'</a>');
+ $r->print(&hidden_form_elements().'</form>');
return;
}
@@ -2694,10 +2256,9 @@ ENDJS
$js .= <<"ENDSCRIPT";
function verify_quota() {
- var newcoursequota = document.setquota.coursequota.value;
- var newuploadquota = document.setquota.uploadquota.value;
+ var newquota = document.setquota.coursequota.value;
var num_reg = $regexp;
- if ((num_reg.test(newcoursequota)) && (num_reg.test(newuploadquota))) {
+ if (num_reg.test(newquota)) {
changePage(document.setquota,'processquota');
} else {
alert("$invalid\\n$alert");
@@ -2742,7 +2303,7 @@ ENDSCRIPT
&js_escape(\$alert);
my $regexp = ' /^\s*\d+\s*$/';
- $js .= <<"ENDSCRIPT";
+ $js .= <<"ENDSCRIPT";
function verify_postsubmit() {
var optionsElement = document.setpostsubmit.postsubmit;
@@ -2774,7 +2335,7 @@ function verify_postsubmit() {
}
} else {
if (currval == 0) {
- verified = 'ok';
+ verified = 'ok';
} else {
alert('$invalid');
return false;
@@ -2792,7 +2353,7 @@ function togglePostsubmit(caller) {
var optionsElement = document.setpostsubmit.postsubmit;
if (document.getElementById(caller)) {
var divitem = document.getElementById(caller);
- var optionsElement = document.setpostsubmit.postsubmit;
+ var optionsElement = document.setpostsubmit.postsubmit;
if (optionsElement.length) {
var currval;
for (var i=0; i<optionsElement.length; i++) {
@@ -2812,49 +2373,6 @@ function togglePostsubmit(caller) {
ENDSCRIPT
- } elsif (($phase eq 'setltiauth') || ($phase eq 'setexttool') ||
- ($phase eq 'setcrseditors')) {
- $js .= <<"ENDJS";
-function toggleOptions(form,phase) {
- var radioname;
- var divid;
- if (phase == 'setltiauth') {
- radioname = 'ltiauthset';
- divid = 'crsltiauth';
- } else if (phase == 'setexttool') {
- radioname = 'exttoolset';
- divid = 'crsexttool';
- } else if (phase == 'setcrsauthor') {
- radioname = 'crsauthorset';
- divid = 'crscrsauthor';
- } else if (phase == 'setcrseditors') {
- radioname = 'crseditorsset';
- divid = 'crscrseditors';
- }
- var num = form.elements[radioname].length;
- if (num) {
- var setvis = '';
- for (var i=0; i<num; i++) {
- if (form.elements[radioname][i].checked) {
- if (form.elements[radioname][i].value == 'course') {
- if (document.getElementById(divid)) {
- document.getElementById(divid).style.display = 'inline-block';
- }
- setvis = 1;
- }
- break;
- }
- }
- if (!setvis) {
- if (document.getElementById(divid)) {
- document.getElementById(divid).style.display = 'none';
- }
- }
- }
- return;
-}
-
-ENDJS
}
my $starthash;
if ($env{'form.phase'} eq 'adhocrole') {
@@ -2865,10 +2383,6 @@ ENDJS
$starthash = {
add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
};
- } elsif ($env{'form.phase'} =~ /^set(ltiauth|exttool|crseditors)$/) {
- $starthash = {
- add_entries => {'onload' => "toggleOptions(document.$env{'form.phase'},'$env{'form.phase'}');"},
- };
}
$r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
&Apache::lonhtmlcommon::scripttag($js),
@@ -2876,18 +2390,12 @@ ENDJS
my $bread_text = "View/Modify Courses/Communities";
if ($type eq 'Community') {
$bread_text = 'Community Settings';
+ } elsif ($type eq 'Placement') {
+ $bread_text = 'Placement Test Settings';
} else {
$bread_text = 'Course Settings';
}
- my $helpcomponent;
- if ($env{'form.phase'} eq 'menu') {
- if ($type eq 'Community') {
- $helpcomponent = 'Domain_Modify_Community';
- } else {
- $helpcomponent = 'Domain_Modify_Course';
- }
- }
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,$helpcomponent));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
return;
}
@@ -2968,14 +2476,13 @@ sub course_settings_descrip {
}
sub hidden_form_elements {
- my $hidden_elements =
+ my $hidden_elements =
&Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset',
- 'exttoolset','exttool','crseditorsset','crseditors'],
+ 'sections','newsec','mysqltables','nopasswdchg'],
['^selfenrollmgr_','^selfenroll_'])."\n".
'<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
return $hidden_elements;
@@ -3009,12 +2516,6 @@ sub get_permission {
processcat => 'edit',
selfenroll => 'edit',
adhocrole => 'coord',
- setltiauth => 'edit',
- processltiauth => 'edit',
- setexttool => 'edit',
- processexttool => 'edit',
- setcrseditors => 'edit',
- processcrseditors => 'edit',
);
if ($passwdconf{'crsownerchg'}) {
$permission{passwdchg} = 'edit';
@@ -3030,9 +2531,6 @@ sub get_permission {
catsettings => 'view',
selfenroll => 'view',
adhocrole => 'custom',
- setltiauth => 'view',
- setexttool => 'view',
- setcrseditors => 'view',
);
if ($passwdconf{'crsownerchg'}) {
$permission{passwdchg} = 'view';
@@ -3041,22 +2539,6 @@ sub get_permission {
return ($allowed,\%permission);
}
-sub devalidate_remote_instcats {
- if ($modified_dom ne '') {
- my %servers = &Apache::lonnet::internet_dom_servers($modified_dom);
- my %thismachine;
- map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
- if (keys(%servers)) {
- foreach my $server (keys(%servers)) {
- next if ($thismachine{$server});
- &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]);
- }
- }
- $modified_dom = '';
- }
- return OK;
-}
-
sub handler {
my $r = shift;
if ($r->header_only) {
@@ -3065,9 +2547,6 @@ sub handler {
return OK;
}
- $registered_cleanup=0;
- $modified_dom = '';
-
my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');
my ($allowed,$permission) = &get_permission($dom);
@@ -3098,9 +2577,11 @@ sub handler {
}
if ($type eq 'Community') {
$choose_text = "Choose a community";
+ } elsif ($type eq 'Placement') {
+ $choose_text = "Choose a placement test";
} else {
$choose_text = "Choose a course";
- }
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$firstform,'')",
text=>"Course/Community search"},
@@ -3114,6 +2595,8 @@ sub handler {
my $enter_text;
if ($type eq 'Community') {
$enter_text = 'Enter community';
+ } elsif ($type eq 'Placement') {
+ $enter_text = 'Enter placement test';
} else {
$enter_text = 'Enter course';
}
@@ -3136,11 +2619,11 @@ sub handler {
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($readonly,$linktext);
if ($permission->{$phase} eq 'view') {
- $readonly = 1;
+ $readonly = 1;
}
if (($phase eq 'setquota') && ($permission->{'setquota'})) {
if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
+ $linktext = 'Set quota';
} else {
$linktext = 'Display quota';
}
@@ -3148,7 +2631,7 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>$linktext});
&print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
+ } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setquota')",
text=>"Set quota"});
@@ -3227,53 +2710,19 @@ sub handler {
if (!exists($env{'form.state'})) {
&print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly);
} elsif ($env{'form.state'} eq 'done') {
- &Apache::lonhtmlcommon::add_breadcrumb
+ &Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_selfenrollconfig($r,$type,$cdesc,$coursehash);
}
- } elsif (($phase eq 'setltiauth') && ($permission->{'setltiauth'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Authentication post-LTI launch"});
- &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'ltiauth');
- } elsif (($phase eq 'processltiauth') && ($permission->{'processltiauth'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setltiauth')",
- text=>"Authentication post-LTI launch"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'ltiauth');
- } elsif (($phase eq 'setexttool') && ($permission->{'setexttool'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"External Tool permission"});
- &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'exttool');
- } elsif (($phase eq 'processexttool') && ($permission->{'processexttool'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setexttool')",
- text=>"External Tool permission"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'exttool');
- } elsif (($phase eq 'setcrseditors') && ($permission->{'setcrseditors'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Available course resource editors"});
- &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'crseditors');
- } elsif (($phase eq 'processcrseditors') && ($permission->{'processcrseditors'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setcrseditors')",
- text=>"Available course resource editors"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'crseditors');
}
}
} else {
$r->print('<span class="LC_error">');
if ($type eq 'Community') {
$r->print(&mt('The community you selected is not a valid community in this domain'));
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt('The course you selected is not a valid placement test in this domain'));
} else {
$r->print(&mt('The course you selected is not a valid course in this domain'));
}