--- loncom/interface/lonwhatsnew.pm	2008/04/30 23:52:00	1.77
+++ loncom/interface/lonwhatsnew.pm	2009/02/04 13:03:44	1.85
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.77 2008/04/30 23:52:00 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.85 2009/02/04 13:03:44 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,19 +169,19 @@ sub display_main_box {
                          degdiff => 'Degree of difficulty',
                          numstudents => 'Total number of students with submissions',
     );
-    my %versions = &Apache::lonlocal::texthash (
+    my %versions = (
                        -1 => "version changes since start of $lctype",
                   2592000 => 'version changes since last month',
                    604800 => 'version changes since last week',
                     86400 => 'version changes since yesterday',
                    );
-    my %newroles = &Apache::lonlocal::texthash (
+    my %newroles = (
                        -1 => "roles which have become active since start of $lctype",
                   2592000 => 'roles which have become active since last month',
                    604800 => 'roles which have become active since last week',
                     86400 => 'roles which have become active since yesterday',
                    );
-    my %oldroles = &Apache::lonlocal::texthash (
+    my %oldroles = (
                        -1 => "roles which expired since start of $lctype",
                   2592000 => 'roles which expired since last month',
                    604800 => 'roles which expired since last week',
@@ -352,15 +352,15 @@ sub display_actions_box {
     }
     $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
               .' <span class="LC_nobreak">'
-              .&mt('Currently: <i>[_1]</i>',$currinit)
-              .'.&nbsp;&nbsp;'
-#              &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&amp;refpage=[_1]">this '.$lctype.'</a>',$refpage).' '.
-#              &mt('or for all <a href="/adm/preferences?action=changecourseinit&amp;refpage=[_1]">your courses</a>.',$refpage).'</span><br /><hr />');
-              .&mt('<b>Change</b> for just [_1]this course[_2]'
-                  .' or for all [_3]your courses[_2].'
+              .&mt('Currently: [_1].','<i>'.$currinit.'</i>')
+              .'&nbsp;&nbsp;'
+              .&mt('[_1]Change[_2] for just [_3]this course[_4] or for all [_5]your courses[_6].'
+                  ,'<b>'
+                  ,'</b>'
                   ,'<a href="/adm/whatsnew?command=courseinit&amp;refpage='.$refpage.'">'
                   ,'</a>'
-                  ,'<a href="/adm/preferences?action=changecourseinit&amp;refpage='.$refpage.'">')
+                  ,'<a href="/adm/preferences?action=changecourseinit&amp;refpage='.$refpage.'">'
+                  ,'</a>')
               .' </span><br /><hr />');
 
     if ($command eq 'reset') {
@@ -402,13 +402,13 @@ sub display_actions_box {
     );
 
     if ($timediff{'versions'} == -1) {
-        $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since start of '.$lctype;
+        $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since start of '.$lctype);
     } elsif ($timediff{'versions'} == 2592000) {
-        $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since last month';
+        $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last month');
     } elsif ($timediff{'versions'} == 604800) {
-        $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since last week';
+        $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last week');
     } elsif ($timediff{'versions'} == 86400) {
-        $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since yesterday';
+        $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since yesterday');
     }
 
     $timediff{'oldroles'} = $display_settings{$cid.':oldroleinterval'};
@@ -416,13 +416,13 @@ sub display_actions_box {
     $interval{'oldroles'} = $interval_titles->{'oldroles'}->{$timediff{'oldroles'}};
 
     if ($timediff{'oldroles'} == -1) {
-        $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since start of '.$lctype;
+        $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since start of '.$lctype);
     } elsif ($timediff{'oldroles'} == 2592000) {
-        $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since last month';
+        $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last month');
     } elsif ($timediff{'oldroles'} == 604800) {
-        $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since last week';
+        $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last week');
     } elsif ($timediff{'oldroles'} == 86400) {
-        $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since yesterday';
+        $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since yesterday');
     }
 
     $timediff{'newroles'} = $display_settings{$cid.':newroleinterval'};
@@ -430,13 +430,13 @@ sub display_actions_box {
     $interval{'newroles'} = $interval_titles->{'newroles'}->{$timediff{'newroles'}};
 
     if ($timediff{'newroles'} == -1) {
-        $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since start of '.$lctype;
+        $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since start of '.$lctype);
     } elsif ($timediff{'newroles'} == 2592000) {
-        $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since last month';
+        $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last month');
     } elsif ($timediff{'newroles'} == 604800) {
-        $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since last week';
+        $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last week');
     } elsif ($timediff{'newroles'} == 86400) {
-        $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since yesterday';
+        $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since yesterday');
     }
 
     my $now = time;
@@ -464,9 +464,9 @@ sub display_actions_box {
     }
 
     $headings{'abovethreshold'} = 
-	&mt('Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2] <br /> and total number of '.$stulabel{$crstype}.' with submissions &ge; [_3]',
+	&mt('(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions &ge; [_4]',
 	    $threshold{'av_attempts'},$threshold{'degdiff'},
-	    $threshold{'numstudents'});
+	    '<br />',$threshold{'numstudents'});
 
     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
 
@@ -490,8 +490,9 @@ sub display_actions_box {
         }
     }
 
+    my $itemserror;
     if ($needitems) {
-        &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
+        $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
     }
     if ($show{'coursenormalmail'}) {
         $msgcount = &getnormalmail(\@newmsgs);
@@ -533,7 +534,7 @@ sub display_actions_box {
             if ($displayed == $halfway) {
                 $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
             }
-            &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,\%expired,$expirecount,\%activated,$activecount,$crstype);
+            &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,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror);
             $displayed ++; 
         }
     }
@@ -637,12 +638,12 @@ sub display_interval_config {
 <input type="hidden" name="refpage" value="'.$refpage.'" />'.
 &mt('Display:').' 
 <select name="interval">
-<option value="" selected="selected">Select</option>
+<option value="" selected="selected">'.&mt('Select').'</option>
 ');
     if (ref($interval_titles) eq 'HASH') {
         if (ref($interval_titles->{$context}) eq 'HASH') {
             foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) {
-                $r->print('<option value="'.$key.'">'.$interval_titles->{$context}->{$key}.
+                $r->print('<option value="'.$key.'">'.&mt($interval_titles->{$context}->{$key}).
                           '</option>'."\n");
             }
         }
@@ -679,7 +680,13 @@ function toggle_countunread(choice) {
     document.discussionswitch.submit();
 }
 </script>');
-    $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.").'&nbsp;&nbsp;'.&mt("Currently set to <b>$current</b>."));
+    $r->print('<br />'
+             .&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.')
+             .'<br />'
+             .&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.")
+             .'&nbsp;&nbsp;'
+             .&mt('Currently set to [_1].','<b>'.$current.'</b>.')
+    );
     $r->print('<br /><br />
 <form method="post" name="discussionswitch" action="/adm/whatsnew">
 <input type="hidden" name="command" value="newdiscconf" />
@@ -689,9 +696,9 @@ function toggle_countunread(choice) {
     $r->print('<br/>
                <input type="button" name="display" value="'.
                &mt('Change to [_1]',&mt($opposite{$current})).'" 
-               onclick="javascript:toggle_countunread('."'change'".')" />
-               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;
-               <input type="button" name="nochange" value="'.
+               onclick="javascript:toggle_countunread('."'change'".')" />'.
+               ('&nbsp;' x7).
+               '<input type="button" name="nochange" value="'.
                &mt("No change").'" 
                onclick="javascript:toggle_countunread('."'unchanged'".')" />
                </form>');
@@ -780,23 +787,23 @@ sub display_launcher {
         $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
         $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
         $interval,$countunread,$expired,$expirecount,$activated,$activecount,
-        $crstype) = @_;
+        $crstype,$itemserror) = @_;
 
     if ($$checkallowed{$action}) {
         &start_box($r,$show,$headings,$action,$refpage,$action);
         if ($$show{$action}) {
             if ($action eq 'handgrading') {    # UNGRADED ITEMS
-                &display_handgrade($r,$tograde,$ungraded);
+                &display_handgrade($r,$tograde,$ungraded,$itemserror);
             } elsif ($action eq 'haserrors') { # BOMBS
-                &display_haserrors($r,$bombs,$bombed,$res_title);
+                &display_haserrors($r,$bombs,$bombed,$res_title,$itemserror);
             } elsif ($action eq 'versionchanges') { # VERSION CHANGES
-                &display_versionchanges($r,$changed,$res_title,$interval->{'versions'});
+                &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror);
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
-					$res_title);
+					$res_title,$itemserror);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
-                                $countunread,$res_title);
+                                $countunread,$res_title,$itemserror);
             } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES
                 &display_coursenormalmail($r,$msgcount,$newmsgs);
             } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES
@@ -819,6 +826,10 @@ sub getitems {
         $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show,
         $starttime,$countunread) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
+        return $itemserror;
+    }
     # force retrieve Resource to seed the part id cache we'll need it later
     my @allres=$navmap->retrieveResources(undef,
                      sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
@@ -877,6 +888,7 @@ sub getitems {
         }
 
     }
+    return; 
 }
 
 sub check_discussions {
@@ -1222,8 +1234,8 @@ sub getactivated {
             if (ref($changes{$chg}) eq 'HASH') {
                 my $timestamp = $changes{$chg}{'exe_time'};
                 if ($timestamp) {
-                    if ($rolechgtime > -1) {
-                        if ($now - $rolechgtime < $timestamp) {
+                    if ($rolechgtime > 0) {
+                        if ($timestamp < $rolechgtime) {
                             last;
                         }
                     }
@@ -1440,7 +1452,7 @@ sub checkversions {
 }
 
 sub display_handgrade {
-    my ($r,$tograde,$ungraded) = @_;
+    my ($r,$tograde,$ungraded,$itemserror) = @_;
     my %lt = &Apache::lonlocal::texthash(
                         'prna' => 'Problem Name',
                         'nmun' => 'Number ungraded',
@@ -1463,13 +1475,15 @@ sub display_handgrade {
             } 
             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
         }
+    } elsif ($itemserror) {
+        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
         $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
     }
 }
 
 sub display_haserrors {
-    my ($r,$bombs,$bombed,$res_title) = @_;
+    my ($r,$bombs,$bombed,$res_title,$itemserror) = @_;
     my $bombnum = 0;
     my %lt = &Apache::lonlocal::texthash(
                                    reso => 'Resource',
@@ -1488,6 +1502,8 @@ sub display_haserrors {
                       '</td><td class="LC_right_item">'.
                       $$bombed{$bomb}{errorcount}.'</td></tr>');
         }
+    } elsif ($itemserror) {
+        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
         $r->print('<tr class="LC_empty_row"><td>'.$lt{'noer'}.'</td></tr>');
     }
@@ -1495,7 +1511,7 @@ sub display_haserrors {
 }
 
 sub display_abovethreshold {
-    my ($r,$refpage,$warnings,$triggered,$res_title) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -1551,19 +1567,20 @@ sub display_abovethreshold {
             }
         }
         $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>');
+    } elsif ($itemserror) {
+        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
         $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
     }
 }
 
 sub display_versionchanges {
-    my ($r,$changed,$res_title,$interval) = @_;
+    my ($r,$changed,$res_title,$interval,$itemserror) = @_;
     my %lt = &Apache::lonlocal::texthash(
         'reso' => 'Resource',
         'revd' => 'Last revised',
         'newv' => 'New version',
         'veru' => 'Version used',
-        'noup' => 'No', 
     );
     if (keys(%{$changed}) > 0) {
         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
@@ -1585,9 +1602,11 @@ sub display_versionchanges {
                       $$changed{$item}{'current'}.'</td><td>'.
                       $$changed{$item}{'version'}.'</td></tr>');
         }
+    } elsif ($itemserror) {
+        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'noup'}.
-                  ' '.$interval.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><td>'
+                 .&mt('No '.$interval).'</td></tr>');
     }
     return;
 }
@@ -1601,7 +1620,6 @@ sub display_rolechanges {
         'role'  => 'Role',
         'sec'   => 'Section',
         'status'  => 'Status',
-        'norc'  => 'There are no ',
     );
     if ($chgcount) {
         $r->print('<tr class="LC_info_row">'.
@@ -1644,14 +1662,14 @@ sub display_rolechanges {
             }
         }
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'norc'}.
-                  ' '.$interval.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><td>'
+                 .&mt('There are no '.$interval).'</td></tr>');
     }
     return;
 }
  
 sub display_coursediscussion {
-    my ($r,$newdiscussions,$unread,$countunread,$res_title) = @_;
+    my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_;
     my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
                 'loca' => 'Location',
@@ -1681,7 +1699,7 @@ sub display_coursediscussion {
             my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
             my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb};
             if ($feedurl =~ /bulletinboard/) {
-                $type = 'Bulletin Board';
+                $type = 'Discussion Board';
             }
             if ($$unread{$ressymb}{'enclink'}) {
                 $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'};
@@ -1699,6 +1717,8 @@ sub display_coursediscussion {
             }
             $r->print("</tr>\n");
         }
+    } elsif ($itemserror) {
+        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
         $r->print('<tr class="LC_empty_row"><td>'.$lt{'noun'}.'</td></tr>');
     }
@@ -1877,9 +1897,10 @@ sub store_courseinit_setting {
                                            \%courseinit_settings,$udom,$uname);
             if ($outcome eq 'ok') {
                 if ($page_control eq 'global preferences') {
-                    $result = &mt("Page displayed after role selection in $lctype now set by <b>user's global preferences</b>.");
+                    $result = &mt("Page displayed after role selection in $lctype now set by [_1]user's global preferences[_2].",'<b>','</b>');
                 } else {
-                    $result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}});
+                    $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_1].'
+                                 ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>');
                 }
             } else {
                 &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
@@ -1891,8 +1912,10 @@ sub store_courseinit_setting {
                          '<b>'.$page_control.'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
                 } else {
-                    $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);
+                    $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].'
+                                 ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'
+                                 ,'<tt>'.$outcome.'</tt>')
+                             .'<br />';
                 }
             }
         }