--- loncom/interface/lonpopulate.pm 2013/08/16 03:25:05 1.79 +++ loncom/interface/lonpopulate.pm 2015/06/09 21:22:57 1.83 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.79 2013/08/16 03:25:05 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.83 2015/06/09 21:22:57 damieng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,7 @@ sub header { sub choose_header { my ($action) = @_; my $notify_check = '/^note_[0-9]+$/'; - my %lt = + my %js_lt = &Apache::lonlocal::texthash( adds => 'You must select either "Enable" or "Disable" for nightly additions based on classlist changes', drop => 'You must select either "Enable" or "Disable" for nightly removals based on classlist changes', @@ -61,8 +61,9 @@ sub choose_header { ynot => 'You have indicated that you want notification of roster changes messages to be sent, but you have not selected any recipients.', atle => 'You must check at least one checkbox, before proceeding to the next page', ); - $lt{'both'} = &mt('You have selected "No" for both addition and removal of students[_1] in the institutional classlist but not in your LON-CAPA course.[_1]','\\n'); - $lt{'nnot'} = &mt('You have indicated that you do not want notification of roster changes messages to be sent, but [_1] have been checked as recipients.[_2]',"'+totalnote+'",'\\n'); + $js_lt{'both'} = &mt('You have selected "No" for both addition and removal of students[_1] in the institutional classlist but not in your LON-CAPA course.[_1]',"\n"); + $js_lt{'nnot'} = &mt('You have indicated that you do not want notification of roster changes messages to be sent, but [_1] have been checked as recipients.[_2]',"'+totalnote+'","\n"); + &js_escape(\%js_lt); my $scripttag = < @@ -88,11 +89,11 @@ function process(calling,numauto,nummanu } } if (rad1 == 0) { - alert('$lt{'adds'}'); + alert('$js_lt{'adds'}'); checker = 0 } if (rad2 == 0) { - alert('$lt{'drop'}'); + alert('$js_lt{'drop'}'); checker = 0 } } @@ -116,15 +117,15 @@ function process(calling,numauto,nummanu } } if (rad1 == 0) { - alert('$lt{'drop'}'); + alert('$js_lt{'drop'}'); checker = 0; } if (rad2 == 0) { - alert('$lt{'ysno'}'); + alert('$js_lt{'ysno'}'); checker = 0; } if (formName.updatedrops[unenrolldis].checked && formName.updateadds[enrolldis].checked ) { - alert('$lt{'both'}$lt{'noup'}'); + alert('$js_lt{'both'}$js_lt{'noup'}'); checker = 0; } } @@ -141,7 +142,7 @@ function process(calling,numauto,nummanu } if (totalnote > 0) { if (formName.notify[1].checked == true) { - if (confirm('$lt{'nnot'}$lt{'eras'}')) { + if (confirm('$js_lt{'nnot'}$js_lt{'eras'}')) { checker = 1; } else { checker = 0; @@ -149,7 +150,7 @@ function process(calling,numauto,nummanu } } else { if (formName.notify[0].checked == true) { - alert('$lt{'ynot'}'); + alert('$js_lt{'ynot'}'); checker = 0; } } @@ -177,7 +178,7 @@ function process(calling,numauto,nummanu document.forms.studentform.state.value = "process"; } if (totcheck == 0) { - alert('$lt{'atle'}') + alert('$js_lt{'atle'}') checker = 0; } } @@ -290,7 +291,7 @@ sub print_main_frame { # Get course settings my %enrollvar; my %settings = &Apache::lonnet::dump('environment',$dom,$crs); - foreach my $item (keys %settings) { + foreach my $item (keys(%settings)) { if ($item =~ m/^internal\.(.+)$/) { $enrollvar{$1} = $settings{$item}; } elsif ($item =~ /^default_enrollment_(start|end)_date$/) { @@ -749,7 +750,7 @@ sub print_main_frame { $r->print( &mt('Currently, this LON-CAPA course is crosslisted with [quant,_1,course section,course sections].',$cross_str).' '. &mt('Students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.').' '. - &mt('For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: [_1; otherwise uncheck it.',"$realm ($enrollvar{coursecode})").' '. + &mt('For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: [_1]; otherwise uncheck it.',"$realm ($enrollvar{coursecode})").' '. &mt('If you wish to change the section ID assigned in your LON-CAPA course for a crosslisted course, enter the new section ID in the appropriate textbox.').' '. &mt('The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this crosslisting.').' '. &mt('If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page.').' '. @@ -2726,20 +2727,24 @@ sub print_update_result { my %settings = &Apache::lonnet::get('environment', ['internal.coursecode','internal.sectionnums','internal.crosslistings', - 'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits'], + 'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits', + 'internal.textbook'], $dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; my $autharg = $settings{'internal.autharg'}; my $showphotos = $settings{'internal.showphoto'}; + my $textbook = $settings{'internal.textbook'}; my ($showcredits,$defaultcredits); my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); - if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) { + if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) { $showcredits = 1; $defaultcredits = $settings{'internal.defaultcredits'}; if ($defaultcredits eq '') { if ($coursecode ne '') { $defaultcredits = $domdefaults{'officialcredits'}; + } elsif ($textbook ne '') { + $defaultcredits = $domdefaults{'textbookcredits'}; } else { $defaultcredits = $domdefaults{'unofficialcredits'}; }