--- loncom/interface/courseprefs.pm 2010/01/08 00:04:04 1.19
+++ loncom/interface/courseprefs.pm 2010/09/17 02:10:42 1.28.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.19 2010/01/08 00:04:04 faziophi Exp $
+# $Id: courseprefs.pm,v 1.28.2.2 2010/09/17 02:10:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,6 +28,185 @@
###############################################################
##############################################################
+=pod
+
+=head1 NAME
+
+courseprefs- Handler to set/modify course configuration
+
+=head1 SYNOPSIS
+
+courseprefs provides an interface for setting general course configuration
+
+=head1 DESCRIPTION
+
+This module is used for configuration of a course
+
+=head1 INTERNAL SUBROUTINES
+
+=over
+
+=item get_allitems()
+
+=item print_config_box()
+
+=item process_changes()
+
+=item get_sec_str()
+
+=item check_clone()
+
+=item store_changes()
+
+=item update_env()
+
+=item display_disallowed()
+
+=item get_course()
+
+=item get_jscript()
+
+=item cloners_javascript()
+
+=item print_courseinfo()
+
+=item new_cloners_dom_row()
+
+=item can_modify_catsettings()
+
+=item assign_course_categories()
+
+=item print_localization()
+
+=item get_lang_choices()
+
+=item print_feedback()
+
+=item user_table()
+
+=item select_recipient()
+
+=item select_sections()
+
+=item print_discussion()
+
+=item role_checkboxes()
+
+=item print_classlists()
+
+=item print_appearance()
+
+=item print_grading()
+
+=item print_printouts()
+
+=item print_spreadsheet()
+
+=item print_bridgetasks()
+
+=item print_other()
+
+=item get_other_items()
+
+=item item_table_row_start()
+
+=item item_table_row_end()
+
+=item yes_no_radio()
+
+=item select_from_options()
+
+=item make_item_rows()
+
+Creates table used to display and set course configuration items.
+
+Inputs: $cdom,$items,$ordered,$settings,$rowtotal,$crstype
+where $cdom is course's domain, $items is HASH ref for current config
+item, $ordered is ARRAY ref of items to include in row in
+display order, $settings is HASH ref of current values forrow,
+$rowtotal is SCALAR ref used to accumulate row count, $crstype is
+course type.
+
+Returns: $datatable
+HTML mark-up of data table which accumulates individual rows.
+
+=item nothidepriv_row()
+
+Creates row containing form elements used to display and set
+whether Domain coordinators who are currently included in
+advanced course user .db file for a course are to be hidden (e.g.,
+in syllabus, or from course user lists).
+
+Inputs: $cdom,$item,$settings,$crstype
+where $cdom is course domain, item is nothideprivileged, $settings is
+HASH ref of the current values for nothideprivileged, $crstype is
+course type (Course or Community).
+
+Return: $datatable
+HTML mark-up for Privileged users (Domain Coordinators) in staff listing.
+
+=item print_hdrfmt_row()
+
+Creates row containing form elements used to display and set
+substitution items and text to be used in the header included
+on printouts.
+
+Inputs: $item,$settings
+where $item is print_header_format, and $settings is a HASH ref
+of the current values stored for print_header_format.
+
+Returns: $output
+HTML mark-up containing Javascript functions: reOrder() and getIndexByName()
+used to dynamically update position selectboxes, and HTML table elements
+for the "Print header format" row.
+
+=item position_selector()
+
+Creates a select box which can be used to reorder substitutions
+and text included in a printout header.
+
+Inputs: $pos,$num,$maxnum
+where $pos is current position, $num is the unique identifier,
+and $maxnum is the total number of items (both substitutions
+and text in the printout header.
+
+Returns: $output
+HTML mark-up for the selectbox and a hidden form element containing
+the current position.
+
+=item substitution_selector()
+
+Creates a combination of select box for choosing an item
+(student name, course ID or assignment note) to substitute,
+and a corresponding size limit in the header used for printouts.
+
+Inputs: $num,$subst,$limit,$crstype
+where $num is the unique identifier, $subst is the current
+substitution (n,c or a, for name, course or note respectively,
+$limit is the current size limit (integer), and $crstype is
+course type - course or community.
+
+Returns: $output
+HTML mark-up for selectbox and textbox (separate table cells).
+
+=item change_clone()
+
+Modifies the list of courses a user can clone (stored
+in the user's environment.db file), called when a
+change is made to the list of users allowed to clone
+a course.
+
+Inputs: $action,$cloner
+where $action is add or drop, and $cloner is identity of
+user for whom cloning ability is to be changed in course.
+
+Returns: nothing
+
+=back
+
+=cut
+
+
package Apache::courseprefs;
use strict;
@@ -93,6 +272,8 @@ sub handler {
gens => 'General community settings',
idnu => 'Community ID or number',
desc => 'Community Description',
+ ownr => 'Community Owner',
+ cown => 'Community Co-owners',
catg => 'Categorize community',
excc => 'Exclude from community catalog',
clon => 'Users allowed to clone community',
@@ -115,15 +296,17 @@ sub handler {
%lt = (
conf => 'Course Configuration',
edit => 'Edit Course Configuration',
- gens => 'General Settings',
- idnu => 'ID/Number',
- desc => 'Title',
+ gens => 'General course settings',
+ idnu => 'Course ID or number',
+ desc => 'Course Description',
+ ownr => 'Course Owner',
+ cown => 'Course Co-owners',
catg => 'Categorize course',
excc => 'Exclude from course catalog',
clon => 'Users allowed to clone course',
rept => 'Replacement titles for standard course roles',
- time => 'Timezone',
- date => 'Calendar Locale',
+ time => 'Timezone in which the course takes place',
+ date => 'Locale used for course calendar',
coco => 'Course Content',
copo => 'Course Policy',
priv => 'Domain Coordinators in course',
@@ -161,32 +344,38 @@ sub handler {
'courseinfo' =>
{ text => $lt{'gens'},
help => 'Course_Environment',
- ordered => ['description','courseid','categories',
- 'hidefromcat','externalsyllabus',
- 'cloners','url','rolenames'],
+ header => [{col1 => 'Setting',
+ col2 => 'Value'}],
+ ordered => ['owner','co-owners','description','courseid',
+ 'categories','hidefromcat','externalsyllabus',
+ 'url','rolenames','cloners'],
itemtext => {
- description => $lt{'desc'},
- courseid => $lt{'idnu'},
- categories => $lt{'catg'},
- hidefromcat => $lt{'excc'},
- cloners => $lt{'clon'},
- externalsyllabus => 'External Syllabus URL',
- url => 'Top Level Map',
- rolenames => $lt{'rept'},
+ 'owner' => $lt{'ownr'},
+ 'co-owners' => $lt{'cown'},
+ 'description' => $lt{'desc'},
+ 'courseid' => $lt{'idnu'},
+ 'categories' => $lt{'catg'},
+ 'hidefromcat' => $lt{'excc'},
+ 'cloners' => $lt{'clon'},
+ 'externalsyllabus' => 'URL of Syllabus',
+ 'url' => 'Top Level Map',
+ 'rolenames' => $lt{'rept'},
},
},
'localization' =>
- { text => 'Language & Time Localization',
+ { text => 'Language and Time Localization',
help => 'Course_Environment',
+ header => [{col1 => 'Setting',
+ col2 => 'Value',}],
ordered => ['languages','timezone','datelocale'],
itemtext => {
- languages => 'Language(s)',
+ languages => 'Languages used',
timezone => $lt{'time'},
datelocale => $lt{'date'},
},
},
'feedback' =>
- { text => 'Feedback Messages',
+ { text => 'Feedback messages',
help => 'Course_Environment',
header => [{col1 => 'Questions about:',
col2 => 'Recipients'},
@@ -207,12 +396,12 @@ sub handler {
'allow_limited_html_in_feedback',
'allow_discussion_post_editing'],
itemtext => {
- 'plc.roles.denied' => 'Disable resource discussion',
- 'plc.users.denied' => 'Disable resource discussion',
- 'pch.roles.denied' => 'Disable chat room',
- 'pch.users.denied' => 'Disable chat room',
- allow_limited_html_in_feedback => 'HTML in discussion',
- allow_discussion_post_editing => 'Allow users to edit/delete own discussion posts',
+ 'plc.roles.denied' => 'No Resource Discussion',
+ 'plc.users.denied' => 'No Resource Discussion',
+ 'pch.roles.denied' => 'No Chat room use',
+ 'pch.users.denied' => 'No Chat room use',
+ allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
+ allow_discussion_post_editing => 'Users can edit/delete own discussion posts',
},
},
'classlists' =>
@@ -227,46 +416,52 @@ sub handler {
ordered => ['default_enrollment_start_date',
'default_enrollment_end_date',
'nothideprivileged','student_classlist_view',
- 'student_opt_in','student_classlist_portfiles'],
+ 'student_classlist_opt_in','student_classlist_portfiles'],
itemtext => {
default_enrollment_start_date => 'Start date',
default_enrollment_end_date => 'End date',
nothideprivileged => $lt{'priv'},
student_classlist_view => $lt{'stuv'},
- student_opt_in => $lt{'stul'},
+ student_classlist_opt_in => $lt{'stul'},
student_classlist_portfiles => 'Include link to accessible portfolio files',
},
},
'appearance' =>
- { text => 'Display of Resources ',
+ { text => 'Display of resources ',
help => 'Course_Environment',
+ header => [{col1 => 'Setting',
+ col2 => 'Value',}],
ordered => ['default_xml_style','pageseparators',
'disable_receipt_display','texengine',
'tthoptions'],
itemtext => {
default_xml_style => 'Default XML style file',
- pageseparators => 'Separate items on composite pages',
- disable_receipt_display => 'Disable problem receipts display',
- texengine => 'Force specific math rendering engine',
+ pageseparators => 'Visibly Separate Items on Pages',
+ disable_receipt_display => 'Disable display of problem receipts',
+ texengine => 'Force use of a specific math rendering engine',
tthoptions => 'Default set of options to pass to tth/m when converting TeX',
},
},
'grading' =>
{ text => 'Grading',
help => 'Course_Environment',
+ header => [{col1 => 'Setting',
+ col2 => 'Value',}],
ordered => ['grading','rndseed',
'receiptalg','disablesigfigs'],
itemtext => {
- grading => 'Grading Type',
- rndseed => 'Randomization algorithm',
- receiptalg => 'Receipt algorithm',
- disablesigfigs => 'Disable significant figure checks',
+ grading => 'Grading',
+ rndseed => 'Randomization algorithm used',
+ receiptalg => 'Receipt algorithm used',
+ disablesigfigs => 'Disable checking of Significant Figures',
},
},
'printouts' =>
- { text => 'Printouts',
+ { text => 'Printout generation',
help => 'Course_Environment',
+ header => [{col1 => 'Setting',
+ col2 => 'Value',}],
ordered => ['problem_stream_switch','suppress_tries',
'default_paper_size','print_header_format',
'disableexampointprint','canuse_pdfforms'],
@@ -282,6 +477,8 @@ sub handler {
'spreadsheet' =>
{ text => 'Spreadsheets',
help => 'Course_Environment',
+ header => [{col1 => 'Setting',
+ col2 => 'Value'}],
ordered => ['spreadsheet_default_classcalc',
'spreadsheet_default_studentcalc',
'spreadsheet_default_assesscalc','hideemptyrows'],
@@ -295,6 +492,8 @@ sub handler {
'bridgetasks' =>
{ text => 'Bridge tasks',
help => 'Course_Environment',
+ header => [{col1 => 'Setting',
+ col2 => 'Value'}],
ordered => ['task_messages','task_grading',
'suppress_embed_prompt'],
itemtext => {
@@ -350,12 +549,17 @@ sub print_config_box {
my $itemtext = $item->{'itemtext'};
my $rowtotal = 0;
my $output =
- '<h3><a href="#">'.&mt($item->{text}).'</a></h3>
- <div> <span style="float:right">'.
- &Apache::loncommon::help_open_topic($item->{'help'}).'</span>';
+ '<table class="LC_nested_outer">
+ <tr>
+ <th align="left" valign="middle"><span class="LC_nobreak" style="font-size: larger;" >'.
+ &mt($item->{text}).' '.
+ &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
+ '</tr>';
if (($action eq 'feedback') || ($action eq 'classlists')) {
$output .= '
- <table class="LC_nested">';
+ <tr>
+ <td>
+ <table class="LC_nested">';
if (exists $item->{'header'}->[0]->{'col1'} ||
exists $item->{'header'}->[0]->{'col2'}) {
$output .= '
@@ -372,6 +576,10 @@ sub print_config_box {
}
$output .= '
</table>
+ </td>
+ </tr>
+ <tr>
+ <td>
<table class="LC_nested">
<tr class="LC_info_row">
<td class="LC_left_item">'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
@@ -382,6 +590,10 @@ sub print_config_box {
$output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
'
</table>
+ </td>
+ </tr>
+ <tr>
+ <td>
<table class="LC_nested">';
if (exists $item->{'header'}->[0]->{'col1'} ||
exists $item->{'header'}->[0]->{'col2'}) {
@@ -390,10 +602,12 @@ sub print_config_box {
<td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
<td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
</tr>';
- }
+ }
}
} else {
$output .= '
+ <tr>
+ <td>
<table class="LC_nested">';
if (exists $item->{'header'}->[0]->{'col1'} ||
exists $item->{'header'}->[0]->{'col2'}) {
@@ -430,7 +644,9 @@ sub print_config_box {
}
$output .= '
</table>
-</div>';
+ </td>
+ </tr>
+</table><br />';
return ($output,$rowtotal);
}
@@ -547,10 +763,14 @@ sub process_changes {
my @cloners = split(',',$env{'form.'.$entry});
my @okcloners;
foreach my $cloner (@cloners) {
- my ($uname,$udom) = split(':',$cloner);
- if (&check_clone($udom,$disallowed,$uname) eq 'ok') {
- if (!grep(/^\Q$cloner\E$/,@okcloners)) {
- push(@okcloners,$cloner);
+ $cloner =~ s/^\s+//;
+ $cloner =~ s/\s+$//;
+ unless ($cloner eq '') {
+ my ($uname,$udom) = split(':',$cloner);
+ if (&check_clone($udom,$disallowed,$uname) eq 'ok') {
+ if (!grep(/^\Q$cloner\E$/,@okcloners)) {
+ push(@okcloners,$cloner);
+ }
}
}
}
@@ -571,6 +791,80 @@ sub process_changes {
}
}
}
+ } elsif ($entry eq 'co-owners') {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $coowners = $values->{'internal.co-owners'};
+ my @currcoown;
+ if ($coowners) {
+ @currcoown = split(',',$coowners);
+ }
+ if (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
+ my $autocoowner;
+ if (($crstype eq 'Course') &&
+ ($values->{'internal.coursecode'})) {
+ my %domconf =
+ &Apache::lonnet::get_dom('configuration',['autoenroll'],$cdom);
+ if (ref($domconf{'autoenroll'}) eq 'HASH') {
+ $autocoowner = $domconf{'autoenroll'}{'co-owners'};
+ }
+ }
+ unless ($autocoowner) {
+ my @keepcoowners = &Apache::loncommon::get_env_multiple('form.coowners');
+ my @pendingcoowners = &Apache::loncommon::get_env_multiple('form.pendingcoowners');
+ my @invitecoowners = &Apache::loncommon::get_env_multiple('form.invitecoowners');
+ if (@invitecoowners) {
+ push(@pendingcoowners,@invitecoowners);
+ }
+ $newvalues{'pendingco-owners'} = join(',',sort(@pendingcoowners));
+ $newvalues{'co-owners'} = join(',',sort(@keepcoowners));
+ if ($newvalues{'co-owners'} ne $values->{'internal.co-owners'}) {
+ $changes->{$entry}{'co-owners'} = $newvalues{'co-owners'};
+ push(@{$changes->{$entry}{'changed'}},'co-owners');
+ }
+ if ($newvalues{'pendingco-owners'} ne $values->{'internal.pendingco-owners'}) {
+ $changes->{$entry}{'pendingco-owners'} = $newvalues{'pendingco-owners'};
+ push(@{$changes->{$entry}{'changed'}},'pendingco-owners');
+ }
+ }
+ } else {
+ my (@newpending,@newcoown);
+ my $uname = $env{'user.name'};
+ my $udom = $env{'user.domain'};
+ my $pendingcoowners = $values->{'internal.pendingco-owners'};
+ my @pendingcoown = split(',',$pendingcoowners);
+ if ($env{'form.pending_coowoner'}) {
+ foreach my $item (@pendingcoown) {
+ unless ($item eq $uname.':'.$udom) {
+ push(@newpending,$item);
+ }
+ }
+ @newcoown = @currcoown;
+ if ($env{'form.pending_coowoner'} eq 'accept') {
+ unless (grep(/^\Q$uname\E:\Q$udom\E$/,@currcoown)) {
+ push(@newcoown,$uname.':'.$udom);
+ }
+ }
+ } elsif ($env{'form.remove_coowoner'}) {
+ foreach my $item (@currcoown) {
+ unless ($item eq $uname.':'.$udom) {
+ push(@newcoown,$item);
+ }
+ }
+ if ($pendingcoowners ne '') {
+ @newpending = @pendingcoown;
+ }
+ }
+ $newvalues{'pendingco-owners'} = join(',',sort(@newpending));
+ $newvalues{'co-owners'} = join(',',sort(@newcoown));
+ if ($newvalues{'co-owners'} ne $values->{'internal.co-owners'}) {
+ $changes->{$entry}{'co-owners'} = $newvalues{'co-owners'};
+ push(@{$changes->{$entry}{'changed'}},'co-owners');
+ }
+ if ($newvalues{'pendingco-owners'} ne $values->{'internal.pendingco-owners'}) {
+ $changes->{$entry}{'pendingco-owners'} = $newvalues{'pendingco-owners'};
+ push(@{$changes->{$entry}{'changed'}},'pendingco-owners');
+ }
+ }
} elsif ($entry =~ /^default_enrollment_(start|end)_date$/) {
$newvalues{$entry}=&Apache::lonhtmlcommon::get_date_from_form($entry);
} elsif ($entry eq 'rolenames') {
@@ -739,8 +1033,8 @@ sub process_changes {
$hdr .= $env{'form.printfmthdr_limit_'.$i};
}
$hdr .= $env{'form.printfmthdr_sub_'.$i};
- } elsif ($env{'form.printfmthdr_sub_'.$i} ne '') {
- $hdr = $env{'form.printfmthdr_sub_'.$i};
+ } elsif ($env{'form.printfmthdr_text_'.$i} ne '') {
+ $hdr = $env{'form.printfmthdr_text_'.$i};
}
$newhdr[$env{'form.printfmthdr_pos_'.$i}] = $hdr;
}
@@ -787,8 +1081,10 @@ sub process_changes {
} else {
$newvalues{$entry} = $env{'form.'.$entry};
}
- if ($newvalues{$entry} ne $values->{$entry}) {
- $changes->{$entry} = $newvalues{$entry};
+ unless ($entry eq 'co-owners') {
+ if ($newvalues{$entry} ne $values->{$entry}) {
+ $changes->{$entry} = $newvalues{$entry};
+ }
}
}
}
@@ -840,7 +1136,7 @@ sub check_clone {
sub store_changes {
my ($cdom,$cnum,$prefs_order,$actions,$prefs,$values,$changes,$crstype) = @_;
my ($chome,$output);
- my (%storehash,@delkeys,@need_env_update);
+ my (%storehash,@delkeys,@need_env_update,@oldcloner);
if ((ref($values) eq 'HASH') && (ref($changes) eq 'HASH')) {
%storehash = %{$values};
} else {
@@ -864,16 +1160,16 @@ sub store_changes {
$output .= '<h3>'.&mt($prefs->{$item}{'text'}).'</h3>';
if (ref($changes->{$item}) eq 'HASH') {
if (keys(%{$changes->{$item}}) > 0) {
- $output .= &mt('Changes made:').'<ul>';
+ $output .= &mt('Changes made:').'<ul style="list-style:none;">';
if ($item eq 'other') {
foreach my $key (sort(keys(%{$changes->{$item}}))) {
$storehash{$key} = $changes->{$item}{$key};
if ($changes->{$item}{$key} eq '') {
push(@delkeys,$key);
- $output .= '<li>'.&mt('Deleted setting for [_1]','<i>'.$key.'</i>').'</li>';
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]','<i>'.$key.'</i>')).'</li>';
} else {
- $output .= '<li>'.&mt('[_1] set to [_2]','<i>'.$key.'</i>',
- "'$storehash{$key}'").'</li>';
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.$key.'</i>',
+ "'$storehash{$key}'")).'</li>';
}
}
} else {
@@ -905,13 +1201,16 @@ sub store_changes {
"'<b>".$newname."</b>'").'</li>';
}
if ($msg ne '') {
- $output .= '<li>'.&mt($displayname).'<ul>'.$msg.'</ul></li>';
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt($displayname)).'<ul class="LC_success">'.$msg.'</ul></li>';
}
} else {
next if (!exists($changes->{$item}{$key}));
my ($displayname,$text);
$text = $prefs->{$item}->{'itemtext'}{$key};
- my $displayval = $changes->{$item}{$key};
+ my $displayval;
+ unless ($key eq 'co-owners') {
+ $displayval = $changes->{$item}{$key};
+ }
if ($item eq 'feedback') {
if ($key =~ /^(question|policy|comment)(\.email)\.text$/) {
$text = $prefs->{$item}->{'itemtext'}{$1.$2};
@@ -978,14 +1277,55 @@ sub store_changes {
$displayval = &mt('No');
}
}
- if ($changes->{$item}{$key} eq '') {
+ if ($key eq 'co-owners') {
+ if (ref($changes->{$item}{$key}) eq 'HASH') {
+ if (ref($changes->{$item}{$key}{'changed'}) eq 'ARRAY') {
+ foreach my $type ('co-owners','pendingco-owners') {
+ next unless (grep(/^\Q$type\E$/,@{$changes->{$item}{$key}{'changed'}}));
+ if ($type eq 'pendingco-owners') {
+ if (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
+ $displayname = &mt('Invited as co-owners, pending acceptance');
+ }
+ }
+ if ($changes->{$item}{$key}{$type} eq '') {
+ push(@delkeys,'internal.'.$type);
+ if (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
+ '<i>'.$displayname.'</i>')).'</li>';
+ }
+ } elsif (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
+ $displayval = join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } split(',',$changes->{$item}{$key}{$type}));
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
+ '<i>'.$displayname.'</i>',
+ "'<b>$displayval</b>'")).'</li>';
+ }
+ }
+ }
+ unless (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
+ if ($env{'form.pending_coowoner'} eq 'accept') {
+ $displayval = &mt('on');
+ } elsif ($env{'form.pending_coowoner'} eq 'decline') {
+ $displayval = '';
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Invitation to be co-owner declined')).'</li>';
+ } elsif ($env{'form.remove_coowoner'}) {
+ $displayval = &mt('off');
+ }
+ if ($displayval) {
+ $displayname = &mt('Your co-ownership status');
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
+ '<i>'.$displayname.'</i>',
+ "'<b>$displayval</b>'")).'</li>';
+ }
+ }
+ }
+ } elsif ($changes->{$item}{$key} eq '') {
push(@delkeys,$key);
- $output .= '<li>'.&mt('Deleted setting for [_1]',
- '<i>'.$displayname.'</i>').'</li>';
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
+ '<i>'.$displayname.'</i>')).'</li>';
} else {
- $output .= '<li>'.&mt('[_1] set to [_2]',
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
'<i>'.$displayname.'</i>',
- "'<b>$displayval</b>'");
+ "'<b>$displayval</b>'"));
if ($key eq 'url') {
my $bkuptime=time;
$output .= (' 'x2).&mt('(Previous URL backed up)').': '.
@@ -993,10 +1333,32 @@ sub store_changes {
}
$output .= '</li>';
}
- $storehash{$key} = $changes->{$item}{$key};
+ if ($key eq 'co-owners') {
+ if (ref($changes->{$item}{$key}) eq 'HASH') {
+ if (ref($changes->{$item}{$key}{'changed'}) eq 'ARRAY') {
+ foreach my $type ('co-owners','pendingco-owners') {
+ next unless (grep(/^\Q$type\E$/,@{$changes->{$item}{$key}{'changed'}}));
+ $storehash{'internal.'.$type} = $changes->{$item}{$key}{$type};
+ }
+ }
+ }
+ } else {
+ $storehash{$key} = $changes->{$item}{$key};
+ }
+ }
+ if ($key eq 'cloners') {
+ # Get existing cloners
+ my %clonenames =
+ &Apache::lonnet::dump('environment',$cdom,$cnum,'cloners');
+ if ($clonenames{'cloners'} =~ /,/) {
+ @oldcloner = split(/\s*\,\s*/,$clonenames{'cloners'});
+ } else {
+ $oldcloner[0] = $clonenames{'cloners'};
+ }
}
if (($key eq 'description') || ($key eq 'cloners') ||
- ($key eq 'hidefromcat') || ($key eq 'categories')) {
+ ($key eq 'hidefromcat') || ($key eq 'categories') ||
+ ($key eq 'co-owners')) {
push(@need_env_update,$key);
}
}
@@ -1014,6 +1376,14 @@ sub store_changes {
}
}
if (&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum) eq 'ok') {
+ if (ref($changes) eq 'HASH') {
+ if (ref($changes->{'courseinfo'}) eq 'HASH') {
+ if (exists($changes->{'courseinfo'}{'cloners'})) {
+ &change_clone($cdom,$cnum,$changes->{'courseinfo'}{'cloners'},
+ \@oldcloner);
+ }
+ }
+ }
if (@delkeys) {
if (&Apache::lonnet::del('environment',\@delkeys,$cdom,$cnum) ne 'ok') {
$output .= '<br /><span class="LC_error">';
@@ -1062,6 +1432,16 @@ sub update_env {
&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash->{$key}});
$crsinfo{$env{'request.course.id'}}{$key} = $storehash->{$key};
$count ++;
+ } elsif ($key eq 'co-owners') {
+ if ($storehash->{'internal.co-owners'} ne '') {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.internal.co-owners' => $storehash->{'internal.co-owners'}});
+ }
+ if ($storehash->{'internal.pendingco-owners'} ne '') {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.internal.pendingco-owners' => $storehash->{'internal.pendingco-owners'}});
+ }
+ my @coowners = split(',',$storehash->{'internal.'.$key});
+ $crsinfo{$env{'request.course.id'}}{'co-owners'} = \@coowners;
+ $count ++;
}
}
if ($count) {
@@ -1276,9 +1656,9 @@ sub print_courseinfo {
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
- my ($cathash,$categoriesform);
+ my ($cathash,$categoriesform,$autocoowner);
my %domconf =
- &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+ &Apache::lonnet::get_dom('configuration',['coursecategories','autoenroll'],$cdom);
if (ref($domconf{'coursecategories'}) eq 'HASH') {
$cathash = $domconf{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
@@ -1287,6 +1667,9 @@ sub print_courseinfo {
$settings->{'categories'},$crstype)."\n";
}
}
+ if (ref($domconf{'autoenroll'}) eq 'HASH') {
+ $autocoowner = $domconf{'autoenroll'}{'co-owners'};
+ }
if (!defined($categoriesform)) {
$categoriesform = &mt('No categories defined in this domain.');
}
@@ -1309,13 +1692,18 @@ sub print_courseinfo {
'</span>',
input => 'textbox',
size => '40',
- advanced => 1
},
'description' => {
text => '<b>'.&mt($itemtext->{'description'}).'</b>',
input => 'textbox',
size => '25',
},
+ 'owner' => {
+ text => '<b>'.&mt($itemtext->{'owner'}).'</b>',
+ },
+ 'co-owners' => {
+ text => '<b>'.&mt($itemtext->{'co-owners'}).'</b>',
+ },
'courseid' => {
text => '<b>'.&mt($itemtext->{'courseid'}).'</b><br />'.'('.
&mt('internal, optional').')',
@@ -1324,17 +1712,15 @@ sub print_courseinfo {
},
'cloners' => {
text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
- &mt('Coordinators included automatically'),
+ &mt('Owner and Coordinators included automatically'),
input => 'textbox',
size => '40',
- advanced => 1
},
'rolenames' => {
text => '<b>'.&mt($itemtext->{'rolenames'}).'</b><br />'.
'('.$replace.')',
input => 'textbox',
size => '20',
- advanced => 1
},
'externalsyllabus' => {
text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />('.
@@ -1363,11 +1749,7 @@ sub print_courseinfo {
next if (!$can_categorize);
}
$count ++;
- if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
- $datatable .= &item_table_row_start($items{$item}{text},$count,"advanced");
- } else {
- $datatable .= &item_table_row_start($items{$item}{text},$count);
- }
+ $datatable .= &item_table_row_start($items{$item}{text},$count);
if ($items{$item}{input} eq 'radio') {
$datatable .= &yesno_radio($item,$settings);
} elsif ($item eq 'cloners') {
@@ -1402,11 +1784,18 @@ sub print_courseinfo {
if (@entries > 0) {
foreach my $entry (@entries) {
my ($uname,$udom) = split(/:/,$entry);
+ if ($udom =~ /^$match_domain$/) {
+ unless (&Apache::lonnet::domain($udom)) {
+ next;
+ }
+ } else {
+ next;
+ }
if ($uname eq '*') {
$datatable .=
&Apache::loncommon::start_data_table_row().
'<td valign="top" align="left"><span class="LC_nobreak">'.
- &mt('Domain:').'<b> '.$udom.
+ &mt('Any user in domain:').'<b> '.$udom.
'</b><input type="hidden" name="cloners_dom_'.$num.
'" value="'.$udom.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
@@ -1414,8 +1803,10 @@ sub print_courseinfo {
&mt('Delete').'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
- } else {
- push(@cloners,$entry);
+ } elsif (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ unless (grep(/^\Q$entry\E$/,@cloners)) {
+ push(@cloners,$entry);
+ }
}
}
}
@@ -1471,6 +1862,38 @@ sub print_courseinfo {
$datatable .= '<input type="hidden" name="categories" value="'.$settings->{$item}.'" />'.
&Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item},
$items{$item}{size},$launcher);
+ } elsif ($item eq 'owner') {
+ my $owner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
+ if ($owner =~ /:/) {
+ my ($ownername,$ownerdom) = split(':',$owner);
+ $owner = &Apache::loncommon::plainname($ownername,$ownerdom);
+ } elsif ($owner ne '') {
+ $owner = &Apache::loncommon::plainname($owner,$cdom);
+ } else {
+ $owner = &mt('None specified');
+ }
+ my $domdesc = &Apache::lonnet::domain($cdom,'description');
+ $datatable .= $owner;
+ } elsif ($item eq 'co-owners') {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $coowners = $env{'course.'.$env{'request.course.id'}.'.internal.co-owners'};
+ my @currcoown;
+ if ($coowners) {
+ @currcoown = split(',',$coowners);
+ }
+ if (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
+ if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
+ $datatable .= &show_autocoowners(@currcoown);
+ } else {
+ $datatable .= &coowner_invitations($cnum,$cdom,@currcoown);
+ }
+ } else {
+ if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
+ $datatable .= &show_autocoowners(@currcoown);
+ } else {
+ $datatable .= &manage_coownership($cnum,$cdom,@currcoown);
+ }
+ }
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size});
}
@@ -1628,6 +2051,128 @@ ENDSCRIPT
return;
}
+sub show_autocoowners {
+ my (@currcoown) = @_;
+ my $output = '<i>'.&mt('Co-ownership is set automatically when a Course Coordinator role is assigned to official course personnel (from institutional data).').'</i>';
+ if (@currcoown > 0) {
+ $output .= '<br />'.&mt('Current co-owners are:').' '.
+ join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } (@currcoown));
+ } else {
+ $output .= '<br />'.&mt('Currently no co-owners.');
+ }
+ return $output;
+}
+
+sub coowner_invitations {
+ my ($cnum,$cdom,@currcoown) = @_;
+ my ($output,@pendingcoown,@othercoords);
+ my $pendingcoowners =
+ $env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
+ if ($pendingcoowners) {
+ @pendingcoown = split(',',$pendingcoowners);
+ }
+ my $ccrole = 'cc';
+ my %ccroles = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,[$ccrole]);
+ foreach my $key (sort(keys(%ccroles))) {
+ my ($ccname,$ccdom,$role) = split(':',$key);
+ next if ($key eq $env{'user.name'}.':'.$env{'user.domain'}.':'.$ccrole);
+ unless (grep(/^\Q$ccname\E:\Q$ccdom\E$/,@currcoown,@pendingcoown)) {
+ push(@othercoords,$ccname.':'.$ccdom);
+ }
+ }
+ my $coowner_rows = @currcoown + @pendingcoown + @othercoords;
+ if ($coowner_rows) {
+ $output .= &Apache::loncommon::start_data_table();
+ if (@currcoown) {
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><i>'.&mt('Current co-owners').'</i></td><td>';
+ foreach my $person (@currcoown) {
+ my ($co_uname,$co_dom) = split(':',$person);
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ }
+ $output .= '</td>'.
+ &Apache::loncommon::end_data_table_row();
+ }
+ if ($pendingcoowners) {
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><i>'.&mt('Invited as co-owners [_1](agreement pending)','<br />').'</i></td><td>';
+ foreach my $person (@pendingcoown) {
+ my ($co_uname,$co_dom) = split(':',$person);
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ }
+ $output .= '</td>'.
+ &Apache::loncommon::end_data_table_row();
+ }
+ if (@othercoords) {
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><i>'.&mt('Invite other Coordinators [_1]to become co-owners','<br />').'</i></td><td>';
+ foreach my $person (@othercoords) {
+ my ($co_uname,$co_dom) = split(':',$person);
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ }
+ $output .= '</td>'.
+ &Apache::loncommon::end_data_table_row();
+ }
+ $output .= &Apache::loncommon::end_data_table();
+ } else {
+ $output = &mt('There are no coordinators to select as co-owners');
+ }
+ return $output;
+}
+
+sub manage_coownership {
+ my ($cnum,$cdom,@currcoown) = @_;
+ my (@pendingcoown);
+ my $pendingcoowners =
+ $env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
+ if ($pendingcoowners) {
+ @pendingcoown = split(',',$pendingcoowners);
+ }
+ my ($is_coowner,$is_pending,$output);
+ my $uname = $env{'user.name'};
+ my $udom = $env{'user.domain'};
+ if (grep(/^\Q$uname\E:\Q$udom\E$/,@currcoown)) {
+ $is_coowner = 1;
+ }
+ if (grep(/^\Q$uname\E:\Q$udom\E$/,@pendingcoown)) {
+ $is_pending = 1;
+ }
+ if (@currcoown && ($is_coowner || $is_pending)) {
+ $output = &Apache::loncommon::start_data_table();
+ }
+ if (@currcoown) {
+ if ($is_coowner || $is_pending) {
+ $output .= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row().'<td>';
+ }
+ $output .= &mt('Current co-owners are:').' '.
+ join(', ', map { &Apache::loncommon::plainname(split(':',$_)); } (@currcoown));
+ if ($is_coowner || $is_pending) {
+ $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+ }
+ }
+ if ($is_coowner || $is_pending) {
+ if (@currcoown) {
+ $output .= &Apache::loncommon::start_data_table_row().'<td>';
+ }
+ $output .= '<span class="LC_nobreak">';
+ if ($is_coowner) {
+ $output .= &mt('You are currently a co-owner:').' <label><input type="checkbox" name="remove_coowoner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
+ } else {
+ $output .= &mt('The course owner has invited you to become a co-owner:').' <label><input type="radio" name="pending_coowoner" value="accept" />'.&mt('Accept?').'</label>'.(' 'x2).
+ '<label><input type="radio" name=pending_coowoner" value="decline" />'.&mt('Decline?').'</label>';
+ }
+ $output .= '</span>';
+ if (@currcoown) {
+ $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+ }
+ }
+ if (@currcoown && ($is_coowner || $is_pending)) {
+ $output .= &Apache::loncommon::end_data_table();
+ }
+ return $output;
+}
+
sub print_localization {
my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
@@ -1753,23 +2298,23 @@ sub print_feedback {
my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
my @sections = sort( { $a <=> $b } keys(%sections));
my %lt = &Apache::lonlocal::texthash (
- currone => 'Current recipient:',
- curmult => 'Current recipients:',
- add => 'Additional recipient:',
- del => 'Delete?',
- sec => 'Sections:',
+ currone => 'Current recipient:',
+ currmult => 'Current recipients:',
+ add => 'Additional recipient:',
+ del => 'Delete?',
+ sec => 'Sections:',
);
foreach my $item (@{$ordered}) {
$count ++;
- $datatable .= &item_table_row_start($items{$item}{text},$count);
+ $datatable .= &item_table_row_start($items{$item}{text},$count);
if ($position eq 'top') {
my $includeempty = 0;
$datatable .= &user_table($cdom,$item,\@sections,
$settings->{$item},\%lt);
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
- $settings->{$item.'.text'},$items{$item}{size});
+ $settings->{$item.'.text'},$items{$item}{size});
}
$datatable .= &item_table_row_end();
}
@@ -1818,7 +2363,7 @@ sub user_table {
if ($num) {
$output .= '<tr>'.
'<td align="left"><i>';
- if ($num > 1) {
+ if ($num == 1) {
$output .= $lt->{'currone'};
} else {
$output .= $lt->{'currmult'};
@@ -1938,11 +2483,11 @@ sub print_discussion {
my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
my @sections = sort( { $a <=> $b } keys(%sections));
my %lt = &Apache::lonlocal::texthash (
- currone => 'Disallowed:',
- curmult => 'Disallowed:',
- add => 'Disallow more:',
- del => 'Delete?',
- sec => 'Sections:',
+ currone => 'Disallowed:',
+ currmult => 'Disallowed:',
+ add => 'Disallow more:',
+ del => 'Delete?',
+ sec => 'Sections:',
);
foreach my $item (@{$ordered}) {
@@ -2033,7 +2578,7 @@ sub role_checkboxes {
$output .= '<tr>';
}
}
- $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name='.
+ $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name="'.
$item.'" value="'.$role.'"'.$checked.'/> '.
$plrole.'</label></span></td>';
if ($showsections) {
@@ -2065,7 +2610,7 @@ sub role_checkboxes {
$output .= '<tr>';
}
}
- $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name='.
+ $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
$item.'" value="'.$value.'"'.$checked.' /> '.$rolename.
'</label></span></td>';
if ($showsections) {
@@ -2101,7 +2646,8 @@ sub print_classlists {
@ordered = ('nothideprivileged');
} else {
@ordered = ('student_classlist_view',
- 'student_opt_in','student_classlist_portfiles');
+ 'student_classlist_opt_in',
+ 'student_classlist_portfiles');
}
my %lt;
@@ -2140,8 +2686,8 @@ sub print_classlists {
options => \%lt,
order => ['disabled','all','section'],
},
- 'student_opt_in' => {
- text => '<b>'.&mt($itemtext->{'student_opt_in'}).'</b>',
+ 'student_classlist_opt_in' => {
+ text => '<b>'.&mt($itemtext->{'student_classlist_opt_in'}).'</b>',
input => 'radio',
},
@@ -2640,9 +3186,9 @@ sub print_hdrfmt_row {
$currstr .= '<b>'.&mt('Current print header:').' <span class="LC_warning"><tt>'.
$settings->{$item}.'</tt></span></b><br />';
my @current = split(/(%\d*[nca])/,$settings->{$item});
- foreach my $item (@current) {
- unless ($item eq '') {
- push(@curr,$item);
+ foreach my $val (@current) {
+ unless ($val eq '') {
+ push(@curr,$val);
}
}
$currnum = @curr;
@@ -2777,7 +3323,7 @@ sub substitution_selector {
a => 'assignment note',
);
my $output .= &mt('Substitution').'<br />'.
- '<select name=""printfmthdr_sub__'.$num.'">';
+ '<select name="printfmthdr_sub_'.$num.'">';
if ($subst eq '') {
$output .= '<option value="" selected="selected"> </option>';
}
@@ -2795,4 +3341,66 @@ sub substitution_selector {
return $output;
}
+sub change_clone {
+ my ($cdom,$cnum,$clonelist,$oldcloner) = @_;
+ my $clone_crs = $cnum.':'.$cdom;
+ if ($cnum && $cdom) {
+ my $clone_crs = $cnum.':'.$cdom;
+ my @allowclone;
+ if ($clonelist =~ /,/) {
+ @allowclone = split(',',$clonelist);
+ } else {
+ $allowclone[0] = $clonelist;
+ }
+ foreach my $currclone (@allowclone) {
+ if (!grep(/^$currclone$/,@$oldcloner)) {
+ if ($currclone ne '*') {
+ my ($uname,$udom) = split(/:/,$currclone);
+ if ($uname && $udom && $uname ne '*') {
+ if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+ if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+ if ($currclonecrs{'cloneable'} eq '') {
+ $currclonecrs{'cloneable'} = $clone_crs;
+ } else {
+ $currclonecrs{'cloneable'} .= ','.$clone_crs;
+ }
+ &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
+ }
+ }
+ }
+ }
+ }
+ }
+ foreach my $oldclone (@$oldcloner) {
+ if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
+ if ($oldclone ne '*') {
+ my ($uname,$udom) = split(/:/,$oldclone);
+ if ($uname && $udom && $uname ne '*' ) {
+ if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+ my %newclonecrs = ();
+ if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+ if ($currclonecrs{'cloneable'} =~ /,/) {
+ my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+ foreach my $crs (@currclonecrs) {
+ if ($crs ne $clone_crs) {
+ $newclonecrs{'cloneable'} .= $crs.',';
+ }
+ }
+ $newclonecrs{'cloneable'} =~ s/,$//;
+ } else {
+ $newclonecrs{'cloneable'} = '';
+ }
+ &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return;
+}
+
1;