--- loncom/interface/lonwhatsnew.pm	2005/12/06 16:37:28	1.36
+++ loncom/interface/lonwhatsnew.pm	2005/12/22 02:38:44	1.41
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.36 2005/12/06 16:37:28 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.41 2005/12/22 02:38:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,15 +52,20 @@ sub handler {
         $r->send_http_header;
         return OK;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['command']);
+    &Apache::loncommon::get_unprocessed_cgi(
+                                   $ENV{'QUERY_STRING'},['command','refpage']);
 
     my $command = $env{'form.command'};
+    my $refpage = $env{'form.refpage'};
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('bre',$env{'request.course.id'})))) {
-        # Not in a course, or not allowed to view action items
-        $env{'user.error.msg'}="/adm/whatsnew:bre:0:0:Cannot display what's new screen";
+    my $crsid = $env{'request.course.id'};
+    $crsid =~ s/_/\//; 
+    if ((!($env{'request.course.id'})) || 
+                             ($env{'request.role'} !~ /\Q$crsid\E$/)) {
+        # Not in a course, or no role in course
+        $env{'user.error.msg'}="/adm/whatsnew::0:0:Cannot display what's new screen";
         return HTTP_NOT_ACCEPTABLE;
     }
 
@@ -82,21 +87,33 @@ sub handler {
               text=>"Display Action Items"});
     if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chgthreshold',
+            ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,'Course Action Items','Course_Action_Items_Thresholds'));
+            (undef,"What's New?",'Course_Action_Items_Thresholds'));
     } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chginterval',
+            ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
               text=>"Change interval"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,'Course Action Items','Course_Action_Items_Intervals'));
+            (undef,"What's New?",'Course_Action_Items_Intervals'));
+    } elsif (($command eq 'chgdisc') && (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
+              text=>"Change discussion display"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+            (undef,"What's New?",'Course_Action_Items_Intervals'));
+    } elsif ($command eq 'courseinit') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
+              text=>"Course initialization preference"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+            (undef,"What's New?",'Course_Action_Items_Initialization'));
     } else {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,'Course Action Items','Course_Action_Items_Display'));
+            (undef,"What's New?",'Course_Action_Items_Display'));
     }
-    &display_main_box($r,$command,\%checkallowed);
+    &display_main_box($r,$command,$refpage,\%checkallowed);
     return OK;
 }
 
@@ -107,37 +124,49 @@ sub handler {
 #------------------------------
                                                                                 
 sub display_main_box {
-    my ($r,$command,$checkallowed) = @_;
+    my ($r,$command,$refpage,$checkallowed) = @_;
     my $domain=&Apache::loncommon::determinedomain();
-    my $tabbg=&Apache::loncommon::designparm('coordinator.tabbg',$domain);
+    my $function = &Apache::loncommon::get_users_function();
+    my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">');
 
-    my %threshold_titles = (
+    my %threshold_titles = &Apache::lonlocal::texthash (
                          av_attempts => 'Average number of attempts',
                          degdiff => 'Degree of difficulty',
                          numstudents => 'Total number of students with submissions',
     );
 
-    my %interval_titles = (
+    my %interval_titles = &Apache::lonlocal::texthash (
                             -1 => 'since start of course',
                        2592000 => 'since last month',
                         604800 => 'since last week',
                          86400 => 'since yesterday',
     );
 
+    my %initpage = &Apache::lonlocal::texthash (
+                     firstres => 'first resource in the course',
+                     whatsnew => "what's new? page",
+                     userpref => 'your general user preferences',
+                     coursespecific => 'specific setting for this course',
+                   );
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     if (($command eq 'chgthreshold') && 
                (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
-        &display_threshold_config($r,$command,$tabbg,\%threshold_titles,
+        &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,
                                                                    $cdom,$crs);
     } elsif (($command eq 'chginterval') && 
                (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
-        &display_interval_config($r,\%interval_titles);
+        &display_interval_config($r,$refpage,\%interval_titles);
+    } elsif (($command eq 'chgdisc') && 
+               (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) {
+        &display_discussion_config($r,$refpage);
+    } elsif ($command eq 'courseinit') {
+        &courseinit_config($r,$refpage,\%initpage);
     } else {
-        &display_actions_box($r,$command,\%threshold_titles,\%interval_titles,
-                                                     $cdom,$crs,$checkallowed);
+        &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles,
+                        \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
     }
     $r->print(<<END_OF_BLOCK);
   </td>
@@ -155,7 +184,7 @@ END_OF_BLOCK
 # up the HTML
 #-------------------------------
 
-sub display_header{
+sub display_header {
     my ($command,$checkallowed) = @_;
     my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Course Action Items');
@@ -171,7 +200,10 @@ function change_display(caller,change) {
 function changeAll(change) {
 END
         foreach my $item (keys(%{$checkallowed})) {
-            $scripttag.='document.visible.display_'.$item.'.value=change'."\n";
+            if ($$checkallowed{$item}) {
+                $scripttag.='document.visible.display_'.$item.'.value=change'.
+                            "\n";
+            }
         }
         $scripttag.='document.visible.submit();
 }
@@ -195,9 +227,9 @@ ENDHEAD
 #
 #-------------------------------
                                                                                 
-sub display_actions_box() {
-    my ($r,$command,$threshold_titles,$interval_titles,$cdom,$crs,
-                                                           $checkallowed) = @_;
+sub display_actions_box {
+    my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles,
+                                      $initpage,$cdom,$crs,$checkallowed) = @_;
     my $rowColor1 = "#ffffff";
     my $rowColor2 = "#eeeeee";
 
@@ -208,9 +240,7 @@ sub display_actions_box() {
     my %lt = &Apache::lonlocal::texthash(
                  'yacc' => 'You are accessing an invalid course.',
                  'gtfr' => 'Go to first resource',
-                 'chyp' => 'Change your preferences',
-                 'tsup' => 'to suppress display of this screen when accessing'.
-                           ' this course in the future.',
+                 'pgse' => 'Page set to be displayed after you have selected a role in this course?',
                  'hial' => 'Hide all',
                  'shal' => 'Show all',
     );
@@ -234,13 +264,9 @@ sub display_actions_box() {
     my $needitems = 0;
     my $boxcount = 0;
 
-    my $domain=&Apache::loncommon::determinedomain();
-    my $function;
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
-        $function='coordinator';
-    }
-    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-        $function='admin';
+    my $result;
+    if ($command eq 'newcourseinit') {
+        $result = &store_courseinit_setting($uname,$udom,$cid,$initpage);
     }
 
     my %threshold = (
@@ -248,32 +274,46 @@ sub display_actions_box() {
                       degdiff => 0.5,
                       numstudents => 2,
                      );
+    my %pagedesc = &Apache::lonlocal::texthash (
+                     firstres => 'First resource',
+                     whatsnew => "What's New? page",
+                     userpref => 'user preference',
+                     coursespecific => 'course only',
+                     default => 'default',
+                   );
 
-    my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
-    my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+    my ($initcontrol,$initdisp) = &curr_courseinit();
+    my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')';
 
     unless ($cid) {
         $r->print('<br /><b><center>'.$lt{'yacc'}.'</center></b><br /><br />');
         return;
     }
 
-    if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
+    if ($refpage eq 'start') {
+        if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
             &GDBM_READER(),0640)) {
-        my $furl=$bighash{'first_url'};
-        $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}.
-                  '</a></font><a href="/adm/preferences?action=changecourseinit">'.
-                  '</font><br />'.$lt{'chyp'}.'</a> '.$lt{'tsup'}.'<br /><hr />');
-        untie(%bighash);
+            my $furl=$bighash{'first_url'};
+            untie(%bighash);
+            $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}.
+                  '</a></font><br />');
+        }
     }
-                                                                                        
-    my $result;
+    $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]','<i>'.$currinit.'</i>').
+              '<nobr>&nbsp;&nbsp;'.&mt('[_1] for just [_2]','<b>Change</b>',
+              '<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage.
+              '">this course</a>').' '.&mt('or for all [_1].',
+              '<a href="/adm/preferences?action=changecourseinit&refpage='.
+              $refpage.'">your courses</a>').'</nobr><br /><hr />');
                                                                                         
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
     } elsif ($command eq 'update') {
-        $result = &process_update($cdom,$crs,$threshold_titles);
+        $result = &process_update($uname,$udom,$threshold_titles);
     } elsif ($command eq 'newinterval') {
         $result = &store_interval_setting($uname,$udom,$cid,$interval_titles);
+    } elsif ($command eq 'newdiscconf') {
+        $result = &store_discussion_setting($uname,$udom,$cid);
     }
 
     my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed);
@@ -300,18 +340,22 @@ sub display_actions_box() {
         $timediff = time;
     } 
     my $starttime = $now - $timediff;
+    my $countunread = $display_settings{$cid.':countunread'};
+    unless (defined($countunread)) {
+        $countunread = 'on';
+    }
 
     my %headings = &Apache::lonlocal::texthash(
                 coursediscussion =>  'Unread course discussion posts',
                 handgrading =>  'Problems requiring handgrading',
                 haserrors => 'Problems with errors',
                 versionchanges => 'Resources in course with version changes '.$interval,
-                coursenormalmail => 'New course message',
+                coursenormalmail => 'New course messages',
                 coursecritmail => 'New critical messages in course',
     );
 
     if ($$checkallowed{'abovethreshold'}) {
-        &get_curr_thresholds(\%threshold,$cdom,$crs);
+        &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs);
     }
 
     $headings{'abovethreshold'} = &mt('Problems with av. attempts').' &ge; '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' &ge; '.$threshold{'degdiff'}.'<br /> '.&mt('and total number of students with submissions').' &ge; '.$threshold{'numstudents'};
@@ -337,7 +381,7 @@ sub display_actions_box() {
     }
 
     if ($needitems) {
-        &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime);
+        &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
     }
     if ($show{'coursenormalmail'}) {
         &getnormalmail(\@newmsgs);
@@ -355,17 +399,22 @@ sub display_actions_box() {
         }
     }
 
-    $r->print('</form><br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
+    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'"></form><br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
 
     my $displayed = 0;
-    my $totalboxes = keys(%{$checkallowed});
+    my $totalboxes = 0;
+    foreach my $key (keys(%{$checkallowed})) {
+        if ($$checkallowed{$key}) {
+            $totalboxes ++;
+        }
+    }
     my $halfway = int($totalboxes/2) + $totalboxes%2;
     foreach my $actionitem (@actionorder) {
         if ($$checkallowed{$actionitem}) {
             if ($displayed == $halfway) {
-                $r->print('</td><td width="5%">&nbsp;</td><td align="left" valign="top" width-"50%">');
+                $r->print('</td><td width="6%">&nbsp;</td><td align="left" valign="top" width="47%">');
             }
-            &display_launcher($r,$actionitem,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval);
+            &display_launcher($r,$actionitem,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread);
             $displayed ++; 
         }
     }
@@ -387,19 +436,25 @@ sub display_actions_box() {
 #-------------------------------
                                                                                 
 sub display_threshold_config {
-    my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_;
+    my ($r,$refpage,$tabbg,$threshold_titles,$cdom,$crs) = @_;
+    my $uname = $env{'user.name'};
+    my $udom = $env{'user.dom'};
+    my $cid = $env{'request.course.id'};
     my %threshold = ();
     my $rowColor1 = "#ffffff";
     my $rowColor2 = "#eeeeee";
     my $rowColor;
 
     my @thresholditems = ("av_attempts","degdiff","numstudents");
-    my %threshold_titles = (
+    foreach my $item (@thresholditems) {
+        $threshold{$item} = '';
+    }
+    my %threshold_titles = &Apache::lonlocal::texthash(
                          av_attempts => 'Average number of attempts',
                          degdiff => 'Degree of difficulty',
                          numstudents => 'Total number of students with submissions',
                          );
-    &get_curr_thresholds(\%threshold,$cdom,$crs);
+    &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs);
 
     $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">
         <table border="0" cellpadding="2" cellspacing="4">
@@ -419,7 +474,7 @@ sub display_threshold_config {
      </tr>');
     my $rowNum =0;
     foreach my $type (@thresholditems) {
-        my $parameter = 'internal.threshold_'.$type;
+        my $parameter = $env{'request.course.id'}.':threshold_'.$type;
 # onchange is javascript to automatically check the 'Set' button.
         my $onchange = 'onFocus="javascript:window.document.forms'.
               "['thresholdform'].elements['".$parameter."_setparmval']".
@@ -444,6 +499,7 @@ sub display_threshold_config {
     $r->print('</table></td></tr></table></td></tr></table>
            <br /><input type="submit" name="threshold" value="Make changes" />
                  <input type="hidden" name="command" value="update" />
+                 <input type="hidden" name="refpage" value="'.$refpage.'" />
                </form>');
 }
 
@@ -455,16 +511,18 @@ sub display_threshold_config {
 #-------------------------------
                                                                                    
 sub display_interval_config {
-    my ($r,$interval_titles) = @_;
-    my $current = &get_curr_interval($env{'user.name'},
-                                $env{'user.domain'},$env{'request.course.id'});
+    my ($r,$refpage,$interval_titles) = @_;
+    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 course.'));
     unless ($current eq '') {
-        $r->print(' '.&mt('Current value is ').$$interval_titles{$current}.'<br /><br />');
+        $r->print(' '.&mt('Current value is [_1]','<b>'.
+                  $$interval_titles{$current}.'</b>.'));
     }
     $r->print('<br /><br />
 <form method="post" name="intervalswitch" action="/adm/whatsnew">
 <input type="hidden" name="command" value="newinterval" />
+<input type="hidden" name="refpage" value="'.$refpage.'" />
 <select name="interval">
 ');
     foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) {
@@ -477,14 +535,115 @@ sub display_interval_config {
     return;
 }
 
+#----------------------------------------------
+# display_discussion_config
+#
+# Display the discussion display setting screen
+#
+#----------------------------------------------
+                                                                                  
+sub display_discussion_config {
+    my ($r,$refpage) = @_;
+    my $current = &get_current($env{'user.name'},$env{'user.domain'},
+                                $env{'request.course.id'},'countunread');
+    if ($current eq '') {
+        $current = 'on';
+    }
+    my %status = (
+                    on => 'checked="checked"',
+                    off => 'checked="checked"',
+                 );
+    $status{$current} = '';
+    $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 [_1] page by a few seconds.',"<i>What's New?</i>").'&nbsp;&nbsp;'.&mt('Currently set to [_1] .'),"<b>$current</b>.");
+    $r->print('<br /><br />
+<form method="post" name="discussionswitch" action="/adm/whatsnew">'.
+&mt('Display of unread post counts?').'&nbsp;
+<input type="hidden" name="command" value="newdiscconf" />
+<input type="hidden" name="refpage" value="'.$refpage.'" />
+<input type ="radio" '.$status{'on'}.' name="countunread" value="on">on
+&nbsp;&nbsp;&nbsp;
+<input type ="radio" '.$status{'off'}.' name="countunread" value="off">off
+');
+    $r->print('<br/><br />
+               <input type="submit" name="display" value="'.
+               &mt('Make changes').'" /></form>');
+    return;
+}
+
+#---------------------------------------------------
+# courseinit_config
+#
+# Set page displayed when course loads after 
+# selecting a role in the course from the roles page. 
+#
+#---------------------------------------------------
+
+sub courseinit_config {
+    my ($r,$refpage,$initpage) = @_;
+    my ($control,$current) = &curr_courseinit();
+    my @chgstate = ('userpref','coursespecific');
+    my @chgentry = ('firstres','whatsnew');
+    my %lt = &Apache::lonlocal::texthash(
+                             'chwp' => 'Choose which page will be displayed when you enter this course after selecting a role.',
+                             'cuva' => 'Current value is determined by',
+                             'anis' => 'and is set to display',
+                             'padc' => 'Page display controlled by',
+                             'chce' => 'Choose course entry',
+                             'moce' => 'Modify course entry',
+    );
+    $r->print(<<"END"); 
+<br />$lt{'chwp'}
+<br />$lt{'cuva'}: <b>
+$$initpage{$control}</b> $lt{'anis'} <b>
+$$initpage{$current}</b>.<br /><br />
+<form method="post" name="courseinitswitch" action="/adm/whatsnew">
+<input type="hidden" name="command" value="newcourseinit" />
+<input type="hidden" name="refpage" value="$refpage" />
+$lt{'padc'}&nbsp;&nbsp;
+END
+    foreach my $choice (@chgstate) {
+        $r->print('<nobr><input type="radio" name="courseinit_control" value="'.
+                   $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</nobr>');
+    }
+    $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
+              '<br />'.$lt{'chce'}." \n");
+    foreach my $choice (@chgentry) {
+        $r->print('<nobr><input type="radio" name="courseinit_page" value="'.
+                  $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</nobr>');
+    }
+    $r->print('<br /><br /><input type="submit" name="display" value="'.
+               $lt{'moce'}.'" /></form>');
+    return;
+}
+
+sub curr_courseinit {
+    my $current = &get_current($env{'user.name'},$env{'user.domain'},
+                                $env{'request.course.id'},'courseinit');
+    my $control;
+    if ($current) {
+        $control = 'coursespecific';
+    } else {
+        $control = 'userpref';
+        my %userenv = &Apache::lonnet::get('environment',
+                                                      ['course_init_display']);
+        if (exists($userenv{'course_init_display'})) {
+            $current = $userenv{'course_init_display'};
+        }
+        unless ($current) {
+            $current = 'whatsnew';
+        }
+    }
+    return ($control,$current);
+}
+
 sub display_launcher {
-    my ($r,$action,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show,
+    my ($r,$action,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show,
         $headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed,
         $warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs,
-                                       $critmsgcount,$critmsgs,$interval) = @_;
+                          $critmsgcount,$critmsgs,$interval,$countunread) = @_;
 
     if ($$checkallowed{$action}) {
-        &start_box($r,$tabbg,$show,$headings,$action);
+        &start_box($r,$tabbg,$show,$headings,$action,$refpage);
         if ($$show{$action}) {
             if ($action eq 'handgrading') {    # UNGRADED ITEMS
                 &display_handgrade($r,$tograde,$rowColor1,$rowColor2,
@@ -497,11 +656,11 @@ sub display_launcher {
                                                          $rowColor2,$interval);
 
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
-                &display_abovethreshold($r,$warnings,$triggered,$res_title,
-                                                        $rowColor1,$rowColor2);
+                &display_abovethreshold($r,$refpage,$warnings,$triggered,
+                                             $res_title,$rowColor1,$rowColor2);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
-                                             $res_title,$rowColor1,$rowColor2);
+                                $countunread,$res_title,$rowColor1,$rowColor2);
             } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES
                 &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1,
                                                                    $rowColor2);
@@ -518,19 +677,21 @@ sub display_launcher {
 sub getitems {
     my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
         $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs,
-                                             $res_title,$show,$starttime) = @_;
+                                 $res_title,$show,$starttime,$countunread) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     # 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;});
+    my @allres=$navmap->retrieveResources(undef,
+                     sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
     my %lastreadtime;
     my %resourcetracker;
+    my $discussiontime;
 
 # Resource version changes
     if ($$show{'versionchanges'}) {
         &checkversions($cdom,$crs,$navmap,$changed,$starttime);
     }
 
-    if ($$show{'coursediscussions'}) {   
+    if ($$show{'coursediscussion'}) {   
         my %lastread = &Apache::lonnet::dump('nohist_'.
                         $env{'request.course.id'}.'_discuss',
                         $env{'user.domain'},$env{'user.name'},'lastread');
@@ -559,10 +720,10 @@ sub getitems {
         $$res_title{$symb} = $title;
         my $ressymb = $resource->wrap_symb();
 
-# Check for unread discussion postings
+# Check if there are unread discussion postings
         if ($$show{'coursediscussion'}) {
             &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title,
-                                       $newdiscussions,$unread,\%lastreadtime);
+                                                      $newdiscussions,$unread);
         }
 
 # Check for ungraded problems
@@ -585,38 +746,73 @@ sub getitems {
         }
 
     }
+    my $hasdiscussion = @{$newdiscussions};
+    if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post; 
+        $discussiontime = $navmap->{DISCUSSION_TIME};
+        foreach my $ressymb (@{$newdiscussions}) {
+            $$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb};
+        }
+        if ($countunread eq 'on') { #Get count of unread postings for each resource 
+            my $discussiondata = $navmap->get_discussion_data();
+            foreach my $ressymb (@{$newdiscussions}) {
+                &get_discussions($cdom,$crs,$discussiondata,$ressymb,
+                                                       $unread,\%lastreadtime);
+            }
+        }
+    }
 }
 
 sub check_discussions {
-    my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,$unread,
-                                                           $lastreadtime) = @_;  
-# Check for unread discussion postings
+    my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,
+                                                                 $unread) = @_;
     if ($resource->hasDiscussion()) {
-        my $prevread = 0;
-        my $unreadcount = 0;
         %{$$unread{$ressymb}} = ();
         $$unread{$ressymb}{'title'} = $title;
         $$unread{$ressymb}{'symb'} = $symb;
-        if (defined($$lastreadtime{$ressymb})) {
-            $prevread = $$lastreadtime{$ressymb};
-        }
-        my %contrib = &Apache::lonnet::restore($ressymb,
-                                         $env{'request.course.id'},$cdom,$crs);
-        if ($contrib{'version'}) {
-            for (my $id=1;$id<=$contrib{'version'};$id++) {
-                unless (($contrib{'hidden'}=~/\.$id\./) || 
-                        ($contrib{'deleted'}=~/\.$id\./)) {
-                    if ($prevread <$contrib{$id.':timestamp'}) {
-                        $$unread{$ressymb}{$unreadcount} = $id.': '.$contrib{$id.':subject'};
+        push(@{$newdiscussions}, $ressymb);
+    }
+}
+
+sub get_discussions {
+    my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_;
+    my $prevread = 0;
+    my $unreadcount = 0;
+    if (defined($$lastreadtime{$ressymb})) {
+        $prevread = $$lastreadtime{$ressymb};
+    }
+    my $version = $$discussiondata{'version:'.$ressymb};
+    if ($version) {
+        my $hiddenflag = 0;
+        my $deletedflag = 0;
+        my ($hidden,$deleted);
+        for (my $id=$version; $id>0; $id--) {
+            my $vkeys=$$discussiondata{$id.':keys:'.$ressymb};
+            my @keys=split(/:/,$vkeys);
+            if (grep/^hidden$/,@keys) {
+                unless ($hiddenflag) {
+                    $hidden = $$discussiondata{$id.':'.$ressymb.':hidden'};
+                    $hiddenflag = 1;
+                }
+            } elsif (grep/^deleted$/,@keys) {
+                unless ($deletedflag) {
+                    $deleted = $$discussiondata{$id.':'.$ressymb.':deleted'};
+                    $deletedflag = 1;
+                }
+            } else {
+                unless (($hidden =~/\.$id\./) || ($deleted =~/\.$id\./)) {
+                    if ($prevread <$$discussiondata{$id.':'.$ressymb.':timestamp'}) {
                         $unreadcount ++;
+                        $$unread{$ressymb}{$unreadcount} = $id.': '.
+                                 $$discussiondata{$id.':'.$ressymb.':subject'};
                     }
                 }
             }
         }
-        if ($unreadcount) { push(@{$newdiscussions}, $ressymb); }
+        $$unread{$ressymb}{'unreadcount'} = $unreadcount;
     }
 }
 
+
 sub check_handgraded {
     my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;
     if ($resource->is_problem()) {
@@ -737,38 +933,57 @@ sub check_thresholds {
 
 
 sub get_curr_thresholds {
-    my ($threshold,$cdom,$crs) = @_;
-    my %coursesettings = &Apache::lonnet::dump('environment',
-                                     $cdom,$crs,'internal.threshold');
-    if (exists($coursesettings{'internal.threshold_av_attempts'})) {
-        $$threshold{'av_attempts'} = $coursesettings{'internal.threshold_av_attempts'};
+    my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_;
+    my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom,
+                                                     $uname,$cid.':threshold');
+    my $thresholdcount = 0;
+    my ($tmp) = %thresholdsettings;
+    unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+        foreach my $item (keys %{$threshold}) { 
+            if (exists($thresholdsettings{$cid.':threshold_'.$item})) {
+                $$threshold{$item} = 
+                             $thresholdsettings{$cid.':threshold_'.$item};
+                $thresholdcount ++;
+            }
+        }
     }
-    if (exists($coursesettings{'internal.threshold_degdiff'})) {
-        $$threshold{'degdiff'} = $coursesettings{'internal.threshold_degdiff'};
+    if ($thresholdcount == 3) {
+        return;
     }
-    if (exists($coursesettings{'internal.threshold_numstudents'})) {
-        $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'};
+    my %coursesettings = &Apache::lonnet::dump('environment',
+                                              $cdom,$crs,'internal.threshold');
+    my ($temp) = %coursesettings;
+    unless ($temp =~ /^(con_lost|error|no_such_host)/i) {  
+        foreach my $item (keys %{$threshold}) {
+            unless (exists($thresholdsettings{$cid.':threshold_'.$item})) {
+                if (exists($coursesettings{'internal.threshold_'.$item})) {
+                    $$threshold{$item} = 
+                             $coursesettings{'internal.threshold_'.$item};
+                }
+            }
+        }
     }
+    return;
 }
 
-sub get_curr_interval {
-    my ($uname,$udom,$cid);
-    my $interval;
-    my %settings = &Apache::lonnet::dump('nohist_whatsnew',$uname,$udom,$cid,':interval');
+sub get_current {
+    my ($uname,$udom,$cid,$caller) = @_;
+    my $currvalue;
+    my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid.
+                                                                ':'.$caller);
     my ($tmp) = %settings;
-    if ($tmp =~ /^Error/) {
-        &logthis();
-    } else {
-        $interval = $settings{$cid.':interval'};
+    unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+        $currvalue = $settings{$cid.':'.$caller};
     }
-    return $interval;
+    return $currvalue;
 }
 
 sub process_reset {
     my ($dom,$crs) = @_;
-    my $result = '<b>Counters reset for following problems (and parts):</b><br />';
+    my $result = '<b>'.&mt('Counters reset for following problems (and parts):').
+                           '</b><br />';
     my @agg_types = ('attempts','users','correct');
-    my %agg_titles = (
+    my %agg_titles = &Apache::lonlocal::texthash (
                      attempts => 'Number of submissions',
                      users => 'Students with submissions',
                      correct => 'Number of correct submissions',
@@ -804,17 +1019,17 @@ sub process_reset {
 }
 
 sub process_update {
-    my ($dom,$crs,$threshold_titles) = @_;
+    my ($uname,$udom,$threshold_titles) = @_;
     my $setoutput = '<b>Changes to threshold(s) for problem tracking:</b><br />';
     foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
         my $value = $env{'form.'.$name.'_value'};
         if ($name && defined($value)) {
-            my $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
+            my $put_result = &Apache::lonnet::put('nohist_whatsnew',
+                                                  {$name=>$value},$udom,$uname);
            
-            my ($shortname) = ($name =~ /^internal\.threshold_(.+)$/); 
+            my ($shortname) = ($name =~ /^\Q$env{'request.course.id'}\E:threshold_(.+)$/);
             if ($put_result eq 'ok') {
                 $setoutput.=&mt('Set threshold for [_1] to [_2]',
 				'<b>'.$$threshold_titles{$shortname}.'</b>',
@@ -899,10 +1114,7 @@ sub checkversions {
     my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
     my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
     my ($tmp) = keys(%changes);
-    if ($tmp =~/^error\:/) {
-        &Apache::lonnet::logthis('Error retrieving version update information: '.
-        $tmp.' for '.$cdom.'_'.$crs.' in whatsnew');
-    } else {
+    unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
         if (keys(%changes) > 0) {
             foreach my $key (sort(keys(%changes))) {
                 if ($changes{$key} > $starttime) {
@@ -995,7 +1207,7 @@ sub display_haserrors {
 }
 
 sub display_abovethreshold {
-    my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -1012,7 +1224,9 @@ sub display_abovethreshold {
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
         $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'.
-                '  <input type="hidden" name="command" value="reset" />'."\n");
+                ' <input type="hidden" name="command" value="reset" />'."\n".
+                ' <input type="hidden" name="refpage" value="'.$refpage.'" />'.
+                "\n");
         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'part'}.'</small></b></td><td align="right"><b><small>'.$lt{'nust'}.'</small></b></td><td align="right"><b><small>'.$lt{'avat'}.'</small></b></td><td align="right"><b><small>'.$lt{'dedi'}.'</small></b></td><td align="right"><b><small>'.$lt{'lare'}.'</small></b></td><td align="right"><b><small>'.$lt{'reco'}.'</small></b></td></tr>');
         foreach my $res (@{$warnings}) {
             if ($warningnum %2 == 1) {
@@ -1072,19 +1286,29 @@ sub display_versionchanges {
 }
  
 sub display_coursediscussion {
-    my ($r,$newdiscussions,$unread,$res_title,$rowColor1,$rowColor2) = @_;
+    my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1,
+                                                              $rowColor2) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 'loca' => 'Location',
                 'type' => 'Type',
                 'numn' => 'Number of new posts',
                 'noun' => 'No unread posts in course discussions',
+                'tmlp' => 'Time of last post', 
     );
     my $rowColor;
     if (@{$newdiscussions} > 0) {
         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'loca'}.
                   '</small></b></td><td><b><small>'.$lt{'type'}.
-                  '</small></b><td align="right"><b><small>'.$lt{'numn'}.
-                  '</small></b></td></tr>');
+                  '</small></b>');
+        if ($countunread eq 'on') {
+            $r->print('<td><b><small>'.$lt{'tmlp'}.'</small></b></td>'.
+                      '<td align="right"><b><small>'.$lt{'numn'}.
+                      '</small></b></td>');
+        } else {
+            $r->print('<td align="right"><b><small>'.$lt{'tmlp'}.
+                         '</small></b></td>');
+        }
+        $r->print("</tr>\n");
         @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) }
                                                             @{$newdiscussions};
         my $rowNum = 0;
@@ -1095,17 +1319,23 @@ sub display_coursediscussion {
             if ($feedurl =~ /bulletinboard/) {
                 $type = 'Bulletin Board';
             }
-            my $unreadnum = keys(%{$$unread{$ressymb}});
-            $unreadnum = $unreadnum - 2;
-            if ($unreadnum > 0) {
-                if ($rowNum %2 == 1) {
-                    $rowColor = $rowColor1;
-                } else {
-                    $rowColor = $rowColor2;
-                }
-                $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$feedurl.'?symb='.$$unread{$ressymb}{symb}.'">'.$forum_title.'</a>&nbsp;</td><td><small>'.$type.'</small></td><td align="right">'.$unreadnum.'&nbsp;</td></tr>');
-                $rowNum ++;
+            if ($rowNum %2 == 1) {
+                $rowColor = $rowColor1;
+            } else {
+                $rowColor = $rowColor2;
+            }
+            my $lastpost = &Apache::lonnavmaps::timeToHumanString(
+                                               $$unread{$ressymb}{'lastpost'});
+            $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$feedurl.'?symb='.$$unread{$ressymb}{symb}.'">'.$forum_title.'</a>&nbsp;</td><td><small>'.$type.'&nbsp;</small></td>');
+            if ($countunread eq 'on') {
+                my $unreadnum = $$unread{$ressymb}{'unreadcount'};
+                $r->print('<td><small>'.$lastpost.'<small></td><td align="right">'.
+                          '<small>',$unreadnum.'&nbsp;</small></td>');
+            } else {
+                $r->print('<td align="right"><small>'.$lastpost.'</small></td>');
             }
+            $r->print("</tr>\n");
+            $rowNum ++;
         }
     } else {
         $r->print('<tr><td bgcolor="#ffffff"><br><center>&nbsp;<i><b><small>'.
@@ -1169,11 +1399,11 @@ sub get_display_settings {
     my ($uname,$udom,$cid) = @_;
     my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); 
     my ($tmp) = keys(%settings);
-    if ($tmp=~/^error:/) {
+    if ($tmp=~ /^(con_lost|error|no_such_host)/i) {
         %settings = ();
-        unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-            &logthis('Error retrieving whatsnew settings: '.$tmp.' for '.
-                                $uname.':'.$udom.' for course: '.$cid);
+        unless ($tmp =~ /^error: 2 /) {
+            &Apache::lonnet::logthis('Error retrieving whatsnew settings: '.
+            $tmp.' for '.$uname.':'.$udom.' for course: '.$cid);
         }
     }
     return %settings;
@@ -1222,11 +1452,81 @@ sub store_interval_setting {
     return $result;
 }
 
+sub store_discussion_setting {
+    my ($uname,$udom,$cid) = @_;
+    my %discussion_settings;
+    my $result;
+    if (defined($env{'form.countunread'})) {
+        $discussion_settings{$cid.':countunread'} = $env{'form.countunread'};
+        my $outcome = &Apache::lonnet::put('nohist_whatsnew',
+                                             \%discussion_settings,$udom,$uname);
+        if ($outcome eq 'ok') {
+            $result = &mt('Count unread posts in discussions display set to [_1]',
+                  '<b>'.$env{'form.countunread'}.'</b><br />');
+                                                                                  
+        } else {
+            &Apache::lonnet::logthis('Error storing whatsnew countunread setting'.
+                     ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid);
+            $result = &mt('Unable to set "number unread posts display" to [_1]'.
+                          ' due to [_2].',
+                         '<b>'.$env{'form.countunread'}.'</b>',
+                         '<tt>'.$outcome.'</tt>.<br />');
+        }
+    }
+    return $result;
+}
+
+sub store_courseinit_setting {
+    my ($uname,$udom,$cid,$initpage) = @_;
+    my %courseinit_settings;
+    my $page_control;
+    my $result;
+    if (defined($env{'form.courseinit_control'})) {
+        if ($env{'form.courseinit_control'} eq 'userpref') {
+            $courseinit_settings{$cid.':courseinit'} = '';
+            $page_control = 'global preferences';
+        } else {
+            if (defined($env{'form.courseinit_page'})) {
+                $courseinit_settings{$cid.':courseinit'} = 
+                                                  $env{'form.courseinit_page'};
+                $page_control = 'course specific setting';
+            }
+        }
+        if ($page_control) {
+            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 course now set by [_1]',"<b>user's global preferences</b>.");
+                } else {
+                    $result = &mt('Page displayed after role selection in this course set to [_1]','<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>.');
+                }
+            } else {
+                &Apache::lonnet::logthis('Error storing whatsnew courseinit '.
+                                         'setting: '.$outcome.' for '.$uname.
+                                                 ':'.$udom.' in course '.$cid);
+                if ($page_control eq 'global preferences') {
+                    $result = &mt('Unable to set control of page display to [_1]'.
+                          ' due to [_2].',
+                         '<b>'.$page_control.'</b>',
+                         '<tt>'.$outcome.'</tt>.<br />');
+                } else {
+                    $result = &mt('Unable to set page display, after role selection, for this course to [_1] due to [_2].',
+                         '<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>',
+                         '<tt>'.$outcome.'</tt>.<br />');
+                }
+            }
+        }
+    }
+    return $result;
+}
+
 sub start_box {
-    my ($r,$tabbg,$show,$heading,$caller) = @_;
+    my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_;
     my %lt = &Apache::lonlocal::texthash( 
                        chth => 'Change thresholds?',
                        chin => 'Change interval?',
+                       chop => 'Change options?',
     );
     my $showhide;
     if ($$show{$caller}) {
@@ -1254,15 +1554,26 @@ sub start_box {
                </td>
               </tr>');
      if (($caller eq 'abovethreshold') && ($$show{$caller})) {
-         $r->print('
+         if ($$show{$caller}) {
+             $r->print('
               <tr>
-                <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chgthreshold"><b><small>'.$lt{'chth'}.'</small></b></a></td>
+                <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chgthreshold&refpage='.$refpage.'"><b><small>'.$lt{'chth'}.'</small></b></a></td>
               </tr>');
+         }
      } elsif (($caller eq 'versionchanges') && ($$show{$caller})) {
-         $r->print('
+         if ($$show{$caller}) {
+             $r->print('
+              <tr>
+                <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chginterval&refpage='.$refpage.'"><b><small>'.$lt{'chin'}.'</small></b></a></td>
+              </tr>');
+         }
+     } elsif ($caller eq 'coursediscussion') {
+         if ($$show{$caller}) {
+             $r->print('
               <tr>
-                <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chginterval"><b><small>'.$lt{'chin'}.'</small></b></a></td>
+                <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chgdisc&refpage='.$refpage.'"><b><small>'.$lt{'chop'}.'</small></b></a></td>
               </tr>');
+         }
      }
      $r->print('
               <tr>