--- loncom/interface/lonwhatsnew.pm 2006/05/31 14:25:02 1.57 +++ loncom/interface/lonwhatsnew.pm 2006/06/03 21:28:07 1.59 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.57 2006/05/31 14:25:02 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.59 2006/06/03 21:28:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -145,7 +145,7 @@ sub display_main_box { my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); $r->print(''); my $rowNum = 0; @@ -1340,14 +1344,14 @@ sub display_coursenormalmail { $mailcount ++; } } else { - $r->print(''); + $r->print(''); } } sub display_coursecritmail { my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { $r->print(''); my $rowNum = 0; @@ -1363,7 +1367,7 @@ sub display_coursecritmail { $mailcount ++; } } else { - $r->print(''); + $r->print(''); } } @@ -1382,7 +1386,7 @@ sub get_display_settings { if ($tmp=~ /^(con_lost|error|no_such_host)/i) { %settings = (); unless ($tmp =~ /^error: 2 /) { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid); } @@ -1424,7 +1428,7 @@ sub store_interval_setting { ''.$$interval_titles{$env{'form.interval'}}.'
'); } else { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error storing whatsnew interval setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set interval to [_1] due to [_2].', @@ -1448,7 +1452,7 @@ sub store_discussion_setting { ''.$env{'form.countunread'}.'
'); } else { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error storing whatsnew countunread setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set "number unread posts display" to [_1]'. @@ -1477,14 +1481,14 @@ sub store_courseinit_setting { } } if ($page_control) { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); my $outcome = &Apache::lonnet::put('nohist_whatsnew', \%courseinit_settings,$udom,$uname); if ($outcome eq 'ok') { if ($page_control eq 'global preferences') { - $result = &mt("Page displayed after role selection in [_1] now set by user's global preferences.",$lctype); + $result = &mt("Page displayed after role selection in $lctype now set by user's global preferences."); } else { - $result = &mt('Page displayed after role selection in this [_1] set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); + $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); } } else { &Apache::lonnet::logthis('Error storing whatsnew courseinit '. @@ -1496,7 +1500,7 @@ sub store_courseinit_setting { ''.$page_control.'', ''.$outcome.'.
'); } else { - $result = &mt('Unable to set page display, after role selection, for this [_1] to [_2] due to [_3].
',$lctype, + $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_2] due to [_3].
', $$initpage{$env{'form.courseinit_page'}},$outcome); } }
'); my %threshold_titles = &Apache::lonlocal::texthash ( @@ -228,8 +228,9 @@ END '; } - return &Apache::loncommon::start_page(&mt('[_1] Action Items', - $env{'course.'.$env{'request.course.id'}.'.type'}),$scripttag); + my $course_type=&Apache::loncommon::course_type(); + return &Apache::loncommon::start_page($course_type.' Action Items', + $scripttag); } #------------------------------- @@ -248,7 +249,7 @@ sub display_actions_box { my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; - my $crstype = $env{'course.'.$cid.'.type'}; + my $crstype = &Apache::loncommon::course_type(); my $lctype = lc($crstype); my %stulabel = ( 'Course' => 'students', @@ -315,9 +316,9 @@ sub display_actions_box { '
'); } } - $r->print(&mt('Page set to be displayed after you have selected a role in this [_1]',$lctype). + $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype). '. '.&mt('Currently: [_1]',$currinit).'.  '. - &mt('Change for just this [_2]',$refpage,$lctype).' '. + &mt('Change for just this '.$lctype.'',$refpage).' '. &mt('or for all your courses/groups',$refpage).'
'); if ($command eq 'reset') { @@ -372,7 +373,10 @@ sub display_actions_box { &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); } - $headings{'abovethreshold'} = &mt('Problems with av. attempts').' ≥ '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' ≥ '.$threshold{'degdiff'}.'
'.&mt('and total number of [_1] with submissions',$stulabel{$crstype}).' ≥ '.$threshold{'numstudents'}; + $headings{'abovethreshold'} = + &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]
and total number of '.$stulabel{$crstype}.' with submissions ≥ [_3]', + $threshold{'av_attempts'},$threshold{'degdiff'}, + $threshold{'numstudents'}); my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); @@ -530,10 +534,10 @@ sub display_threshold_config { sub display_interval_config { my ($r,$refpage,$interval_titles) = @_; - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); my $current = &get_current($env{'user.name'},$env{'user.domain'}, $env{'request.course.id'},'interval'); - $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the [_1].',$lctype)); + $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.')); unless ($current eq '') { $r->print(' '.&mt('Current value is [_1]',''. $$interval_titles{$current}.'.')); @@ -612,7 +616,7 @@ sub courseinit_config { my ($control,$current) = &curr_courseinit(); my @chgstate = ('userpref','coursespecific'); my @chgentry = ('firstres','whatsnew'); - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'chwp' => "Choose which page will be displayed when you enter this $lctype after selecting a role.", 'cuva' => 'Current value is determined by', @@ -1265,7 +1269,7 @@ sub display_versionchanges { sub display_coursediscussion { my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, $rowColor2) = @_; - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', 'type' => 'Type', @@ -1324,7 +1328,7 @@ sub display_coursediscussion { sub display_coursenormalmail { my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { $r->print('
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'

'.&mt('No new [_1] messages',$lctype).'


'.&mt('No new '.$lctype.' messages').'

'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'

'.&mt('No unread critical messages in [_1]',$lctype).'


'.&mt('No unread critical messages in '.$lctype).'