--- loncom/interface/lonwhatsnew.pm 2007/03/02 20:58:32 1.69
+++ loncom/interface/lonwhatsnew.pm 2007/09/26 12:34:19 1.73
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.69 2007/03/02 20:58:32 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.73 2007/09/26 12:34:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -99,28 +99,28 @@ sub handler {
text=>"Display Action Items"});
if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
+ ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
text=>"Change thresholds"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
("What's New?",#'Course_Action_Items_Thresholds'
));
} elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
+ ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
text=>"Change interval"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
("What's New?",#'Course_Action_Items_Intervals'
));
} elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
+ ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
text=>"Change discussion display"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
("What's New?",#'Course_Action_Items_Intervals'
));
} elsif ($command eq 'courseinit') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
+ ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
text=>"Course initialization preference"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
("What's New?",#'Course_Action_Items_Initialization'
@@ -295,7 +295,7 @@ sub display_actions_box {
my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')';
unless ($cid) {
- $r->print('
'.$lt{'yacc'}.' ');
+ $r->print(''.$lt{'yacc'}.'
');
return;
}
@@ -304,14 +304,14 @@ sub display_actions_box {
&GDBM_READER(),0640)) {
my $furl=$bighash{'first_url'};
untie(%bighash);
- $r->print(''.$lt{'gtfr'}.
- ' ');
+ $r->print(''.$lt{'gtfr'}.
+ ' ');
}
}
$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 '.$lctype.' ',$refpage).' '.
- &mt('or for all your courses ',$refpage).' ');
+ '. '.&mt('Currently: [_1] ',$currinit).'. '.
+ &mt('Change for just this '.$lctype.' ',$refpage).' '.
+ &mt('or for all your courses .',$refpage).' ');
if ($command eq 'reset') {
$result = &process_reset($cdom,$crs);
@@ -326,9 +326,9 @@ sub display_actions_box {
my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed);
unless ($store_result eq 'ok') {
- &Apache::lonnet::logthis('Error storing whatsnew settings: '.
+ &Apache::lonnet::logthis('Error saving whatsnew settings: '.
$store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
- $result .= &mt('Unable to store visibility settings due to [_1]',
+ $result .= &mt('Unable to save visibility settings due to [_1]',
$store_result);
}
@@ -411,7 +411,7 @@ sub display_actions_box {
}
}
- $r->print('');
+ $r->print('');
my $displayed = 0;
my $totalboxes = 0;
@@ -426,20 +426,17 @@ sub display_actions_box {
foreach my $actionitem (@actionorder) {
if ($$checkallowed{$actionitem}) {
if ($displayed == $halfway) {
- $r->print(' ');
+ $r->print(' ');
}
&display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread);
$displayed ++;
}
}
$r->print('
-
-
-
-
- ');
+
+');
}
#-------------------------------
@@ -470,9 +467,9 @@ sub display_threshold_config {
$r->print(' ');
@@ -1302,7 +1299,7 @@ sub display_coursediscussion {
my $css_class = $rowNum%2?' class="LC_odd_row"':'';
my $lastpost = &Apache::lonnavmaps::timeToHumanString(
$$unread{$ressymb}{'lastpost'});
- $r->print(''.$forum_title.' '.$type.' ');
+ $r->print(''.$forum_title.' '.&mt($type).' ');
if ($countunread eq 'on') {
my $unreadnum = $$unread{$ressymb}{'unreadcount'};
$r->print(''.$lastpost.' '.
@@ -1332,7 +1329,7 @@ sub display_coursenormalmail {
$r->print(' '.$mailcount.
'. '.
$msg->{'shortsub'}.' '.
- $msg->{'from'}.'@'.$msg->{'fromdom'}.' '.
+ $msg->{'from'}.':'.$msg->{'fromdom'}.' '.
$msg->{'sendtime'}.' ');
}
} else {
@@ -1356,7 +1353,7 @@ sub display_coursecritmail {
$r->print(''.$mailcount.
'. '.
$msg->{'shortsub'}.' '.
- $msg->{'from'}.'@'.$msg->{'fromdom'}.' '.
+ $msg->{'from'}.':'.$msg->{'fromdom'}.' '.
$msg->{'sendtime'}.' ');
}
} else {
@@ -1424,7 +1421,7 @@ sub store_interval_setting {
} else {
my $lctype = lc(&Apache::loncommon::course_type());
- &Apache::lonnet::logthis('Error storing whatsnew interval setting'.
+ &Apache::lonnet::logthis('Error saving whatsnew interval setting'.
' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
$result = &mt('Unable to set interval to [_1] due to [_2].',
''.$$interval_titles{$env{'form.interval'}}.' ',
@@ -1448,7 +1445,7 @@ sub store_discussion_setting {
} else {
my $lctype = lc(&Apache::loncommon::course_type());
- &Apache::lonnet::logthis('Error storing whatsnew countunread setting'.
+ &Apache::lonnet::logthis('Error saving whatsnew countunread setting'.
' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
$result = &mt('Unable to set "number unread posts display" to [_1]'.
' due to [_2].',
@@ -1486,7 +1483,7 @@ sub store_courseinit_setting {
$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 '.
+ &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
'setting: '.$outcome.' for '.$uname.
':'.$udom.' in '.$lctype.' '.$cid);
if ($page_control eq 'global preferences') {
@@ -1514,17 +1511,19 @@ sub start_box {
my $showhide;
if ($$show{$caller}) {
$showhide = 'Hide ';
+ 'display_'.$caller.",'hide'".');">'.
+ &mt('Hide').'';
} else {
$showhide = 'Show ';
+ 'display_'.$caller.",'show'".');">'.
+ &mt('Show').'';
}
$r->print('
- '.$$heading{$caller}.'
+ '.$$heading{$caller}.'
'.$showhide.'
');
if (($caller eq 'abovethreshold') && ($$show{$caller})) {