--- loncom/interface/lonpopulate.pm 2009/10/30 20:35:34 1.66 +++ loncom/interface/lonpopulate.pm 2011/01/11 22:09:50 1.68 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.66 2009/10/30 20:35:34 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.68 2011/01/11 22:09:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -217,26 +217,28 @@ sub print_mainbox { } elsif ($action eq "newsections") { $action = "sections"; } - $page .= "-> ".$$tasklongref{$action}." -> result"; + $page .= "» ".$$tasklongref{$action}." » result"; } else { - $page .= " -> ".$$tasklongref{$action}.""; + $page .= " » ".$$tasklongref{$action}.""; } } my $usrmang = &mt('User Management'); my $autenrl = &mt('Automated Enrollment Manager'); + #LC_pick_box is used in the following. This is only a temporary solution to adapt the site to the design. $r->print(< - - $realm -> $usrmang -> $page
+ + $realm » $usrmang » $page
- - $autenrl  + + $autenrl  - - +
+
+ ENDTHIS } @@ -247,9 +249,7 @@ sub print_navmenu { $action = $env{'form.action'}; } $r->print(<  - - - -
-
+
ENDONE foreach my $task (@{$tasksref}) { if ($task eq $action) { @@ -272,9 +272,7 @@ ENDONE $r->print("

 

  "); + "); } ############################################################### @@ -429,7 +427,7 @@ Note: Any students added manually by cou } my $dateshow; if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { - $dateshow = "
Warning. Currently NO first enrollment or last enrollment dates are set. You must use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n"; + $dateshow = "
Warning. Currently NO first enrollment or last enrollment dates are set. You must use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n"; } else { $dateshow = "Currently: First enrollment: $oldstartshow, Last enrollment: $oldendshow\n"; } @@ -1334,7 +1332,7 @@ sub print_accessdate_table { ); my $dateshow; if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { - $dateshow = "
".&mt('Warning').". ".$lt{'cuno'}." "; + $dateshow = "
".&mt('Warning').". ".$lt{'cuno'}." "; if ($action eq 'setaccess') { $dateshow .= $lt{'ifyo'}."\n"; } elsif ($action eq 'updatenow') { @@ -1514,7 +1512,7 @@ sub print_chgsettings_response { } if ($autoadds || $autodrops) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you indicated that nightly "; + $warn_prefix = "
Warning. Although you indicated that nightly "; $warn_suffix = " should be enabled, additional action is required.
"; } if ($autoadds) { @@ -1612,7 +1610,7 @@ sub print_setdates_response { } } $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; + $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -1711,7 +1709,7 @@ start and end access dates for this cour } } $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.
"; + $warn_prefix = "
Warning. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -1896,7 +1894,7 @@ sub print_crosslistings_menu () { sub print_crosslistings_response () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode','internal.courseowner'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode','internal.courseowner','internal.co-owners'],$dom,$crs); my @currxlists = (); my @xlists = (); my @allxlists = (); @@ -1908,6 +1906,7 @@ sub print_crosslistings_response () { my $xliststr = $settings{'internal.crosslistings'}; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; + my $coowners = $settings{'internal.co-owners'}; my $response = ''; my $warning = ''; my $warn_prefix = ''; @@ -1941,7 +1940,7 @@ sub print_crosslistings_response () { $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$env{"form.$xl"}); if ($coursecheck eq 'ok') { my $addcheck = ''; - $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner); + $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner,$coowners); if ($addcheck eq 'ok') { push @xlists,$env{"form.$xl"}.":".$env{"form.$lc_sec"}; } else { @@ -2019,7 +2018,7 @@ sub print_crosslistings_response () { if (@allxlists > 0) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.
"; + $warn_prefix = "
Warning. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -2031,7 +2030,7 @@ sub print_crosslistings_response () { sub print_sections_menu () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner','internal.co-owners'],$dom,$crs); my @currsections = (); my @sections = (); my @badowner = (); @@ -2045,6 +2044,7 @@ sub print_sections_menu () { my $warn_prefix = ""; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; + my $coowners = $settings{'internal.co-owners'}; if ($settings{'internal.sectionnums'} ne '') { @currsections = split(/,/,$settings{'internal.sectionnums'}); } @@ -2069,7 +2069,7 @@ sub print_sections_menu () { my $newsec = $coursecode.$env{"form.$secnum"}; my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { - my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner); + my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner,$coowners); if ($addcheck eq 'ok') { push @sections,$env{"form.$secnum"}.":".$env{"form.$lc_sec"}; $seccount ++; @@ -2157,7 +2157,7 @@ sections which contribute to enrollment if ($seccount > 0) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; + $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -2213,7 +2213,7 @@ sections which contribute to enrollment sub print_sections_response () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner','internal.co-owners'],$dom,$crs); my @currsections = (); my @sections = (); my @allsections = (); @@ -2225,6 +2225,7 @@ sub print_sections_response () { my $secstr = $settings{'internal.sectionnums'}; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; + my $coowners = $settings{'internal.co-owners'}; my $response = ''; my $putreply = ''; my $warning = ''; @@ -2255,7 +2256,7 @@ sub print_sections_response () { my $newsec = $coursecode.$env{"form.$sec"}; my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { - my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner); + my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner,$coowners); if ($addcheck eq 'ok') { push @sections,$env{"form.$sec"}.":".$env{"form.$lc_sec"}; } else { @@ -2328,7 +2329,7 @@ sub print_sections_response () { if (@allsections > 0) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; + $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; }