--- loncom/interface/courseprefs.pm 2009/09/04 21:42:38 1.7
+++ loncom/interface/courseprefs.pm 2010/03/22 04:26:50 1.26
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.7 2009/09/04 21:42:38 raeburn Exp $
+# $Id: courseprefs.pm,v 1.26 2010/03/22 04:26:50 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;
@@ -57,11 +236,22 @@ sub handler {
$r->send_http_header;
} else {
if ($navmap) {
- $env{'user.error.msg'}=
- "/adm/courseprefs:opa:0:0:Cannot modify course settings";
+ if ($crstype eq 'Community') {
+ $env{'user.error.msg'}=
+ "/adm/courseprefs:opa:0:0:Cannot modify community settings";
+ } else {
+ $env{'user.error.msg'}=
+ "/adm/courseprefs:opa:0:0:Cannot modify course settings";
+ }
} else {
- $env{'user.error.msg'}=
- "/adm/courseprefs::0:1:Course environment gone, reinitialize the course";
+ if ($crstype eq 'Community') {
+ $env{'user.error.msg'}=
+ "/adm/courseprefs::0:1:Course environment gone, reinitialize the community";
+ } else {
+ $env{'user.error.msg'}=
+ "/adm/courseprefs::0:1:Course environment gone, reinitialize the course";
+
+ }
}
return HTTP_NOT_ACCEPTABLE;
}
@@ -73,10 +263,67 @@ sub handler {
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
text=>"Parameter Manager"});
}
+ my ($brtext,$brtitle,$crsinfotext,$crsinfodesc,$crscateg,$crshide);
+ my %lt;
+ if ($crstype eq 'Community') {
+ %lt = (
+ conf => 'Community Configuration',
+ edit => 'Edit Community Configuration',
+ 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',
+ rept => 'Replacement titles for standard community roles',
+ time => 'Timezone where the community is located',
+ date => 'Locale used for community calendar',
+ coco => 'Community Content',
+ copo => 'Community Policy',
+ priv => 'Domain Coordinators in community',
+ defd => 'Default dates for member access',
+ stuv => 'Member-viewable membership list options',
+ stul => 'Member agreement needed to be listed',
+ clas => 'Membership and Facilitator Listing',
+ priv => 'Privileged users (Domain Coordinators) in facilitator listing',
+ defc => 'Default Community Spreadsheet',
+ defs => 'Default User Spreadsheet',
+ seme => 'Send message to member when clicking Done on Tasks'
+ );
+ } else {
+ %lt = (
+ conf => 'Course Configuration',
+ edit => 'Edit Course Configuration',
+ 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 in which the course takes place',
+ date => 'Locale used for course calendar',
+ coco => 'Course Content',
+ copo => 'Course Policy',
+ priv => 'Domain Coordinators in course',
+ defd => 'Default dates for student access',
+ stuv => 'Student-viewable classlist options',
+ stul => 'Student agreement needed to be listed',
+ clas => 'Classlists and Staff Listing',
+ priv => 'Privileged users (Domain Coordinators) in staff listing',
+ defc => 'Default Course Spreadsheet',
+ defs => 'Default Student Spreadsheet',
+ seme => 'Send message to student when clicking Done on Tasks',
+ );
+ }
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/courseprefs',
- text=>"Course Configuration"});
+ text=>$lt{'conf'}});
my $breadcrumbs =
- &Apache::lonhtmlcommon::breadcrumbs('Edit Course Configuration');
+ &Apache::lonhtmlcommon::breadcrumbs($lt{'edit'});
my $phase = 'pickactions';
if ( exists($env{'form.phase'}) ) {
@@ -84,7 +331,7 @@ sub handler {
}
if ($phase eq 'categorizecourse') {
- &assign_course_categories($r);
+ &assign_course_categories($r,$crstype);
return OK;
}
@@ -95,55 +342,49 @@ sub handler {
my %prefs = (
'courseinfo' =>
- { text => 'General course settings',
+ { text => $lt{'gens'},
help => 'Course_Environment',
- header => [{col1 => 'Setting',
- col2 => 'Value'}],
- ordered => ['description','courseid','categories',
- 'hidefromcat','cloners','externalsyllabus',
- 'url','rolenames'],
+ ordered => ['owner','co-owners','description','courseid',
+ 'categories','hidefromcat','externalsyllabus',
+ 'cloners','url','rolenames'],
itemtext => {
- description => 'Course Description',
- courseid => 'Course ID or number',
- categories => 'Categorize course',
- hidefromcat => 'Exclude from course catalog',
- cloners => 'Users allowed to clone course',
- externalsyllabus => 'URL of Syllabus',
- url => 'Top Level Map',
- rolenames => 'Replacement titles for standard course roles',
+ '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/TimeZone/Locale',
+ { text => 'Language & Time Localization',
help => 'Course_Environment',
- header => [{col1 => 'Setting',
- col2 => 'Value',}],
ordered => ['languages','timezone','datelocale'],
itemtext => {
languages => 'Languages used',
- timezone => 'Timezone in which the course takes place',
- datelocale => 'Locale used for course calendar',
+ timezone => $lt{'time'},
+ datelocale => $lt{'date'},
},
},
'feedback' =>
{ text => 'Feedback messages',
help => 'Course_Environment',
header => [{col1 => 'Questions about:',
- col2 => 'Recipients'},
- {col1 => 'Questions about:',
- col2 => 'Custom Text'}],
+ col2 => 'Recipients'}],
ordered => ['question.email','comment.email','policy.email'],
itemtext => {
'question.email' => 'Resource Content',
- 'comment.email' => 'Course Content',
- 'policy.email' => 'Course Policy',
+ 'comment.email' => $lt{'coco'},
+ 'policy.email' => $lt{'copo'},
},
},
'discussion' =>
{ text => 'Discussion and Chat',
help => 'Course_Environment',
- header => [{col1 => 'Setting',
- col2 => 'Value',}],
ordered => ['plc.roles.denied','plc.users.denied',
'pch.roles.denied','pch.users.denied',
'allow_limited_html_in_feedback',
@@ -153,42 +394,40 @@ sub handler {
'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 posts',
+ allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
allow_discussion_post_editing => 'Users can edit/delete own discussion posts',
},
},
'classlists' =>
- { text => 'Classlists and Staff Listing',
+ { text => $lt{'clas'},
help => 'Course_Environment',
header => [{col1 => 'Type',
- col2 => 'Default dates for student access'},
+ col2 => $lt{'defd'}},
{col1 => 'Setting',
- col2 => 'Privileged users (Domain Coordinators) in staff listing'},
+ col2 => $lt{'priv'}},
{col1 => 'Setting',
- col2 => 'Student-viewable classlist options'}],
+ col2 => $lt{'stuv'}}],
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 => 'Domain Coodinators in course',
- student_classlist_view => 'Student-viewable classlist',
- student_opt_in => 'Student agreement needed to be listed',
+ nothideprivileged => $lt{'priv'},
+ student_classlist_view => $lt{'stuv'},
+ student_classlist_opt_in => $lt{'stul'},
student_classlist_portfiles => 'Include link to accessible portfolio files',
},
},
'appearance' =>
{ 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',
+ default_xml_style => 'Default XML style file',
pageseparators => 'Visibly Separate Items on Pages',
disable_receipt_display => 'Disable display of problem receipts',
texengine => 'Force use of a specific math rendering engine',
@@ -198,8 +437,6 @@ sub handler {
'grading' =>
{ text => 'Grading',
help => 'Course_Environment',
- header => [{col1 => 'Setting',
- col2 => 'Value',}],
ordered => ['grading','rndseed',
'receiptalg','disablesigfigs'],
itemtext => {
@@ -213,30 +450,27 @@ sub handler {
'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'],
+ 'disableexampointprint','canuse_pdfforms'],
itemtext => {
problem_stream_switch => 'Allow problems to be split over pages',
suppress_tries => 'Suppress number of tries in printing',
default_paper_size => 'Default paper type',
print_header_format => 'Print header format',
disableexampointprint => 'Disable automatically printing point values on exams',
+ canuse_pdfforms => 'Users can print problems as PDF forms and upload later for grading',
},
},
'spreadsheet' =>
{ text => 'Spreadsheets',
help => 'Course_Environment',
- header => [{col1 => 'Setting',
- col2 => 'Value'}],
ordered => ['spreadsheet_default_classcalc',
'spreadsheet_default_studentcalc',
'spreadsheet_default_assesscalc','hideemptyrows'],
itemtext => {
- spreadsheet_default_classcalc => 'Default Course Spreadsheet',
- spreadsheet_default_studentcalc => 'Default Student Spreadsheet',
+ spreadsheet_default_classcalc => $lt{'defc'},
+ spreadsheet_default_studentcalc => $lt{'defs'},
spreadsheet_default_assesscalc => 'Default Assessment Spreadsheet',
hideemptyrows => 'Hide Empty Rows in Spreadsheets',
},
@@ -244,12 +478,10 @@ sub handler {
'bridgetasks' =>
{ text => 'Bridge tasks',
help => 'Course_Environment',
- header => [{col1 => 'Setting',
- col2 => 'Value'}],
ordered => ['task_messages','task_grading',
'suppress_embed_prompt'],
itemtext => {
- task_messages => 'Send message to student when clicking Done on Tasks',
+ task_messages => $lt{'seme'},
task_grading => 'Bridge Task grading by instructors and TAs in sections' ,
suppress_embed_prompt => 'Hide upload references prompt if uploading file to portfolio',
},
@@ -268,10 +500,10 @@ sub handler {
\@prefs_order,\%prefs,\%values,
$cnum,undef,\@allitems);
} elsif ($phase eq 'display') {
- my $jscript = &get_jscript($cdom,$phase);
+ my $jscript = &get_jscript($cdom,$phase,$crstype);
my @allitems = &get_allitems(%prefs);
&Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
- \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems);
+ \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype);
} else {
&Apache::lonconfigsettings::display_choices($r,$phase,$context,
\@prefs_order,\%prefs);
@@ -296,38 +528,33 @@ sub get_allitems {
}
sub print_config_box {
- my ($r,$cdom,$phase,$action,$item,$settings,$allitems) = @_;
+ my ($r,$cdom,$phase,$action,$item,$settings,$allitems,$crstype) = @_;
my $ordered = $item->{'ordered'};
my $itemtext = $item->{'itemtext'};
my $rowtotal = 0;
my $output =
- '<table class="LC_nested_outer">
- <tr>
- <th align="left" valign="middle"><span class="LC_font_larger">'.
- &mt($item->{text}).' '.
- &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
- '</tr>';
+ '<h3><a href="#">'.&mt($item->{text}).'</a></h3>
+ <div> <span style="float:right">'.
+ &Apache::loncommon::help_open_topic($item->{'help'}).'</span>';
if (($action eq 'feedback') || ($action eq 'classlists')) {
$output .= '
- <tr>
- <td>
- <table class="LC_nested">
- <tr class="LC_info_row">
+ <table class="LC_nested">';
+ if (exists $item->{'header'}->[0]->{'col1'} ||
+ exists $item->{'header'}->[0]->{'col2'}) {
+ $output .= '
+ <tr class="LC_info_row">
<td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
<td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
- </tr>';
+ </tr>';
+ }
$rowtotal ++;
if ($action eq 'feedback') {
$output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif ($action eq 'classlists') {
- $output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal);
+ $output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
}
$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>';
@@ -335,32 +562,34 @@ sub print_config_box {
<td class="LC_right_item">'.&mt($item->{'header'}->[1]->{'col2'}).'</td>
</tr>';
if ($action eq 'classlists') {
- $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal).
+ $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
'
</table>
- </td>
- </tr>
- <tr>
- <td>
- <table class="LC_nested">
- <tr class="LC_info_row">
- <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
- <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
- </tr>';
+ <table class="LC_nested">';
+ if (exists $item->{'header'}->[0]->{'col1'} ||
+ exists $item->{'header'}->[0]->{'col2'}) {
+ $output .= '
+ <tr class="LC_info_row">
+ <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">
- <tr class="LC_info_row">
+ <table class="LC_nested">';
+ if (exists $item->{'header'}->[0]->{'col1'} ||
+ exists $item->{'header'}->[0]->{'col2'}) {
+ $output .= '
+ <tr class="LC_info_row">
<td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
- </tr>';
+ </tr>';
+ }
}
$rowtotal ++;
if ($action eq 'courseinfo') {
- $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'localization') {
$output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif ($action eq 'feedback') {
@@ -368,30 +597,28 @@ sub print_config_box {
} elsif ($action eq 'discussion') {
$output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif ($action eq 'classlists') {
- $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal);
+ $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'appearance') {
- $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'grading') {
- $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'printouts') {
- $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'spreadsheet') {
- $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'bridgetasks') {
- $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'other') {
- $output .= &print_other($cdom,$settings,$allitems,\$rowtotal);
+ $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype);
}
$output .= '
</table>
- </td>
- </tr>
-</table><br />';
+</div>';
return ($output,$rowtotal);
}
sub process_changes {
- my ($cdom,$action,$values,$item,$changes,$allitems,$disallowed) = @_;
+ my ($cdom,$action,$values,$item,$changes,$allitems,$disallowed,$crstype) = @_;
my %newvalues;
if (ref($item) eq 'HASH') {
if (ref($changes) eq 'HASH') {
@@ -503,10 +730,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);
+ }
}
}
}
@@ -527,21 +758,100 @@ 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') {
- my $crstype = &Apache::loncommon::course_type();
my %adv_roles =
&Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
- my @stds = ('cc','in','ta','ep','ad','st');
+ my @stds;
+ if ($crstype eq 'Community') {
+ @stds = ('co');
+ } else {
+ @stds = ('cc');
+ }
+ push(@stds,('in','ta','ep','ad','st'));
my (@replacements,@regulars);
foreach my $role (@stds) {
if ($values->{$role.'.plaintext'} ne '') {
- push(@replacements,$role);
+ push(@replacements,$role);
} else {
push(@regulars,$role);
}
- }
+ }
foreach my $stdrole (@stds) {
my $ext_entry = $entry.'_'.$stdrole;
my $stdname = &Apache::lonnet::plaintext($stdrole,$crstype,
@@ -554,7 +864,6 @@ sub process_changes {
if ($newvalues{$ext_entry} ne $values->{$stdrole.'.plaintext'}) {
my $dupname = 0;
if ($newvalues{$ext_entry} ne '') {
- my $dupname = 0;
if (grep(/^\Q$newvalues{$ext_entry}\E$/,@replacements)) {
$dupname = 1;
push(@{$disallowed->{'rolenames'}{'replacements'}},$newvalues{$ext_entry});
@@ -739,8 +1048,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};
+ }
}
}
}
@@ -790,14 +1101,18 @@ sub check_clone {
}
sub store_changes {
- my ($cdom,$cnum,$prefs_order,$actions,$prefs,$values,$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 {
- $output = &mt('No changes made to course settings.');
- return;
+ if ($crstype eq 'Community') {
+ $output = &mt('No changes made to community settings.');
+ } else {
+ $output = &mt('No changes made to course settings.');
+ }
+ return $output;
}
my %yesno = (
hidefromcat => '1',
@@ -812,16 +1127,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 {
@@ -833,9 +1148,15 @@ sub store_changes {
foreach my $key (@settings) {
if ($key eq 'rolenames') {
my $displayname = $prefs->{$item}->{'itemtext'}{$key};
- my $crstype = &Apache::loncommon::course_type();
my $msg;
- foreach my $role ('cc','in','ta','ep','ad','st') {
+ my @roles;
+ if ($crstype eq 'Community') {
+ @roles = ('co');
+ } else {
+ @roles = ('cc');
+ }
+ push(@roles,('in','ta','ep','ad','st'));
+ foreach my $role (@roles) {
next if (!exists($changes->{$item}{$key.'_'.$role}));
my $stdname = &Apache::lonnet::plaintext($role,$crstype,undef,1);
my $newname = $changes->{$item}{$key.'_'.$role};
@@ -847,13 +1168,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};
@@ -905,23 +1229,70 @@ sub store_changes {
$displayname = &mt($text);
}
if (defined($yesno{$key})) {
- $displayval = 'no';
+ $displayval = &mt('No');
if ($changes->{$item}{$key} eq 'yes') {
- $displayval = 'yes';
+ $displayval = &mt('Yes');
}
} elsif (($key =~ /^default_enrollment_(start|end)_date$/) && ($displayval)) {
$displayval = &Apache::lonlocal::locallocaltime($displayval);
} elsif ($key eq 'categories') {
$displayval = $env{'form.categories_display'};
- }
- if ($changes->{$item}{$key} eq '') {
+ } elsif ($key eq 'canuse_pdfforms') {
+ if ($changes->{$item}{$key} eq '1') {
+ $displayval = &mt('Yes');
+ } elsif ($changes->{$item}{$key} eq '0') {
+ $displayval = &mt('No');
+ }
+ }
+ 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)').': '.
@@ -929,10 +1300,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);
}
}
@@ -940,16 +1333,37 @@ sub store_changes {
}
$output .= '</ul>';
} else {
- $output = &mt('No changes made to course settings.');
+ if ($crstype eq 'Community') {
+ $output = &mt('No changes made to community settings.');
+ } else {
+ $output = &mt('No changes made to course settings.');
+ }
}
}
}
}
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">'.
- &mt('An error occurred when removing course settings which are no longer in use.').'</span>';
+ $output .= '<br /><span class="LC_error">';
+ if ($crstype eq 'Community') {
+ $output .= &mt('An error occurred when removing community settings which are no longer in use.');
+ } else {
+ $output .= &mt('An error occurred when removing course settings which are no longer in use.');
+ }
+ $output .= '</span>';
+ } else {
+ foreach my $key (@delkeys) {
+ &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.'.$key);
+ }
}
}
if (@need_env_update) {
@@ -959,8 +1373,13 @@ sub store_changes {
&Apache::lonnet::coursedescription($env{'request.course.id'},
{'freshen_cache' => 1});
} else {
- $output = '<span class="LC_error">'.
- &mt('An error occurred when saving changes to course settings, which remain unchanged.').'</span>';
+ $output = '<span class="LC_error">';
+ if ($crstype eq 'Community') {
+ $output .= &mt('An error occurred when saving changes to community settings, which remain unchanged.');
+ } else {
+ $output .= &mt('An error occurred when saving changes to course settings, which remain unchanged.');
+ }
+ $output .= '</span>';
}
return $output;
}
@@ -980,6 +1399,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) {
@@ -991,7 +1420,7 @@ sub update_env {
}
sub display_disallowed {
- my ($item,$disallowed,$prefs) = @_;
+ my ($item,$disallowed,$prefs,$crstype) = @_;
my $output;
if ((ref($disallowed) eq 'HASH') && (ref($prefs) eq 'HASH')) {
if (keys(%{$disallowed})) {
@@ -1007,7 +1436,7 @@ sub display_disallowed {
my $msg = '<b>'.$disallowed->{$error}.'</b>, '.&mt('reason').' - '.
$lt{$error};
if ($error eq 'newuser') {
- $msg .= '<br />'.&mt('Please [_1]add the user(s)[_2] before returning to the [_3]Course Configuration[_2] to add as potential cloners.','<a href="/adm/createuser">','</a>','<a href="/adm/courseprefs">');
+ $msg .= '<br />'.&mt("Please [_1]add the user(s)[_2] before returning to the [_3]$crstype Configuration[_2] to add as potential cloners.",'<a href="/adm/createuser">','</a>','<a href="/adm/courseprefs">');
}
push(@fails,$msg);
}
@@ -1038,11 +1467,19 @@ sub display_disallowed {
} elsif (($item eq 'feedback') || ($item eq 'discussion') || ($item eq 'localization')) {
$output .= '<span class="LC_warning">';
if ($item eq 'feedback') {
- $output .= &mt('Unable to include as a recipient of course feedback for:');
+ if ($crstype eq 'Community') {
+ $output .= &mt('Unable to include as a recipient of community feedback for:');
+ } else {
+ $output .= &mt('Unable to include as a recipient of course feedback for:');
+ }
} elsif ($item eq 'discussion') {
$output .= &mt('Unable to include in user-based access control for:');
} elsif ($item eq 'localization') {
- $output .= &mt('Unable to include in course localization:');
+ if ($crstype eq 'Community') {
+ $output .= &mt('Unable to include in community localization:');
+ } else {
+ $output .= &mt('Unable to include in course localization:');
+ }
}
$output .= '</span><ul>';
foreach my $key (sort(keys(%{$disallowed}))) {
@@ -1074,8 +1511,8 @@ sub get_course {
}
sub get_jscript {
- my ($cdom,$phase) = @_;
- my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
+ my ($cdom,$phase,$crstype) = @_;
+ my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
my ($jscript,$categorize_js);
my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
@@ -1182,28 +1619,36 @@ ENDSCRIPT
sub print_courseinfo {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
- my ($cathash,$categoriesform);
- my $crstype = &Apache::loncommon::course_type();
+ 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') {
$categoriesform =
&Apache::loncommon::assign_categories_table($cathash,
- $settings->{'categories'})."\n";
+ $settings->{'categories'},$crstype)."\n";
}
}
+ if (ref($domconf{'autoenroll'}) eq 'HASH') {
+ $autocoowner = $domconf{'autoenroll'}{'co-owners'};
+ }
if (!defined($categoriesform)) {
- $categoriesform = &mt('No categories defined for this domain');
+ $categoriesform = &mt('No categories defined in this domain.');
}
- my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
+ my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+ my $replace;
+ if ($crstype eq 'Community') {
+ $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
+ } else {
+ $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
+ }
my %items = (
'url' => {
text => '<b>'.&mt($itemtext->{'url'}).'</b>'.(' 'x2).
@@ -1214,12 +1659,19 @@ 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').')',
@@ -1228,15 +1680,17 @@ sub print_courseinfo {
},
'cloners' => {
text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
- &mt('Course Coordinators included automatically'),
+ &mt('Owner and Coordinators included automatically'),
input => 'textbox',
size => '40',
+ advanced => 1
},
'rolenames' => {
text => '<b>'.&mt($itemtext->{'rolenames'}).'</b><br />'.
- '('.&mt('To replace the standard title for a course role, enter a title, otherwise leave blank').')',
+ '('.$replace.')',
input => 'textbox',
size => '20',
+ advanced => 1
},
'externalsyllabus' => {
text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />('.
@@ -1265,7 +1719,11 @@ sub print_courseinfo {
next if (!$can_categorize);
}
$count ++;
- $datatable .= &item_table_row_start($items{$item}{text},$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);
+ }
if ($items{$item}{input} eq 'radio') {
$datatable .= &yesno_radio($item,$settings);
} elsif ($item eq 'cloners') {
@@ -1300,11 +1758,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" '.
@@ -1312,8 +1777,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);
+ }
}
}
}
@@ -1346,7 +1813,14 @@ sub print_courseinfo {
&Apache::loncommon::end_data_table();
} elsif ($item eq 'rolenames') {
$datatable .= &Apache::loncommon::start_data_table();
- foreach my $role ('cc','in','ta','ep','ad','st') {
+ my @roles;
+ if ($crstype eq 'Community') {
+ @roles = ('co');
+ } else {
+ @roles = ('cc');
+ }
+ push (@roles,('in','ta','ep','ad','st'));
+ foreach my $role (@roles) {
$datatable .= &Apache::loncommon::start_data_table_row().
'<td align="left"><span class="LC_nobreak">'.
&Apache::lonnet::plaintext($role,$crstype,undef,1).
@@ -1362,6 +1836,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});
}
@@ -1395,22 +1901,31 @@ sub new_cloners_dom_row {
}
sub can_modify_catsettings {
- my ($dom) = @_;
+ my ($dom,$crstype) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my ($can_toggle_cat,$can_categorize);
if (ref($domconf{'coursecategories'}) eq 'HASH') {
- if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
- $can_toggle_cat = 1;
- }
- if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
- $can_categorize = 1;
+ if ($crstype eq 'Community') {
+ if ($domconf{'coursecategories'}{'togglecatscomm'} eq 'comm') {
+ $can_toggle_cat = 1;
+ }
+ if ($domconf{'coursecategories'}{'categorizecomm'} eq 'comm') {
+ $can_categorize = 1;
+ }
+ } else {
+ if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+ $can_toggle_cat = 1;
+ }
+ if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+ $can_categorize = 1;
+ }
}
}
return ($can_toggle_cat,$can_categorize);
}
sub assign_course_categories {
- my ($r) = @_;
+ my ($r,$crstype) = @_;
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $hascats = 0;
@@ -1419,12 +1934,23 @@ sub assign_course_categories {
if (ref($domconf{'coursecategories'}) eq 'HASH') {
$cathash = $domconf{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
- $hascats = 1;
+ foreach my $cat (keys(%{$cathash})) {
+ next if ($cat eq 'instcode::0');
+ unless ($crstype eq 'Community') {
+ next if ($cat eq 'communities::0');
+ }
+ $hascats ++;
+ }
}
}
my $catwin_js;
if ($hascats) {
- my $alert = &mt("Use 'Save' in the main window to save course categories");
+ my $alert;
+ if ($crstype eq 'Community') {
+ $alert = &mt("Use 'Save' in the main window to save community categories");
+ } else {
+ $alert = &mt("Use 'Save' in the main window to save course categories");
+ }
$catwin_js = <<ENDSCRIPT;
<script type="text/javascript">
@@ -1462,28 +1988,165 @@ ENDSCRIPT
} else {
my $onload;
}
+ my ($crscat,$catcrs,$assign);
+ if ($crstype eq 'Community') {
+ $crscat = 'Community Categories';
+ $catcrs = &mt('Categorize Community');
+ $assign = &mt('Assign one or more categories to this community.')
+ } else {
+ $crscat = 'Course Categories';
+ $catcrs = &mt('Categorize Course');
+ $assign = &mt('Assign one or more categories to this course.')
+ }
my $start_page =
- &Apache::loncommon::start_page('Course Categories',$catwin_js,
+ &Apache::loncommon::start_page($crscat,$catwin_js,
{'only_body' => 1,});
my $end_page = &Apache::loncommon::end_page();
- my $categoriesform = '<h3>'.&mt('Categorize Course').'</h3>';
+ my $categoriesform = '<h3>'.$catcrs.'</h3>';
if ($hascats) {
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
- $categoriesform .= &mt('Assign one or more categories to this course.').'<br /><br />'.
+ my $cattable = &Apache::loncommon::assign_categories_table($cathash,
+ $currsettings{'categories'},$crstype);
+ if ($cattable eq '') {
+ $categoriesform .= &mt('No suitable categories defined for this course type in this domain.');
+ } else {
+ $categoriesform .= $assign.'<br /><br />'.
'<form name="chgcats" action="/adm/courseprefs" method="post">'."\n".
- &Apache::loncommon::assign_categories_table($cathash,
- $currsettings{'categories'})."\n".
+ $cattable."\n".
'<br /><input type="button" name="changes" value="'.
&mt('Copy to main window').'" '.
'onclick="javascript:updateCategories()" /></form><br />';
+ }
} else {
- $categoriesform .= &mt('No categories defined for this domain');
+ $categoriesform .= &mt('No categories defined in this domain.');
}
$r->print($start_page.$categoriesform.$end_page);
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')) {
@@ -1491,16 +2154,16 @@ sub print_localization {
}
my %items = (
languages => {
- text => &mt($itemtext->{'languages'}).'<br />'.
- &mt("(will override user's preference)"),
+ text => '<b>'.&mt($itemtext->{'languages'}).'</b><br />'.
+ &mt("(overrides individual user preference)"),
input => 'selectbox',
},
timezone => {
- text => &mt($itemtext->{'timezone'}),
+ text => '<b>'.&mt($itemtext->{'timezone'}).'</b>',
input => 'selectbox',
},
datelocale => {
- text => &mt($itemtext->{'datelocale'}),
+ text => '<b>'.&mt($itemtext->{'datelocale'}).'</b>',
input => 'selectbox',
},
);
@@ -1609,16 +2272,20 @@ 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);
+ if ($position eq 'top') {
+ $datatable .= &item_table_row_start($items{$item}{text},$count);
+ } else {
+ $datatable .= &item_table_row_start($items{$item}{text}."<br/>(Custom text)",$count, "advanced");
+ }
if ($position eq 'top') {
my $includeempty = 0;
$datatable .= &user_table($cdom,$item,\@sections,
@@ -1641,7 +2308,7 @@ sub user_table {
} else {
my $num = 0;
my @curr = split(/,/,$currvalue);
- $output .= &Apache::loncommon::start_data_table();
+ $output .= '<table class="LC_nested_outer">';
my ($currusers);
foreach my $val (@curr) {
next if ($val eq '');
@@ -1672,24 +2339,23 @@ sub user_table {
$num ++;
}
if ($num) {
- $output .= &Apache::loncommon::start_data_table_row().
+ $output .= '<tr>'.
'<td align="left"><i>';
- if ($num > 1) {
+ if ($num == 1) {
$output .= $lt->{'currone'};
} else {
$output .= $lt->{'currmult'};
}
$output .= '</i><br />'.
'<table>'.$currusers.'</table></td>'.
- &Apache::loncommon::end_data_table_row();
+ '</tr>';
}
- $output .= &Apache::loncommon::start_data_table_row().
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak"><i>'.
$lt->{'add'}.'</i></span><br />'.
&select_recipient($item,$num,$cdom,$sections).
'<input type="hidden" name="'.$item.'_total" value="'.$num.'" />'.
- '</td>'.&Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table();
+ '</td></tr></table>';
}
return $output;
}
@@ -1700,9 +2366,8 @@ sub select_recipient {
my $selectlink =
&Apache::loncommon::selectstudent_link('display',$item.'_uname_'.$num,
$item.'_udom_'.$num,1);
- my $css_class = ($num % 2)?'LC_even_row':'LC_odd_row';
my $output =
- '<table><tr class="'.$css_class.'"><td align="center">'.&mt('Username').'<br />'.
+ '<table><tr><td align="center">'.&mt('Username').'<br />'.
'<input type="text" name="'.$item.'_uname_'.$num.'" value="" /></td>'.
'<td align="center">'.&mt('Domain').'<br />'.$domform.'</td>';
if (ref($sections) eq 'ARRAY') {
@@ -1756,8 +2421,8 @@ sub print_discussion {
}
my %items = (
'plc.roles.denied' => {
- text => '<b>'.&mt($itemtext->{'plc.roles.denied'}).'</b>'.
- &Apache::loncommon::help_open_topic("Course_Disable_Discussion").
+ text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'plc.roles.denied'}).'</b>'.
+ &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'</span><br />'.
&mt('(role-based)'),
input => 'checkbox',
},
@@ -1769,8 +2434,8 @@ sub print_discussion {
},
'pch.roles.denied' => {
- text => '<b>'.&mt($itemtext->{'pch.roles.denied'}).'</b>'.
- &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'<br />'.
+ text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pch.roles.denied'}).'</b>'.
+ &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'</span><br />'.
&mt('(role-based)'),
input => 'checkbox',
},
@@ -1796,11 +2461,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}) {
@@ -1836,8 +2501,13 @@ sub print_discussion {
}
sub role_checkboxes {
- my ($cdom,$cnum,$item,$settings,$showsections) = @_;
- my @roles = ('st','ad','ta','ep','in','cc');
+ my ($cdom,$cnum,$item,$settings,$showsections,$crstype) = @_;
+ my @roles = ('st','ad','ta','ep','in');
+ if ($crstype eq 'Community') {
+ push(@roles,'co');
+ } else {
+ push(@roles,'cc');
+ }
my $output;
my (@current,@curr_roles,%currsec,@sections);
if ($showsections) {
@@ -1874,7 +2544,7 @@ sub role_checkboxes {
if (grep(/^\Q$role\E$/,@current)) {
$checked = ' checked="checked" ';
}
- my $plrole=&Apache::lonnet::plaintext($role);
+ my $plrole=&Apache::lonnet::plaintext($role,$crstype);
if ($showsections) {
$output .= &Apache::loncommon::start_data_table_row();
} else {
@@ -1945,7 +2615,7 @@ sub role_checkboxes {
}
sub print_classlists {
- my ($position,$cdom,$settings,$itemtext,$rowtotal) = @_;
+ my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
my @ordered;
if ($position eq 'top') {
@ordered = ('default_enrollment_start_date',
@@ -1954,8 +2624,25 @@ 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;
+
+ if ($crstype eq 'Community') {
+ %lt = &Apache::lonlocal::texthash (
+ disabled => 'No viewable membership list',
+ section => "Membership of viewer's section",
+ all => 'List of all members',
+ );
+ } else {
+ %lt = &Apache::lonlocal::texthash (
+ disabled => 'No viewable classlist',
+ section => "Classlist of viewer's section",
+ all => 'Classlist of all students',
+ );
+ }
+
my %items = (
'default_enrollment_start_date' => {
text => '<b>'.&mt($itemtext->{'default_enrollment_start_date'}).'</b>',
@@ -1974,15 +2661,11 @@ sub print_classlists {
'student_classlist_view' => {
text => '<b>'.&mt($itemtext->{'student_classlist_view'}).'</b>',
input => 'selectbox',
- options => {
- disabled => &mt('No viewable classlist'),
- section => &mt("Classlist of viewer's section"),
- all => &mt('Classlist of all students'),
- },
+ 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',
},
@@ -1995,14 +2678,20 @@ sub print_classlists {
($settings->{'student_classlist_view'} eq 'section')) {
$settings->{'student_classlist_view'} = 'disabled';
}
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal);
+ return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
}
sub print_appearance {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
+ my $mathdef;
+ if ($crstype eq 'Community') {
+ $mathdef = &mt("None specified - use member's choice");
+ } else {
+ $mathdef = &mt("None specified - use student's choice");
+ }
my %items = (
'default_xml_style' => {
text => '<b>'.&mt($itemtext->{'default_xml_style'}).'</b> '.
@@ -2030,7 +2719,7 @@ sub print_appearance {
tth => &mt('TeX to HTML'),
},
order => ['jsMath','mimetex','tth'],
- nullval => &mt("None specified - use student's choice"),
+ nullval => $mathdef,
},
'tthoptions' => {
text => '<b>'.&mt($itemtext->{'tthoptions'}).'</b>',
@@ -2038,11 +2727,11 @@ sub print_appearance {
size => 40,
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
}
sub print_grading {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2053,14 +2742,15 @@ sub print_grading {
input => 'selectbox',
options => {
standard => &mt('Standard: shows points'),
- external => &mt('External: shows number of completed parts'),
+ external => &mt('External: shows number of completed parts and totals'),
+ externalnototals => &mt('External: shows only number of completed parts'),
spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'),
},
- order => ['standard','external','spreadsheet'],
+ order => ['standard','external','externalnototals','spreadsheet'],
},
'rndseed' => {
text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
- '<span class="LC_error">'.'<br />'.
+ '<span class="LC_warning">'.'<br />'.
&mt('Modifying this will make problems have different numbers and answers!').
'</span>',
input => 'selectbox',
@@ -2090,11 +2780,11 @@ sub print_grading {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
}
sub print_printouts {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2132,12 +2822,22 @@ sub print_printouts {
text => '<b>'.&mt($itemtext->{'disableexampointprint'}).'</b>',
input => 'radio',
},
+ canuse_pdfforms => {
+ text => '<b>'.&mt($itemtext->{'canuse_pdfforms'}).'</b>',
+ input => 'selectbox',
+ options => {
+ 1 => &mt('Yes'),
+ 0 => &mt('No'),
+ },
+ order => ['1','0'],
+ nullval => 'None specified - use domain default',
+ }
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
}
sub print_spreadsheet {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2169,21 +2869,29 @@ sub print_spreadsheet {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
-}
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+}
sub print_bridgetasks {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
+ my ($stumsg,$msgnote);
+ if ($crstype eq 'Community') {
+ $stumsg = &mt('Send message to member');
+ $msgnote = &mt('Message to member and add to user notes');
+ } else {
+ $stumsg = &mt('Send message to student');
+ $msgnote = &mt('Message to student and add to user notes');
+ }
my %items = (
task_messages => {
text => '<b>'.&mt($itemtext->{'task_messages'}).'</b>',
input => 'selectbox',
options => {
- only_student => &mt('Send message to student'),
- student_and_user_notes_screen => &mt('Message to student and add to user notes'),
+ only_student => $stumsg,
+ student_and_user_notes_screen => $msgnote,
},
order => ['only_student','student_and_user_notes_screen'],
nullval => &mt('No message or record in user notes'),
@@ -2203,11 +2911,11 @@ sub print_bridgetasks {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
}
sub print_other {
- my ($cdom,$settings,$allitems,$rowtotal) = @_;
+ my ($cdom,$settings,$allitems,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
return;
}
@@ -2228,7 +2936,7 @@ sub print_other {
input => 'textbox',
size => '30',
};
- my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal);
+ my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
}
sub get_other_items {
@@ -2245,7 +2953,7 @@ sub get_other_items {
unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
|| ($parameter eq 'type') ||
- ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) {
+ ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)) {
push(@ordered,$parameter);
}
}
@@ -2254,15 +2962,13 @@ sub get_other_items {
}
sub item_table_row_start {
- my ($text,$count) = @_;
+ my ($text,$count,$add_class) = @_;
my $output;
- if ($count%2) {
- $output .= '<tr class="LC_odd_row">';
- } else {
- $output .= '<tr>';
- }
+ my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
+ $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
+ $output .= '<tr class="'.$css_class.'">'."\n";;
$output .= '<td class="LC_left_item">'.$text.
- '</td><td class="LC_right_item" align="right">';
+ '</td><td class="LC_right_item">';
return $output;
}
@@ -2333,7 +3039,7 @@ sub select_from_options {
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
@@ -2341,7 +3047,7 @@ sub make_item_rows {
$count ++;
$datatable .= &item_table_row_start($items->{$item}{text},$count);
if ($item eq 'nothideprivileged') {
- $datatable .= ¬hidepriv_row($cdom,$item,$settings);
+ $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype);
} elsif ($item eq 'print_header_format') {
$datatable .= &print_hdrfmt_row($item,$settings);
} elsif ($items->{$item}{input} eq 'dates') {
@@ -2371,7 +3077,7 @@ sub make_item_rows {
}
sub nothidepriv_row {
- my ($cdom,$item,$settings) = @_;
+ my ($cdom,$item,$settings,$crstype) = @_;
my ($cnum) = &get_course();
my %nothide;
my $datatable;
@@ -2439,7 +3145,11 @@ sub nothidepriv_row {
}
$datatable .= '</table>';
} else {
- $datatable .= &mt('No Domain Coordinators have course roles');
+ if ($crstype eq 'Community') {
+ $datatable .= &mt('No Domain Coordinators have community roles');
+ } else {
+ $datatable .= &mt('No Domain Coordinators have course roles');
+ }
}
return $datatable;
}
@@ -2454,9 +3164,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;
@@ -2516,11 +3226,11 @@ function getIndexByName(item) {
</script>
ENDJS
- $output .= $currstr.&Apache::loncommon::start_data_table();
+ $output .= $currstr.'<table class="LC_nested_outer">';
if (@curr > 0) {
for (my $i=0; $i<@curr; $i++) {
my $pos = $i+1;
- $output .= &Apache::loncommon::start_data_table_row().
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$i,$maxnum).&mt('Delete:').
'<input type="checkbox" name="printfmthdr_del_'.$i.
@@ -2534,19 +3244,19 @@ ENDJS
'<input type="textbox" name="printfmthdr_text_'.$i.'"'.
' value="'.$curr[$i].'" size="25" /></td>';
}
- $output .= &Apache::loncommon::end_data_table_row();
+ $output .= '</tr>';
}
}
my $pos = $currnum+1;
- $output .= &Apache::loncommon::start_data_table_row().
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$currnum,$maxnum).
'<b>'.&mt('New').'</b></span></td><td align="left">'.
&substitution_selector($currnum).'</td>'.
- &Apache::loncommon::end_data_table_row();
+ '</tr>';
$pos ++;
$currnum ++;
- $output .= &Apache::loncommon::start_data_table_row().
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$currnum,$maxnum).
'<b>'.&mt('New').'</b></span></td>'.
@@ -2555,8 +3265,8 @@ ENDJS
'" value="" size ="25" />'.
'<input type="hidden" name="printfmthdr_maxnum" value="'.
$maxnum.'" /></td>'.
- &Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table();
+ '</tr>'.
+ '</table>';
return $output;
}
@@ -2576,10 +3286,18 @@ sub position_selector {
}
sub substitution_selector {
- my ($num,$subst,$limit) = @_;
+ my ($num,$subst,$limit,$crstype) = @_;
+ my ($stunametxt,$crsidtxt);
+ if ($crstype eq 'Community') {
+ $stunametxt = 'member name';
+ $crsidtxt = 'community ID',
+ } else {
+ $stunametxt = 'student name';
+ $crsidtxt = 'course ID',
+ }
my %lt = &Apache::lonlocal::texthash(
- n => 'student name',
- c => 'course ID',
+ n => $stunametxt,
+ c => $crsidtxt,
a => 'assignment note',
);
my $output .= &mt('Substitution').'<br />'.
@@ -2601,4 +3319,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;