[LON-CAPA-cvs] cvs: loncom /interface lonmodifycourse.pm
raeburn
raeburn@source.lon-capa.org
Mon, 09 Nov 2009 03:50:27 -0000
This is a MIME encoded message
--raeburn1257738627
Content-Type: text/plain
raeburn Mon Nov 9 03:50:27 2009 EDT
Modified files:
/loncom/interface lonmodifycourse.pm
Log:
- Accommodate Communities.
- More concise wording
- Links to course's 'Automated Enrollment Manager' via role switcher.
- For Courses use pick_box() in interface for modification of institutional code,
default authentication and owner.
- Eliminate unused code.
--raeburn1257738627
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20091109035027.txt"
Index: loncom/interface/lonmodifycourse.pm
diff -u loncom/interface/lonmodifycourse.pm:1.47 loncom/interface/lonmodifycourse.pm:1.48
--- loncom/interface/lonmodifycourse.pm:1.47 Fri Oct 23 16:14:43 2009
+++ loncom/interface/lonmodifycourse.pm Mon Nov 9 03:50:27 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.47 2009/10/23 16:14:43 bisitz Exp $
+# $Id: lonmodifycourse.pm,v 1.48 2009/11/09 03:50:27 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,12 +35,23 @@
use Apache::lonlocal;
use Apache::lonuserutils;
use Apache::lonpickcourse;
-use LONCAPA::Enrollment;
use lib '/home/httpd/lib/perl';
use LONCAPA;
sub get_dc_settable {
- return ('courseowner','coursecode','authtype','autharg');
+ my ($type) = @_;
+ if ($type eq 'Community') {
+ return ('courseowner');
+ } else {
+ return ('courseowner','coursecode','authtype','autharg');
+ }
+}
+
+sub autoenroll_keys {
+ my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops',
+ 'autostart','autoend','sectionnums','crosslistings'];
+ my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
+ return ($internals,$accessdates);
}
sub catalog_settable {
@@ -61,14 +72,17 @@
sub get_enrollment_settings {
my ($cdom,$cnum) = @_;
- my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum);
+ my ($internals,$accessdates) = &autoenroll_keys();
+ my @items;
+ if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+ @items = map { 'internal.'.$_; } (@{$internals});
+ push(@items,@{$accessdates});
+ }
+ my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
my %enrollvar;
$enrollvar{'autharg'} = '';
$enrollvar{'authtype'} = '';
- my %lt=&Apache::lonlocal::texthash(
- 'noen' => "No end date",
- );
- foreach my $item (keys %settings) {
+ foreach my $item (keys(%settings)) {
if ($item =~ m/^internal\.(.+)$/) {
my $type = $1;
if ( ($type eq "autoadds") || ($type eq "autodrops") ) {
@@ -79,9 +93,9 @@
}
} elsif ( ($type eq "autostart") || ($type eq "autoend") ) {
if ( ($type eq "autoend") && ($settings{$item} == 0) ) {
- $enrollvar{$type} = $lt{'noen'};
+ $enrollvar{$type} = &mt('No end date');
} else {
- $enrollvar{$type} = localtime($settings{$item});
+ $enrollvar{$type} = &Apache::lonlocal::locallocaltime($settings{$item});
}
} elsif ($type eq "sectionnums") {
$enrollvar{$type} = $settings{$item};
@@ -102,11 +116,11 @@
} elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
my $type = $1;
if ( ($type eq 'end') && ($settings{$item} == 0) ) {
- $enrollvar{$item} = $lt{'noen'};
+ $enrollvar{$item} = &mt('No end date');
} elsif ( ($type eq 'start') && ($settings{$item} eq '') ) {
$enrollvar{$item} = 'When enrolled';
} else {
- $enrollvar{$item} = localtime($settings{$item});
+ $enrollvar{$item} = &Apache::lonlocal::locallocaltime($settings{$item});
}
}
}
@@ -115,57 +129,62 @@
sub print_course_search_page {
my ($r,$dom,$domdesc) = @_;
- &print_header($r);
+ my $action = '/adm/modifycourse';
+ my $type = $env{'form.type'};
+ if (!defined($env{'form.type'})) {
+ $type = 'Course';
+ }
+ &print_header($r,$type);
my $filterlist = ['descriptfilter',
'instcodefilter','ownerfilter',
'coursefilter'];
my $filter = {};
- my ($numtitles,$type,$cctitle,$dctitle);
- $type = $env{'form.type'};
- if (!defined($env{'form.type'})) {
- $type = 'Course';
+ my ($numtitles,$cctitle,$dctitle);
+ my $ccrole = 'cc';
+ if ($type eq 'Community') {
+ $ccrole = 'co';
}
- my $action = '/adm/modifycourse';
- $cctitle = &Apache::lonnet::plaintext('cc',$type);
+ $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
$dctitle = &Apache::lonnet::plaintext('dc');
$r->print(&Apache::lonpickcourse::js_changer());
- if ($type eq 'Course') {
- $r->print(
- '<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>'.
- &mt('Actions available after searching for a course:').'<ul>'.
- '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
- '<li>'.&mt('View or modify course settings which only a [_1] may modify.'
- ,$dctitle).'</li>'."\n".'</ul>');
- } else {
- $r->print(
- '<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>'.
- &mt('Actions available after searching for a community:').'<ul>'.
- '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
- '<li>'.&mt('View or modify community settings which only a [_1] may modify.'
- ,$dctitle).'</li>'."\n".'</ul>');
+ if ($type eq 'Community') {
+ $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
+ } else {
+ $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
}
$r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
undef,undef,$filter,$action,\$numtitles,'modifycourse'));
+ if ($type eq 'Community') {
+ $r->print(&mt('Actions available after searching for a community:').'<ul>'.
+ '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
+ '<li>'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
+ '</li>'."\n".'</ul>');
+ } else {
+ $r->print(&mt('Actions available after searching for a course:').'<ul>'.
+ '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
+ '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
+ '</li>'."\n".'</ul>');
+ }
}
sub print_course_selection_page {
my ($r,$dom,$domdesc) = @_;
- &print_header($r);
+ my $type = $env{'form.type'};
+ if (!defined($type)) {
+ $type = 'Course';
+ }
+ &print_header($r,$type);
# Criteria for course search
my $filterlist = ['descriptfilter',
'instcodefilter','ownerfilter',
'ownerdomfilter','coursefilter'];
my %filter;
- my $type = $env{'form.type'};
- if (!defined($type)) {
- $type = 'Course';
- }
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
my $numtitles;
$r->print(&Apache::lonpickcourse::js_changer());
- $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br /><br />');
+ $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
$r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
undef,undef,\%filter,$action,\$numtitles));
$filter{'domainfilter'} = $dom;
@@ -177,59 +196,86 @@
}
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom) = @_;
- &print_header($r,$cdesc);
- my $type = 'Course';
+ my ($r,$cdesc,$domdesc,$dom,$type) = @_;
+ &print_header($r,$type);
+ my ($ccrole,$setquota_text,$setparams_text,$cat_text);
+ if ($type eq 'Community') {
+ $ccrole = 'co';
+ } else {
+ $ccrole = 'cc';
+ }
my $action = '/adm/modifycourse';
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $dctitle = &Apache::lonnet::plaintext('dc');
- my %lt=&Apache::lonlocal::texthash(
- 'some' => "Certain settings which control auto-enrollment of students from your institution's student information system.",
- 'crqo' => 'The total disk space allocated for storage of portfolio files in all groups in a course.',
- );
+ if ($type eq 'Community') {
+ $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
+ $setparams_text = 'View/Modify community owner';
+ $cat_text = 'View/Modify catalog settings for community';
+ } else {
+ $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
+ $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
+ $cat_text = 'View/Modify catalog settings for course';
+ }
my @menu =
(
- { text => 'Modify quota for group portfolio',
- phase => 'setquota',
- },
- { text => 'Display current settings for automated enrollment',
- phase => 'viewparms',
- },
- { text => 'Modify institutional code, course owner and/or default authentication',
- phase => 'setparms',
+ { text => $setparams_text,
+ phase => 'setparms',
},
- );
+ { text => 'View/Modify quota for group portfolio files',
+ phase => 'setquota',
+ }
+ );
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my @additional_params = &catalog_settable($domconf{'coursecategories'});
if (@additional_params > 0) {
- push (@menu, { text => 'Modify course catalog settings for course',
+ push (@menu, { text => $cat_text,
phase => 'catsettings',
});
}
- my $menu_html = '<h3>'.&mt('View/Modify settings for: ').$cdesc.'</h3>'."\n".
- &mt('Although almost all course settings can be modified by a [_1], a number of settings exist which only a [_2] may change:',$cctitle,$dctitle).'
-<ul>
- <li>'.$lt{'some'}.'</li>
- <li>'.$lt{'crqo'}.'</li>'."\n";
+ unless ($type eq 'Community') {
+ push(@menu,
+ { text => 'Display current settings for automated enrollment',
+ phase => 'viewparms',
+ }
+ );
+ }
+ my $menu_html = '<h3>'.&mt('View/Modify settings for: ').
+ ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n";
+ 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 .= '<ul>';
+ if ($type eq 'Community') {
+ $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>';
+ } else {
+ $menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'.
+ '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>';
+ }
+ $menu_html .= '<li>'.$setquota_text.'</li>'."\n";
foreach my $item (@additional_params) {
- if ($item eq 'togglecats') {
- $menu_html .= ' <li>'.&mt('Hiding a course from the course catalog (can be [_1]configured[_2] to be modifiable in course context)','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
- } elsif ($item eq 'categorize') {
- $menu_html .= ' <li>'.&mt('Manual cataloging of a course (can be [_1]configured[_2] to be modifiable in course context)','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
-
+ 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).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</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).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</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).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</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).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+ }
}
}
$menu_html .= ' </ul>
<form name="menu" method="post" action="'.$action.'" />'."\n".
&hidden_form_elements();
-
foreach my $menu_item (@menu) {
- $menu_html.='<p>';
- $menu_html.='<font size="+1">';
+ $menu_html.='<h3>';
$menu_html.=
qq|<a href="javascript:changePage(document.menu,'$menu_item->{'phase'}')">|;
- $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
- $menu_html.='</p>';
+ $menu_html.= &mt($menu_item->{'text'}).'</a>';
+ $menu_html.='</h3>';
}
$r->print($menu_html);
@@ -237,8 +283,8 @@
}
sub print_ccrole_selected {
- my ($r,$cdesc,$domdesc) = @_;
- &print_header($r);
+ my ($r,$type) = @_;
+ &print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
$r->print('<form name="ccrole" method="post" action="/adm/roles">
<input type="hidden" name="selectrole" value="1" />
@@ -249,89 +295,86 @@
sub print_settings_display {
my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
- my %longtype = &course_settings_descrip();
+ my %longtype = &course_settings_descrip($type);
my %lt = &Apache::lonlocal::texthash(
- 'cset' => "Course setting",
- 'valu' => "Current value",
- 'caes' => 'Current automated enrollment settings for ',
- 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:",
- 'cose' => "Course settings for LON-CAPA courses that control auto-enrollment based on classlist data available from your institution's student information system fall into two groups:",
- 'dcon' => "Modifiable by DC only",
- 'back' => "Back to options page",
+ 'valu' => 'Current value',
+ 'cour' => 'Current settings are:',
+ 'cose' => "Settings which control auto-enrollment using classlists from your institution's student information system fall into two groups:",
+ 'dcon' => 'Modifiable only by Domain Coordinator',
+ 'back' => 'Pick another action',
);
-
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+ my $ccrole = 'cc';
+ if ($type eq 'Community') {
+ $ccrole = 'co';
+ }
+ my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
my $dctitle = &Apache::lonnet::plaintext('dc');
- my @modifiable_params = &get_dc_settable();
-
+ my @modifiable_params = &get_dc_settable($type);
+ my ($internals,$accessdates) = &autoenroll_keys();
+ my @items;
+ if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+ @items = (@{$internals},@{$accessdates});
+ }
my $disp_table = &Apache::loncommon::start_data_table()."\n".
&Apache::loncommon::start_data_table_header_row()."\n".
- "<th>$lt{'cset'}</th>\n".
+ "<th> </th>\n".
"<th>$lt{'valu'}</th>\n".
"<th>$lt{'dcon'}</th>\n".
&Apache::loncommon::end_data_table_header_row()."\n";
- foreach my $key (sort(keys(%enrollvar))) {
+ foreach my $item (@items) {
$disp_table .= &Apache::loncommon::start_data_table_row()."\n".
- "<td>$longtype{$key}</td>\n".
- "<td>$enrollvar{$key}</td>\n";
- if (grep(/^\Q$key\E$/,@modifiable_params)) {
- $disp_table .= '<td>'.&mt('Yes').'</td>'."\n";
+ "<td><b>$longtype{$item}</b></td>\n".
+ "<td>$enrollvar{$item}</td>\n";
+ if (grep(/^\Q$item\E$/,@modifiable_params)) {
+ $disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n";
} else {
- $disp_table .= '<td>'.&mt('No').'</td>'."\n";
+ $disp_table .= '<td align="right">'.&mt('No').'</td>'."\n";
}
$disp_table .= &Apache::loncommon::end_data_table_row()."\n";
}
$disp_table .= &Apache::loncommon::end_data_table()."\n";
- &print_header($r,$cdesc);
- $r->print('
-<h3>'.$lt{'caes'}.$cdesc.'</h3>
-<form action="/adm/modifycourse" method="post" name="viewparms">
-<p>
-'.$lt{'cose'}.'
-<ul><li>
-'.&mt('Settings that can be modified by a [_1] using the [_2]Automated Enrollment Manager[_3].'
- ,$cctitle,'<a href="/adm/populate">','</a>').'
-</li><li>
-'.&mt('Settings that may only be modified by a [_1] from this menu.',$dctitle).'
-</li></ul>
-</p><p>
-'.$lt{'cour'}.'
-</p><p>
-'.$disp_table.'
-</p><p>
-<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>
-<a href="javascript:changePage(document.viewparms,'."'setparms'".')">'.&mt('Modify [_1]-only settings',$dctitle).'</a>'."\n".
-&hidden_form_elements().
-'</p></form>');
+ &print_header($r,$type);
+ my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+ my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+ '=1&destinationurl=/adm/populate','&<>"');
+ $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'}.'<ul>'.
+ '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>'.
+ '<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n".
+ '</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) = @_;
- my $dctitle = &Apache::lonnet::plaintext('dc');
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $subdiv = &mt('Although a [_1] will assign the disk quota for each individual group, the size of the quota is constrained by the total disk space allocated by the [_2] for portfolio files in a course.',$cctitle,$dctitle);
my %lt = &Apache::lonlocal::texthash(
- 'cquo' => 'Disk space for storage of group portfolio',
+ 'cquo' => 'Disk space for storage of group portfolio files for:',
'gpqu' => 'Course portfolio files disk space',
- 'each' => 'Each course group can be assigned a quota for portfolio files uploaded to the group.',
'modi' => 'Save',
- 'back' => "Back to options page",
+ 'back' => 'Pick another action',
);
+ if ($type eq 'Community') {
+ $lt{'gpqu'} = &mt('Community portfolio files disk space');
+ }
my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
if ($coursequota eq '') {
$coursequota = 20;
}
- &print_header($r,$cdesc);
+ &print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
+ my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota');
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setquota">
-<h3>$lt{'cquo'}.</h3>
+<h3>$lt{'cquo'} <span class="LC_nobreak">$cdesc</span></h3>
<p>
-$lt{'each'}<br />
-$subdiv
-</p><p>
-$lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> Mb
+$helpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> Mb
<input type="button" onClick="javascript:verify_quota(this.form)" value="$lt{'modi'}" />
</p>
$hidden_elements
@@ -342,13 +385,24 @@
}
sub print_catsettings {
- my ($r,$cdom,$cnum,$cdesc) = @_;
- &print_header($r,$cdesc);
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ &print_header($r,$type);
my %lt = &Apache::lonlocal::texthash(
- 'back' => 'Back to options page',
+ 'back' => 'Pick another action',
+ 'catset' => 'Catalog Settings for Course',
+ 'visi' => 'Visibility in Course/Community Catalog',
+ 'exclude' => 'Exclude from course catalog:',
+ 'categ' => 'Categorize Course',
+ 'assi' => 'Assign one or more categories and/or subcategories to this course.'
);
+ if ($type eq 'Community') {
+ $lt{'catset'} = &mt('Catalog Settings for Community');
+ $lt{'exclude'} = &mt('Exclude from course catalog');
+ $lt{'categ'} = &mt('Categorize Community');
+ $lt{'assi'} = &mt('Assign one or more categories and/or subcategories to this community.');
+ }
$r->print('<form action="/adm/modifycourse" method="post" name="catsettings">'.
- '<h3>'.&mt('Catalog Settings for Course').'</h3>');
+ '<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'});
if (@cat_params > 0) {
@@ -361,18 +415,24 @@
$excludeon = $excludeoff;
$excludeoff = '';
}
- $r->print('<h4>'.&mt('Visibility in Course/Community Catalog').'</h4>'.
- &mt("Unless excluded, a course/community is listed in this 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 into at least one of the course categories defined for the domain.').'</li></ul>'.
- &mt('Exclude from course catalog').' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br />');
+ $r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
+ $lt{'exclude'}.
+ ' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&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."));
+ } 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").':<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>');
}
if (grep(/^categorize$/,@cat_params)) {
- $r->print('<h4>'.&mt('Categorize Course').'</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(&mt('Assign one or more categories to this course.').'<br /><br />'.
+ $r->print($lt{'assi'}.'<br /><br />'.
&Apache::loncommon::assign_categories_table($cathash,
$currsettings{'categories'}));
} else {
@@ -381,12 +441,20 @@
} else {
$r->print(&mt('No categories defined for this domain'));
}
- $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 ($type eq 'Community') {
+ $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>');
+ }
}
- $r->print('<input type="button" name="chgcatsettings" value="'.
- &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" />');
+ $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">'.&mt('Catalog settings in this domain are set in course context via "Set Course Environment".').'</span><br /><br />'."\n".
+ $r->print('<span class="LC_warning">');
+ if ($type eq 'Community') {
+ $r->print(&mt('Catalog settings in this domain are set in community context via "Community Configuration".'));
+ } else {
+ $r->print(&mt('Catalog settings in this domain are set in course context via "Course Configuration".'));
+ }
+ $r->print('</span><br /><br />'."\n".
'<a href="javascript:changePage(document.catsettings,'."'menu'".');">'.
$lt{'back'}.'</a>');
}
@@ -395,102 +463,154 @@
}
sub print_course_modification_page {
- my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_;
- my %longtype = &course_settings_descrip();
- my %enrollvar = &get_enrollment_settings($cdom,$cnum);
- my $ownertable;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %lt=&Apache::lonlocal::texthash(
'actv' => "Active",
'inac' => "Inactive",
- 'ccor' => "Course Coordinator",
- 'noen' => "No end date",
'ownr' => "Owner",
'name' => "Name",
'unme' => "Username:Domain",
'stus' => "Status",
- 'cquo' => "Disk space for storage of group portfolio",
- 'gpqu' => "Course portfolio files disk space",
- 'each' => "Each course group can be assigned a quota for portfolio files uploaded to the group.",
- 'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ",
- 'aenm' => "Automated Enrollment Manager",
- 'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.",
- 'caes' => 'Current automated enrollment settings',
- 'cour' => "Course settings that control automated enrollment in this LON-CAPA course
-are currently:",
- 'nocc' => "There is currently no course owner set for this course. In addition, no active course coordinators from this LON-CAPA domain were found, so you will not be able assign a course owner. If you wish to assign a course owner, it is recommended that you use the 'User Roles' screen to add a course coordinator with a LON-CAPA account in this domain to the course.",
- 'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change
-all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).",
- 'ccod' => "Course Code",
- 'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.",
- 'cown' => "Course Owner",
- 'cous' => "The course owner is used in the retrieval of class lists from your institution's student information system when access to class lists data incorporates validation of instructor status.",
- 'tabl' => 'The table below contains a list of active course coordinators in this course, who are from this domain',
- 'usrd' => 'Use the radio buttons to select a different course owner.',
- 'deam' => "Default Authentication method",
- 'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the <authtype> and <autharg> properties for the new student. If you choose 'internally authenticated', and leave the initial password field empty, the automated enrollment process will create a randomized password for each new student account that it adds to your LON-CAPA domain.",
+ 'nocc' => 'There is currently no owner set for this course.',
'gobt' => "Save",
);
-
- my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum);
- my @local_ccs = ();
- my %cc_status = ();
- my %pname = ();
- my $active_cc;
- foreach my $person (@coursepersonnel) {
- my ($role,$user) = split(/:/,$person,2);
- $user =~ s/:$//;
- if (($role eq 'cc') && ($user ne '')) {
- if (!grep(/^\Q$user\E$/,@local_ccs)) {
- my ($ccname,$ccdom) = split(/:/,$user);
- $active_cc =
- &Apache::loncommon::check_user_status($ccdom,$ccname,$cdom,
- $cnum,'cc');
- if ($active_cc eq 'active') {
- push(@local_ccs,$user);
- $pname{$user} = &Apache::loncommon::plainname($ccname,$ccdom);
- $cc_status{$user} = $lt{'actv'};
- }
- }
+ my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
+ my %enrollvar = &get_enrollment_settings($cdom,$cnum);
+ if ($type eq 'Community') {
+ $ccrole = 'co';
+ $lt{'nocc'} = &mt('There is currently no owner set for this community.');
+ } else {
+ $ccrole ='cc';
+ ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar);
+ }
+ $ccname = &Apache::lonnet::plaintext($ccrole,$type);
+ my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]);
+ my (@local_ccs,%cc_status,%pname);
+ foreach my $item (keys(%roleshash)) {
+ my ($uname,$udom) = split(/:/,$item);
+ if (!grep(/^\Q$uname\E:\Q$udom\E$/,@local_ccs)) {
+ push(@local_ccs,$uname.':'.$udom);
+ $pname{$uname.':'.$udom} = &Apache::loncommon::plainname($uname,$udom);
+ $cc_status{$uname.':'.$udom} = $lt{'actv'};
}
}
- if ( (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs)) &&
- ($enrollvar{'courseowner'} ne '') ) {
- my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
+ if (($enrollvar{'courseowner'} ne '') &&
+ (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) {
push(@local_ccs,$enrollvar{'courseowner'});
+ my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
$pname{$enrollvar{'courseowner'}} =
&Apache::loncommon::plainname($owneruname,$ownerdom);
- $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
- $cdom,$cnum,'cc');
+ my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
+ $cdom,$cnum,$ccrole);
if ($active_cc eq 'active') {
$cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};
} else {
$cc_status{$enrollvar{'courseowner'}} = $lt{'inac'};
}
}
- my $numlocalcc = @local_ccs;
+ @local_ccs = sort(@local_ccs);
+ if (@local_ccs == 0) {
+ $ownertable = $lt{'nocc'};
+ } else {
+ my $numlocalcc = scalar(@local_ccs);
+ $ownertable = '<input type="hidden" name="numlocalcc" value="'.$numlocalcc.'" />'.
+ &Apache::loncommon::start_data_table()."\n".
+ &Apache::loncommon::start_data_table_header_row()."\n".
+ '<th>'.$lt{'ownr'}.'</th>'.
+ '<th>'.$lt{'name'}.'</th>'.
+ '<th>'.$lt{'unme'}.'</th>'.
+ '<th>'.$lt{'stus'}.'</th>'.
+ &Apache::loncommon::end_data_table_header_row()."\n";
+ foreach my $cc (@local_ccs) {
+ $ownertable .= &Apache::loncommon::start_data_table_row()."\n";
+ if ($cc eq $enrollvar{'courseowner'}) {
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked" /></td>'."\n";
+ } else {
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" /></td>'."\n";
+ }
+ $ownertable .=
+ '<td>'.$pname{$cc}.'</td>'."\n".
+ '<td>'.$cc.'</td>'."\n".
+ '<td>'.$cc_status{$cc}.' '.$ccname.'</td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
+ $ownertable .= &Apache::loncommon::end_data_table();
+ }
+ &print_header($r,$type,$javascript_validations);
+ my $dctitle = &Apache::lonnet::plaintext('dc');
+ my $mainheader = &modifiable_only_title($type);
+ my $hidden_elements = &hidden_form_elements();
+ $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 ($type eq 'Community') {
+ $r->print(&Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Community_Owner').
+ ' '.&mt('Community Owner'))."\n");
+ } else {
+ $r->print(&Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Instcode').
+ ' '.&mt('Course Code'))."\n".
+ '<input type="text" size="10" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
+ ' '.&mt('Default Authentication method'))."\n".
+ $authenitems."\n".
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Owner').
+ ' '.&mt('Course Owner'))."\n");
+ }
+ $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements.
+ '<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
+ if ($type eq 'Community') {
+ $r->print('this.form.submit();"');
+ } else {
+ $r->print('javascript:verify_message(this.form);"');
+ }
+ $r->print('value="'.$lt{'gobt'}.'" /></p></form>');
+ return;
+}
+
+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);
+ } else {
+ return &mt('Course settings modifiable only by [_1] for:',$dctitle);
+ }
+}
- my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses"));
+sub gather_authenitems {
+ my ($cdom,$enrollvar) = @_;
my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom);
my $curr_authtype = '';
my $curr_authfield = '';
- if ($enrollvar{'authtype'} =~ /^krb/) {
- $curr_authtype = 'krb';
- } elsif ($enrollvar{'authtype'} eq 'internal' ) {
- $curr_authtype = 'int';
- } elsif ($enrollvar{'authtype'} eq 'localauth' ) {
- $curr_authtype = 'loc';
+ if (ref($enrollvar) eq 'HASH') {
+ if ($enrollvar->{'authtype'} =~ /^krb/) {
+ $curr_authtype = 'krb';
+ } elsif ($enrollvar->{'authtype'} eq 'internal' ) {
+ $curr_authtype = 'int';
+ } elsif ($enrollvar->{'authtype'} eq 'localauth' ) {
+ $curr_authtype = 'loc';
+ }
}
unless ($curr_authtype eq '') {
$curr_authfield = $curr_authtype.'arg';
}
- my $javascript_validations=&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield);
+ my $javascript_validations =
+ &Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
+ $curr_authtype,$curr_authfield);
my %param = ( formname => 'document.'.$env{'form.phase'},
- kerb_def_dom => $krbdefdom,
- kerb_def_auth => $krbdef,
+ kerb_def_dom => $krbdefdom,
+ kerb_def_auth => $krbdef,
mode => 'modifycourse',
curr_authtype => $curr_authtype,
- curr_autharg => $enrollvar{'autharg'}
- );
+ curr_autharg => $enrollvar->{'autharg'}
+ );
my (%authform,$authenitems);
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
$authform{'int'} = &Apache::loncommon::authform_internal(%param);
@@ -499,169 +619,79 @@
if ($authform{$item} ne '') {
$authenitems .= $authform{$item}.'<br />';
}
- }
- if ($numlocalcc == 0) {
- $ownertable = $lt{'nocc'};
}
-
- if ($numlocalcc > 0) {
- @local_ccs = sort @local_ccs;
- $ownertable = qq(
- <input type="hidden" name="numlocalcc" value="$numlocalcc" />
- <table>
- <tr>
- <td>$lt{'tabl'} - $cdom ($domdesc). $lt{'usrd'}
- </td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td>).
- &Apache::loncommon::start_data_table()."\n".
- &Apache::loncommon::start_data_table_header_row()."\n".
- "<th>$lt{'ownr'}</th>\n".
- "<th>$lt{'name'}</th>\n".
- "<th>$lt{'unme'}</th>\n".
- "<th>$lt{'stus'}</th>\n".
- &Apache::loncommon::end_data_table_header_row()."\n";
- foreach my $cc (@local_ccs) {
- $ownertable .= &Apache::loncommon::start_data_table_row()."\n";
- if ($cc eq $enrollvar{'courseowner'}) {
- $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked" /></td>'."\n";
- } else {
- $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" /></td>'."\n";
- }
- $ownertable .=
- '<td>'.$pname{$cc}.'</td>'."\n".
- '<td>'.$cc.'</td>'."\n".
- '<td>'.$cc_status{$cc}.' '.$lt{'ccor'}.'</td>'."\n".
- &Apache::loncommon::end_data_table_row()."\n";
- }
- $ownertable .= &Apache::loncommon::end_data_table()."
- </td>
- </tr>
- </table>";
- }
- &print_header($r,$cdesc,$javascript_validations);
- my $type = $env{'form.type'};
- if ($type eq '') {
- $type = 'Course';
- }
- my $dctitle = &Apache::lonnet::plaintext('dc');
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $mainheader = &mt('Course settings modifiable by [_1] only.',$dctitle);
- my $hidden_elements = &hidden_form_elements();
- $r->print(<<ENDDOCUMENT);
-<form action="/adm/modifycourse" method="post" name="$env{'form.phase'}">
-<h3>$mainheader</h3>
-</p><p>
-<table width="100%" cellspacing="6" cellpadding="6">
- <tr>
- <td colspan="2">Use the appropriate text boxes and radio buttons below to change some or all of the four automated enrollment settings that may only be changed by a Domain Coordinator.
- </tr>
- <tr>
- <td width="50%" valign="top">
- <b>$lt{'ccod'}:</b>
- <input type="text" size="10" name="coursecode" value="$enrollvar{'coursecode'}"/><br/><br/>
- $lt{'ccus'}
- </td>
- <td width="50%" valign="top" rowspan="2">
- <b>$lt{'cown'}:</b><br/><br/>
- $ownertable
- <br/><br/>
- $lt{'cous'}
- </td>
- </tr>
- <tr>
- <td width="50%" valign="top">
- <b>$lt{'deam'}:</b><br/><br/>
- $authenitems
- <br/>
- $lt{'deus'}.
- </td>
- <td width="50%"> </td>
- </tr>
-</table>
-<table width="90%" cellpadding="5" cellspacing="0">
- <tr>
- <td align="left">
- $hidden_elements
- <input type="button" onClick="javascript:changePage(this.form,'processparms');javascript:verify_message(this.form)" value="$lt{'gobt'}" />
- </td>
- </tr>
-</table>
-</form>
-<br/>
-<br/>
-ENDDOCUMENT
- return;
+ return($javascript_validations,$authenitems);
}
sub modify_course {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
- my %longtype = &course_settings_descrip();
- my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$cdom,$cnum);
- my %currattr = ();
- my %newattr = ();
- my %cenv = ();
- my $response;
- my $chgresponse;
- my $nochgresponse;
- my $warning;
- my $reply;
- my @changes = ();
- my @nochanges = ();
- my @sections = ();
- my @xlists = ();
- my %changed = ( code => 0,
- owner => 0,
- );
- unless ($settings{'internal.sectionnums'} eq '') {
- if ($settings{'internal.sectionnums'} =~ m/,/) {
- @sections = split/,/,$settings{'internal.sectionnums'};
- } else {
- $sections[0] = $settings{'internal.sectionnums'};
- }
+ my %longtype = &course_settings_descrip($type);
+ my @items = ('internal.courseowner','description');
+ unless ($type eq 'Community') {
+ push(@items,('internal.coursecode','internal.authtype','internal.autharg',
+ 'internal.sectionnums','internal.crosslistings'));
}
- unless ($settings{'internal.crosslistings'} eq'') {
- if ($settings{'internal.crosslistings'} =~ m/,/) {
- @xlists = split/,/,$settings{'internal.crosslistings'};
- } else {
- $xlists[0] = $settings{'internal.crosslistings'};
- }
- }
-
- my @modifiable_params = &get_dc_settable();
+ my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
+ my $description = $settings{'description'};
+ my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr,%cenv,%changed,
+ @changes,@nochanges,@sections,@xlists,@warnings);
+ my @modifiable_params = &get_dc_settable($type);
foreach my $param (@modifiable_params) {
- my $attr = 'internal.'.$param;
- $currattr{$param} = $settings{$attr};
+ $currattr{$param} = $settings{'internal.'.$param};
}
-
- my $description = $settings{'description'};
-
- if ($env{'form.login'} eq 'krb') {
- $newattr{'authtype'} = $env{'form.login'};
- $newattr{'authtype'} .= $env{'form.krbver'};
- $newattr{'autharg'} = $env{'form.krbarg'};
- } elsif ($env{'form.login'} eq 'int') {
- $newattr{'authtype'} ='internal';
- if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
- $newattr{'autharg'} = $env{'form.intarg'};
- }
- } elsif ($env{'form.login'} eq 'loc') {
- $newattr{'authtype'} = 'localauth';
- if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
- $newattr{'autharg'} = $env{'form.locarg'};
- }
- }
- if ( $newattr{'authtype'}=~ /^krb/) {
- if ($newattr{'autharg'} eq '') {
- $warning = '<p class="LC_warning">'
- .&mt('As you did not include the default Kerberos domain'
+ if ($type eq 'Community') {
+ %changed = ( owner => 0 );
+ $ccrole = 'co';
+ } else {
+ %changed = ( code => 0,
+ owner => 0,
+ );
+ $ccrole = 'cc';
+ unless ($settings{'internal.sectionnums'} eq '') {
+ if ($settings{'internal.sectionnums'} =~ m/,/) {
+ @sections = split/,/,$settings{'internal.sectionnums'};
+ } else {
+ $sections[0] = $settings{'internal.sectionnums'};
+ }
+ }
+ unless ($settings{'internal.crosslistings'} eq'') {
+ if ($settings{'internal.crosslistings'} =~ m/,/) {
+ @xlists = split/,/,$settings{'internal.crosslistings'};
+ } else {
+ $xlists[0] = $settings{'internal.crosslistings'};
+ }
+ }
+ if ($env{'form.login'} eq 'krb') {
+ $newattr{'authtype'} = $env{'form.login'};
+ $newattr{'authtype'} .= $env{'form.krbver'};
+ $newattr{'autharg'} = $env{'form.krbarg'};
+ } elsif ($env{'form.login'} eq 'int') {
+ $newattr{'authtype'} ='internal';
+ if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
+ $newattr{'autharg'} = $env{'form.intarg'};
+ }
+ } elsif ($env{'form.login'} eq 'loc') {
+ $newattr{'authtype'} = 'localauth';
+ if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+ $newattr{'autharg'} = $env{'form.locarg'};
+ }
+ }
+ if ( $newattr{'authtype'}=~ /^krb/) {
+ if ($newattr{'autharg'} eq '') {
+ push(@warnings,
+ &mt('As you did not include the default Kerberos domain'
.' to be used for authentication in this class, the'
.' institutional data used by the automated'
.' enrollment process must include the Kerberos'
- .' domain for each new student.')
- .'</p>';
+ .' domain for each new student.'));
+ }
+ }
+
+ if ( exists($env{'form.coursecode'}) ) {
+ $newattr{'coursecode'}=$env{'form.coursecode'};
+ unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
+ $changed{'code'} = 1;
+ }
}
}
@@ -671,19 +701,17 @@
$changed{'owner'} = 1;
}
}
-
- if ( exists($env{'form.coursecode'}) ) {
- $newattr{'coursecode'}=$env{'form.coursecode'};
- unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
- $changed{'code'} = 1;
- }
- }
+
if ($changed{'owner'} || $changed{'code'}) {
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,
undef,undef,'.');
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
- $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'};
- $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
+ if ($changed{'code'}) {
+ $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'};
+ }
+ if ($changed{'owner'}) {
+ $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
+ }
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
}
@@ -692,73 +720,84 @@
if ($currattr{$param} eq $newattr{$param}) {
push(@nochanges,$param);
} else {
- my $attr = 'internal.'.$param;
- $cenv{$attr} = $newattr{$param};
+ $cenv{'internal.'.$param} = $newattr{$param};
push(@changes,$param);
}
}
if (@changes > 0) {
- $chgresponse = &mt("The following automated enrollment parameters have been changed:<br/><ul>");
+ $chgresponse = &mt("The following settings have been changed:<br/><ul>");
}
- if (@nochanges > 0) {
- $nochgresponse = &mt("The following automated enrollment parameters remain unchanged:<br/><ul>");
+ if (@nochanges > 0) {
+ $nochgresponse = &mt("The following settings remain unchanged:<br/><ul>");
}
if (@changes > 0) {
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
if ($putreply !~ /^ok$/) {
- $response = &mt("There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>").&mt('Error: ').$putreply;
+ $response = '<p class="LC_error">'.
+ &mt('There was a problem processing your requested changes.').'<br />';
+ if ($type eq 'Community') {
+ $response .= &mt('Settings for this community have been left unchanged.');
+ } else {
+ $response .= &mt('Settings for this course have been left unchanged.');
+ }
+ $response .= '<br/>'.&mt('Error: ').$putreply.'</p>';
} else {
foreach my $attr (@modifiable_params) {
- if (grep/^$attr$/,@changes) {
- $chgresponse .= "<li>$longtype{$attr} ".&mt("now set to \"").$newattr{$attr}."\".</li>";
+ if (grep/^\Q$attr\E$/,@changes) {
+ $chgresponse .= '<li>'.$longtype{$attr}.' '.&mt('now set to:').' "'.$newattr{$attr}.'".</li>';
} else {
- $nochgresponse .= "<li>$longtype{$attr} ".&mt("still set to \"").$currattr{$attr}."\".</li>";
+ $nochgresponse .= '<li>'.$longtype{$attr}.' '.&mt('still set to:').' "'.$currattr{$attr}.'".</li>';
}
}
- if ($changed{'code'} || $changed{'owner'}) {
+ if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
if ( $newattr{'courseowner'} eq '') {
- $warning .= &mt("There is no owner associated with this LON-CAPA course. If automated enrollment in LON-CAPA courses at your institution requires validation of course owners, automated enrollment will fail for this course.<br/>");
+ 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.'));
} else {
if (@sections > 0) {
if ($changed{'code'}) {
foreach my $sec (@sections) {
if ($sec =~ m/^(.+):/) {
+ my $instsec = $1;
my $inst_course_id = $newattr{'coursecode'}.$1;
my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);
if ($course_check eq 'ok') {
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
- unless ($outcome eq 'ok') {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
+ 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 {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $course_check.<br/>");
+ 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,$course_check));
}
} else {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
}
}
} elsif ($changed{'owner'}) {
foreach my $sec (@sections) {
if ($sec =~ m/^(.+):/) {
- my $inst_course_id = $newattr{'coursecode'}.$1;
+ my $instsec = $1;
+ my $inst_course_id = $newattr{'coursecode'}.$instsec;
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
unless ($outcome eq 'ok') {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
+ 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));
}
} else {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section [_3] because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
}
}
}
} else {
- $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";
+ push(@warnings,&mt('As no section numbers are currently listed for "[_1]" automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
}
if ( (@xlists > 0) && ($changed{'owner'}) ) {
foreach my $xlist (@xlists) {
if ($xlist =~ m/^(.+):/) {
- my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$1,$newattr{'courseowner'});
+ my $instxlist = $1;
+ my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'});
unless ($outcome eq 'ok') {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for crosslisted class: ").$1.&mt(" for the following reason: $outcome.<br/>");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));
}
}
}
@@ -768,7 +807,7 @@
}
} else {
foreach my $attr (@modifiable_params) {
- $nochgresponse .= "<li>$longtype{$attr} ".&mt("still set to")." \"".$currattr{$attr}."\".</li>";
+ $nochgresponse .= '<li>'.$longtype{$attr}.' '.&mt('still set to').' "'.$currattr{$attr}.'".</li>';
}
}
@@ -778,38 +817,47 @@
if (@nochanges > 0) {
$nochgresponse .= "</ul><br/><br/>";
}
- unless ($warning eq '') {
- $warning = &mt("The following warning messages were generated as a result of applying the changes you specified to course settings that can affect the automated enrollment process:<br/><br/>").$warning;
+ my ($warning,$numwarnings);
+ 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) {
+ $warning .= '<li><span class="LC_warning">'.$warn.'</span></li>';
+ }
+ $warning .= '</ul></p>';
}
- if ($response eq '') {
- $reply = $chgresponse.$nochgresponse.$warning;
- } else {
+ if ($response) {
$reply = $response;
+ } else {
+ $reply = $chgresponse.$nochgresponse.$warning;
}
- &print_header($r,$cdesc);
- $reply = '<h3>'.
- &mt('Result of Changes to Automated Enrollment Settings.').
- '</h3>'."\n".
- '<table><tr><td>'.$reply.'</td></tr></table>'.
+ &print_header($r,$type);
+ 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().
- '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.&mt('Back to options page').'</a>
- </form>';
+ '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
+ &mt('Pick another action').'</a>';
+ if ($numwarnings) {
+ my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+ my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+ '=1&destinationurl=/adm/populate','&<>"');
+
+ $reply .= '<br /><a href="'.$escuri.'">'.
+ &mt('Go to Automated Enrollment Manager for course').'</a>';
+ }
+ $reply .= '</form>';
$r->print($reply);
return;
}
sub modify_quota {
- my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_;
- &print_header($r,$cdesc);
-
- my %lt = &Apache::lonlocal::texthash(
- 'back' => 'Back to options page',
- );
- $r->print('
-<form action="/adm/modifycourse" method="post" name="processquota">
-<h3>'.&mt('Disk space for storage of group portfolio for [_1]',$cdesc).
- '</h3>');
+ my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+ &print_header($r,$type);
+ $r->print('<form action="/adm/modifycourse" method="post" name="processquota">'."\n".
+ '<h3>'.&mt('Disk space for storage of group portfolio files for:').
+ ' <span class="LC_nobreak">'.$cdesc.'</span></h3><br />');
my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
my $defaultquota = 20;
if ($env{'form.coursequota'} ne '') {
@@ -817,7 +865,7 @@
if ($newquota =~ /^\s*(\d+\.?\d*|\.\d+)\s*$/) {
$newquota = $1;
if ($oldsettings{'internal.coursequota'} eq $env{'form.coursequota'}) {
- $r->print(&mt('The disk space allocated for group portfolio remains unchanged as ').$env{'form.coursequota'}.' Mb');
+ $r->print(&mt('The disk space allocated for group portfolio files remains unchanged as [_1] Mb.',$env{'form.coursequota'}));
} else {
my %cenv = (
'internal.coursequota' => $env{'form.coursequota'},
@@ -826,23 +874,34 @@
$cnum);
if (($oldsettings{'internal.coursequota'} eq '') &&
($env{'form.coursequota'} == $defaultquota)) {
- $r->print(&mt('The disk space allocated for group portfolio in this course is the default quota for this domain:').' '.$defaultquota.' Mb');
+ 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.',$defaultquota));
+ } else {
+ $r->print(&mt('The disk space allocated for group portfolio files in this course is the default quota for this domain: [_1] Mb.',$defaultquota));
+ }
} else {
if ($putreply eq 'ok') {
my %updatedsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
- $r->print(&mt('The disk space allocated for group portfolio is now:').' '.$updatedsettings{'internal.coursequota'}.' Mb.');
+ $r->print(&mt('The disk space allocated for group portfolio files is now: [_1] Mb.',$updatedsettings{'internal.coursequota'}));
my $usage = &Apache::longroup::sum_quotas($cdom.'_'.$cnum);
if ($usage >= $updatedsettings{'internal.coursequota'}) {
my $newoverquota;
if ($usage < $oldsettings{'internal.coursequota'}) {
$newoverquota = 'now';
}
- $r->print('<br /><br />'.
- &mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.
- &mt('Upload of new portfolio files and assignment of a non-zero Mb quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.'));
+ $r->print('<p>');
+ if ($type eq 'Community') {
+ $r->print(&mt('Disk usage [_1] exceeds the quota for this community.',$newoverquota).' '.
+ &mt('Upload of new portfolio files and assignment of a non-zero Mb quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.'));
+ } else {
+ $r->print(&mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.
+ &mt('Upload of new portfolio files and assignment of a non-zero Mb quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.'));
+ }
+ $r->print('</p>');
}
} else {
- $r->print(&mt('There was an error'));
+ $r->print(&mt('An error occurred storing the quota for group portfolio files: ').
+ $putreply);
}
}
}
@@ -850,22 +909,26 @@
$r->print(&mt('The new quota requested contained invalid characters, so the quota is unchanged.'));
}
}
- $r->print(qq|<br /><br />
-<a href="javascript:changePage(document.processquota,'menu')">$lt{'back'}</a>|);
+ $r->print('<p>'.
+ '<a href="javascript:changePage(document.processquota,'."'menu'".')">'.
+ &mt('Pick another action').'</a>');
$r->print(&hidden_form_elements().'</form>');
return;
}
sub modify_catsettings {
- my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_;
- &print_header($r,$cdesc);
- my %lt = &Apache::lonlocal::texthash(
- 'back' => 'Back to options page',
- );
- my %desc = &Apache::lonlocal::texthash(
- 'hidefromcat' => 'Excluded from course catalog',
- 'categories' => 'Assigned categories for this course',
- );
+ my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+ &print_header($r,$type);
+ my ($ccrole,%desc);
+ if ($type eq 'Community') {
+ $desc{'hidefromcat'} = &mt('Excluded from community catalog');
+ $desc{'categories'} = &mt('Assigned categories for this community');
+ $ccrole = 'co';
+ } else {
+ $desc{'hidefromcat'} = &mt('Excluded from course catalog');
+ $desc{'categories'} = &mt('Assigned categories for this course');
+ $ccrole = 'cc';
+ }
$r->print('
<form action="/adm/modifycourse" method="post" name="processcat">
<h3>'.&mt('Category settings').'</h3>');
@@ -951,33 +1014,40 @@
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
}
- $r->print(&mt('The following changes occurred').'<ul>');
+ $r->print(&mt('The following changes occurred:').'<ul>');
foreach my $item (@changes) {
- $r->print('<li>'.&mt('[_1] now set to [_2]',$desc{$item},$showitem{$item}).'</li>');
+ $r->print('<li>'.&mt('[_1] now set to: [_2]',$desc{$item},$showitem{$item}).'</li>');
}
$r->print('</ul><br />');
}
}
if (@nochanges > 0) {
- $r->print(&mt('The following were unchanged').'<ul>');
+ $r->print(&mt('The following were unchanged:').'<ul>');
foreach my $item (@nochanges) {
- $r->print('<li>'.&mt('[_1] still set to [_2]',$desc{$item},$showitem{$item}).'</li>');
+ $r->print('<li>'.&mt('[_1] still set to: [_2]',$desc{$item},$showitem{$item}).'</li>');
}
$r->print('</ul>');
}
}
} else {
- $r->print(&mt('Category settings for courses in this domain should be modified in course context (via "Set Course Environment").').'<br />');
+ my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+ my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+ '=1&destinationurl=/adm/courseprefs','&<>"');
+ if ($type eq 'Community') {
+ $r->print(&mt('Category settings for communities in this domain should be modified in community context (via "[_1]Community Configuration[_2]").','<a href="$escuri">','</a>').'<br />');
+ } else {
+ $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 />'."\n".
'<a href="javascript:changePage(document.processcat,'."'menu'".')">'.
- $lt{'back'}.'</a>');
+ &mt('Pick another action').'</a>');
$r->print(&hidden_form_elements().'</form>');
return;
}
sub print_header {
- my ($r,$cdesc,$javascript_validations) = @_;
+ my ($r,$type,$javascript_validations) = @_;
my $phase = "start";
if ( exists($env{'form.phase'}) ) {
$phase = $env{'form.phase'};
@@ -1030,17 +1100,15 @@
add_entries => {'onload' => "javascript:document.ccrole.submit();"},
};
}
- $r->print(&Apache::loncommon::start_page('View/Modify Course Settings',
+ $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
$js,$starthash));
- my $bread_text = "View/Modify Courses";
- if ($cdesc ne '') {
- $bread_text = &mt('Course Settings: [_1]',$cdesc);
- my $no_mt = 1;
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,undef,undef,
- undef,undef,$no_mt));
+ my $bread_text = "View/Modify Courses/Communities";
+ if ($type eq 'Community') {
+ $bread_text = 'Community Settings';
} else {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
+ $bread_text = 'Course Settings';
}
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
return;
}
@@ -1086,7 +1154,15 @@
}
sub course_settings_descrip {
- my %longtype = &Apache::lonlocal::texthash(
+ my ($type) = @_;
+ my %longtype;
+ if ($type eq 'Community') {
+ %longtype = &Apache::lonlocal::texthash(
+ 'courseowner' => "Username:domain of community owner",
+ );
+
+ } else {
+ %longtype = &Apache::lonlocal::texthash(
'authtype' => 'Default authentication method',
'autharg' => 'Default authentication parameter',
'autoadds' => 'Automated adds',
@@ -1098,9 +1174,10 @@
'coursecode' => 'Official course code',
'courseowner' => "Username:domain of course owner",
'notifylist' => 'Course Coordinators to be notified of enrollment changes',
- 'sectionnums' => 'Course section number(:LON-CAPA section)',
- 'crosslistings' => 'Crosslisted class(:LON-CAPA section)',
- );
+ 'sectionnums' => 'Course section number:LON-CAPA section',
+ 'crosslistings' => 'Crosslisted class:LON-CAPA section',
+ );
+ }
return %longtype;
}
@@ -1135,37 +1212,49 @@
if ($phase eq '') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/modifycourse",
- text=>"Course search"});
+ text=>"Course/Community search"});
&print_course_search_page($r,$dom,$domdesc);
} else {
my $firstform = $phase;
if ($phase eq 'courselist') {
$firstform = 'filterpicker';
+ }
+ my $choose_text;
+ my $type = $env{'form.type'};
+ if ($type eq '') {
+ $type = 'Course';
+ }
+ if ($type eq 'Community') {
+ $choose_text = "Choose a community";
+ } else {
+ $choose_text = "Choose a course";
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$firstform,'')",
- text=>"Course search"},
+ text=>"Course/Community search"},
{href=>"javascript:changePage(document.$phase,'courselist')",
- text=>"Choose a course"});
+ text=>$choose_text});
if ($phase eq 'courselist') {
&print_course_selection_page($r,$dom,$domdesc);
} else {
my ($checked,$cdesc) = &check_course($r,$dom,$domdesc);
- my $type = $env{'form.type'};
- if ($type eq '') {
- $type = 'Course';
- }
if ($checked eq 'ok') {
+ my $enter_text;
+ if ($type eq 'Community') {
+ $enter_text = 'Enter community';
+ } else {
+ $enter_text = 'Enter course';
+ }
if ($phase eq 'menu') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
- &print_modification_menu($r,$cdesc,$domdesc,$dom);
+ &print_modification_menu($r,$cdesc,$domdesc,$dom,$type);
} elsif ($phase eq 'ccrole') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'ccrole')",
- text=>"Enter course"});
- &print_ccrole_selected($r,$cdesc,$domdesc);
+ text=>$enter_text});
+ &print_ccrole_selected($r,$type);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
@@ -1183,7 +1272,7 @@
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
- &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc);
+ &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type);
} elsif ($phase eq 'viewparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'viewparms')",
@@ -1193,7 +1282,7 @@
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Change settings"});
- &print_course_modification_page($r,$cdom,$cnum,$cdesc,$domdesc);
+ &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type);
} elsif ($phase eq 'processparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setparms')",
@@ -1214,18 +1303,24 @@
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
- &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc);
+ &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
}
}
} else {
- $r->print('<span class="LC_error">'.&mt('The course you selected is not a valid course in this domain')." ($domdesc)".'</span>');
+ $r->print('<span class="LC_error">');
+ if ($type eq 'Community') {
+ $r->print(&mt('The course you selected is not a valid course in this domain'));
+ } else {
+ $r->print(&mt('The community you selected is not a valid community in this domain'));
+ }
+ $r->print(" ($domdesc)</span>");
}
}
}
&print_footer($r);
} else {
$env{'user.error.msg'}=
- "/adm/modifycourse:ccc:0:0:Cannot modify course settings";
+ "/adm/modifycourse:ccc:0:0:Cannot modify course/community settings";
return HTTP_NOT_ACCEPTABLE;
}
return OK;
--raeburn1257738627--