[LON-CAPA-cvs] cvs: loncom /interface lonwhatsnew.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Sat, 03 Jun 2006 21:28:07 -0000
This is a MIME encoded message
--albertel1149370087
Content-Type: text/plain
albertel Sat Jun 3 17:28:07 2006 EDT
Modified files:
/loncom/interface lonwhatsnew.pm
Log:
- switching to type accessor
- modified the use of mt args for course type
--albertel1149370087
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20060603172807.txt"
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.58 loncom/interface/lonwhatsnew.pm:1.59
--- loncom/interface/lonwhatsnew.pm:1.58 Sat Jun 3 17:05:04 2006
+++ loncom/interface/lonwhatsnew.pm Sat Jun 3 17:28:07 2006
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.58 2006/06/03 21:05:04 albertel 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 @@
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('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">');
my %threshold_titles = &Apache::lonlocal::texthash (
@@ -249,7 +249,7 @@
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',
@@ -316,9 +316,9 @@
'</a></font><br />');
}
}
- $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).
'. <nobr>'.&mt('Currently: <i>[_1]</i>',$currinit).'. '.
- &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this [_2]</a>',$refpage,$lctype).' '.
+ &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '.
&mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses/groups</a>',$refpage).'</nobr><br /><hr />');
if ($command eq 'reset') {
@@ -373,7 +373,10 @@
&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'}.'<br /> '.&mt('and total number of [_1] with submissions',$stulabel{$crstype}).' ≥ '.$threshold{'numstudents'};
+ $headings{'abovethreshold'} =
+ &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2] <br /> 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');
@@ -531,10 +534,10 @@
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('<br />'.&mt('Choose the time window to use for display of version changes for resources in the [_1].',$lctype));
+ $r->print('<br />'.&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]','<b>'.
$$interval_titles{$current}.'</b>.'));
@@ -613,7 +616,7 @@
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',
@@ -1266,7 +1269,7 @@
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',
@@ -1325,7 +1328,7 @@
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('<tr bgcolor="#cccccc"><td><b><small>'.&mt('Number').'</small></b></td><td><b><small>'.&mt('Subject').'</small></b></td><td><b><small>'.&mt('Sender').'</small></b></td><td><b><small>'.&mt('Date/Time').'</small></b></td></tr>');
my $rowNum = 0;
@@ -1341,14 +1344,14 @@
$mailcount ++;
}
} else {
- $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new [_1] messages',$lctype).'</small></i></b><br /><br /></center></td></tr>');
+ $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new '.$lctype.' messages').'</small></i></b><br /><br /></center></td></tr>');
}
}
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('<tr bgcolor="#cccccc"><td><b><small>'.&mt('Number').'</small></b></td><td><b><small>'.&mt('Subject').'</small></b></td><td><b><small>'.&mt('Sender').'</small></b></td><td><b><small>'.&mt('Date/Time').'</small></b></td></tr>');
my $rowNum = 0;
@@ -1364,7 +1367,7 @@
$mailcount ++;
}
} else {
- $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No unread critical messages in [_1]',$lctype).'</small></i></b><br /><br /></center></td></tr>');
+ $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No unread critical messages in '.$lctype).'</small></i></b><br /><br /></center></td></tr>');
}
}
@@ -1383,7 +1386,7 @@
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);
}
@@ -1425,7 +1428,7 @@
'<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
} 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].',
@@ -1449,7 +1452,7 @@
'<b>'.$env{'form.countunread'}.'</b><br />');
} 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]'.
@@ -1478,14 +1481,14 @@
}
}
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 <b>user's global preferences</b>.",$lctype);
+ $result = &mt("Page displayed after role selection in $lctype now set by <b>user's global preferences</b>.");
} else {
- $result = &mt('Page displayed after role selection in this [_1] set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}});
+ $result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}});
}
} else {
&Apache::lonnet::logthis('Error storing whatsnew courseinit '.
@@ -1497,7 +1500,7 @@
'<b>'.$page_control.'</b>',
'<tt>'.$outcome.'</tt>.<br />');
} else {
- $result = &mt('Unable to set page display, after role selection, for this [_1] to <b>[_2]</b> due to <tt>[_3]</tt>.<br />',$lctype,
+ $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to <b>[_2]</b> due to <tt>[_3]</tt>.<br />',
$$initpage{$env{'form.courseinit_page'}},$outcome);
}
}
--albertel1149370087--