--- loncom/interface/lonwhatsnew.pm	2005/12/02 23:17:47	1.33
+++ loncom/interface/lonwhatsnew.pm	2006/06/03 21:28:07	1.59
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.33 2005/12/02 23:17:47 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.59 2006/06/03 21:28:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,8 @@ use Apache::lonuserstate;
 use Apache::Constants qw(:common :http);
 use Time::Local;
 use GDBM_File;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 #----------------------------
 # handler
@@ -52,41 +54,83 @@ 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;
-    if ($env{'form.action'} eq 'reset') {
-        $command = 'reset';
-    } elsif ($env{'form.action'} eq 'update') {
-        $command = 'update';
-    } else {
-        $command = $env{'form.command'};
+    my $command = $env{'form.command'};
+    my $refpage = $env{'form.refpage'};
+
+    my %checkallowed = ( coursenormalmail => 1,
+			 coursecritmail => 1, );
+    foreach my $perm_check (['whn','whatsnew',1],
+			    ['pch','coursediscussion',1],
+			    ['mgr','handgrading',1],
+			    ['vgr','abovethreshold',1],
+			    ['opa','haserrors',1],
+			    ['mdc','versionchanges',0],
+			    ) {
+	my ($perm,$key,$check_section) = @{ $perm_check };
+	my $scope = $env{'request.course.id'};
+	if (!($checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope))) {
+	    $scope .= '/'.$env{'request.course.sec'};
+	    if ( $check_section ) {
+		$checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope);
+	    }
+	    if ($checkallowed{$key}) {
+		$checkallowed{$key.'_section'} = $env{'request.course.sec'};
+	    }
+	}
+    }
+
+    if ( ! $env{'request.course.fn'} || ! $checkallowed{'whatsnew'}) {
+        # Not in a course, or no whn priv in course
+        $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page";
+        return HTTP_NOT_ACCEPTABLE;
     }
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    $r->print(&display_header($command));
-    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";
-        return HTTP_NOT_ACCEPTABLE;
-    }
+
+    $r->print(&display_header($command,\%checkallowed));
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+    &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/whatsnew',
+              text=>"Display Action Items"});
+    if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=threshold',
+            ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,'Course Action Items','Course_Action_Items_Thresholds'));
-    } else {
+            ("What's New?",#'Course_Action_Items_Thresholds'
+	     ));
+    } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew',
-              text=>"Display Action Items"});
+            ({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,
+              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,
+              text=>"Course initialization preference"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,'Course Action Items','Course_Action_Items_Display'));
+            ("What's New?",#'Course_Action_Items_Initialization'
+	     ));
+    } else {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+            ("What's New?",#'Course_Action_Items_Display'
+	     ));
     }
-    &display_main_box($r,$command);
+    &display_main_box($r,$command,$refpage,\%checkallowed);
     return OK;
 }
 
@@ -97,30 +141,57 @@ sub handler {
 #------------------------------
                                                                                 
 sub display_main_box {
-    my ($r,$command) = @_;
+    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);
+    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 = (
+    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 = &Apache::lonlocal::texthash (
+                            -1 => "since start of $lctype",
+                       2592000 => 'since last month',
+                        604800 => 'since last week',
+                         86400 => 'since yesterday',
+    );
+
+    my %initpage = &Apache::lonlocal::texthash (
+                     firstres => "first resource in the $lctype",
+                     whatsnew => "what's new? page",
+                     userpref => 'your general user preferences',
+                     coursespecific => "specific setting for this $lctype",
+                   );
     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_config_box($r,$command,$tabbg,\%threshold_titles,$cdom,$crs);
+    if (($command eq 'chgthreshold') 
+	&& $checkallowed->{'abovethreshold'}) {
+        &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,
+                                                                   $cdom,$crs);
+    } elsif (($command eq 'chginterval') 
+	     && $checkallowed->{'versionchanges'}) {
+        &display_interval_config($r,$refpage,\%interval_titles);
+    } elsif (($command eq 'chgdisc') 
+	     && $checkallowed->{'coursediscussion'}) {
+        &display_discussion_config($r,$refpage);
+    } elsif ($command eq 'courseinit') {
+        &courseinit_config($r,$refpage,\%initpage);
     } else {
-        &display_actions_box($r,$command,\%threshold_titles,$cdom,$crs);
+        &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles,
+                        \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
     }
+    my $end_page = &Apache::loncommon::end_page();
     $r->print(<<END_OF_BLOCK);
   </td>
  </tr>
 </table><br />
-</body>
-</html>
+$end_page
 END_OF_BLOCK
 }
 
@@ -131,16 +202,35 @@ END_OF_BLOCK
 # up the HTML
 #-------------------------------
 
-sub display_header{
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag('Course Action Items');
-    return(<<ENDHEAD);
-$html
-<head>
-<title>Course Action Items</title>
-</head>
-$bodytag
-ENDHEAD
+sub display_header {
+    my ($command,$checkallowed) = @_;
+    
+    my $scripttag;
+    unless ($command eq 'chgthreshold' || $command eq 'chginterval') {
+       $scripttag = <<"END";
+<script type="text/javascript">
+function change_display(caller,change) {
+    caller.value = change;
+    document.visible.submit(); 
+}
+
+function changeAll(change) {
+END
+        foreach my $item (keys(%{$checkallowed})) {
+	    if ($item =~ /_section$/) { next; }
+            if ($$checkallowed{$item}) {
+                $scripttag.='document.visible.display_'.$item.'.value=change'.
+                            "\n";
+            }
+        }
+        $scripttag.='document.visible.submit();
+}
+</script>
+';
+    }
+    my $course_type=&Apache::loncommon::course_type();
+    return &Apache::loncommon::start_page($course_type.' Action Items',
+					  $scripttag);
 }
 
 #-------------------------------
@@ -150,12 +240,28 @@ ENDHEAD
 #
 #-------------------------------
                                                                                 
-sub display_actions_box() {
-    my ($r,$command,$threshold_titles,$cdom,$crs) = @_;
-
+sub display_actions_box {
+    my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles,
+                                      $initpage,$cdom,$crs,$checkallowed) = @_;
     my $rowColor1 = "#ffffff";
     my $rowColor2 = "#eeeeee";
 
+    my $udom = $env{'user.domain'};
+    my $uname = $env{'user.name'};
+    my $cid = $env{'request.course.id'};
+    my $crstype = &Apache::loncommon::course_type();
+    my $lctype = lc($crstype);
+    my %stulabel = (
+                    'Course' => 'students',
+                    'Group' => 'members',
+                   );
+    my %lt = &Apache::lonlocal::texthash(
+                 'yacc' => 'You are accessing an invalid course or group',
+                 'gtfr' => 'Go to first resource',
+                 'hial' => 'Hide all',
+                 'shal' => 'Show all',
+    );
+
     my %unread = ();
     my %ungraded = ();
     my %bombed = ();
@@ -175,13 +281,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 = (
@@ -189,57 +291,100 @@ 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 => $lctype.' 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 ($env{'request.course.id'}) {
-        $r->print('<br /><b><center>You are accessing an invalid course.</center></b><br /><br />');
+    unless ($cid) {
+        $r->print('<br /><b><center>'.$lt{'yacc'}.'</center></b><br /><br />');
         return;
     }
 
-    my %checkallowed = (
-             coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}),
-             handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}),
-             abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}),
-             haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),
-             versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),
-             coursenormalmail => 1,
-             coursecritmail => 1,
-    );
+    if ($refpage eq 'start') {
+        if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
+            &GDBM_READER(),0640)) {
+            my $furl=$bighash{'first_url'};
+            untie(%bighash);
+            $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}.
+                  '</a></font><br />');
+        }
+    }
+    $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).
+              '. <nobr>'.&mt('Currently: <i>[_1]</i>',$currinit).'.&nbsp;&nbsp;'.
+              &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 />');
 
-    my %display_settings = &get_display_settings();
-    my $starttime = 86400;
-    my %intervals = (
-                  all => 'since resource creation',
-                   -1 => 'since start of course',
-              2592000 => 'since last month',
-               604800 => 'since last week',
-                86400 => 'since yesterday',
-    );
-    my $interval = $intervals{$starttime};
+    if ($command eq 'reset') {
+        $result = &process_reset($cdom,$crs);
+    } elsif ($command eq 'update') {
+        $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);
+
+    unless ($store_result eq 'ok') { 
+        &Apache::lonnet::logthis('Error storing whatsnew settings: '.
+            $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
+        $result .= &mt('Unable to store visibility settings due to [_1]',
+                       $store_result); 
+    }
+
+    if ($result) {
+        $r->print($result.'<hr width="100%" />');
+    }
+    $r->rflush();
+
+
+    my %display_settings = &get_display_settings($uname,$udom,$cid);
+    my $timediff = $display_settings{$cid.':interval'};
+    unless (defined($timediff)) { $timediff = 604800; } 
+    my $now = time;
+    my $interval = $$interval_titles{$timediff};
+    if ($timediff == -1) {
+        $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',
+                coursediscussion =>  'Unread '.$lctype.' discussion posts',
                 handgrading =>  'Problems requiring handgrading',
                 haserrors => 'Problems with errors',
-                versionchanges => 'Resources in course with version changes '.$interval,
-                coursenormalmail => 'New course message',
-                coursecritmail => 'New critical messages in course',
+                versionchanges => 'Resources in '.$lctype.' with version changes '.$interval,
+                coursenormalmail => 'New '.$lctype.' messages',
+                coursecritmail => 'New critical messages in '.$lctype,
     );
 
-    if ($checkallowed{'abovethreshold'}) {
-        &get_curr_thresholds(\%threshold,$cdom,$crs);
+    if ($$checkallowed{'abovethreshold'}) {
+        &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'};
+    $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]',
+	    $threshold{'av_attempts'},$threshold{'degdiff'},
+	    $threshold{'numstudents'});
 
     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
 
-    foreach my $key (keys(%checkallowed)) {
+    foreach my $key (keys(%{$checkallowed})) {
+	if ($key =~ /_section$/) { next; }
         $show{$key} = 0;
-        if ($checkallowed{$key}) {
-            unless ($display_settings{$key} eq 'off') {
+        if ($$checkallowed{$key}) {
+            unless ($display_settings{$cid.':'.$key} eq 'hide') {
                 $show{$key} = 1;
             }
         }
@@ -254,49 +399,44 @@ sub display_actions_box() {
         }
     }
 
-
-    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.'">Go to first resource</a></font><a href="/adm/preferences?action=changecourseinit"></font><br />Change your preferences</a> to suppress display of this screen when accessing courses as Course Coordinator in the future.<br /><hr />');
-	untie(%bighash);
-    }
-
-    my $result;
-
-    if ($command eq 'reset') {
-        $result = &process_reset($cdom,$crs);
-    } elsif ($command eq 'update') {
-        $result = &process_update($cdom,$crs,$threshold_titles);
-    }
-    if ($result) {
-        $r->print($result.'<hr width="100%" />');
-    }
-    $r->rflush();
-
     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);
+        $msgcount = &getnormalmail(\@newmsgs);
     }
     if ($show{'coursecritmail'}) {
-        &getcritmail(\@critmsgs);
+        $critmsgcount = &getcritmail(\@critmsgs);
     }
 
-    $r->print(qq|<a href="javascript:changeAll('hide');">Hide All</a>&nbsp;&nbsp;<a href="javascript:changeAll('show');">Show All</a>|);
+    $r->print(qq|<a href="javascript:changeAll('hide');">$lt{'hial'}</a>
+     &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>
+     <form method="post" name="visible" action="/adm/whatsnew">\n|);
+    foreach my $item (keys(%{$checkallowed})) {
+	if ($item =~ /_section$/) { next; }
+        if ($$checkallowed{$item}) {
+            $r->print('<input type="hidden" name="display_'.$item.'" />'."\n");
+        }
+    }
 
-    $r->print('<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 ($key =~ /_section$/) { next; }
+	if ($key eq 'whatsnew' ) { next; } # whatsnew check creates no box
+        if ($$checkallowed{$key}) {
+            $totalboxes ++;
+        }
+    }
     my $halfway = int($totalboxes/2) + $totalboxes%2;
     foreach my $actionitem (@actionorder) {
-        if ($checkallowed{$actionitem}) {
+        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 ++; 
         }
     }
@@ -311,28 +451,37 @@ sub display_actions_box() {
 }
 
 #-------------------------------
-# display_config_box
+# display_threshold_config
 #
 # Display the threshold setting screen 
 #
 #-------------------------------
                                                                                 
-sub display_config_box() {
-    my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_;
+sub display_threshold_config {
+    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"><table border="0" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">
+    $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">
+        <table border="0" cellpadding="2" cellspacing="4">
+         <tr>
+          <td align="left" valign="top" width="45%">
            <table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">
             <tr>
              <td>
@@ -347,7 +496,7 @@ sub display_config_box() {
      </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']".
@@ -371,18 +520,174 @@ sub display_config_box() {
     }
     $r->print('</table></td></tr></table></td></tr></table>
            <br /><input type="submit" name="threshold" value="Make changes" />
-                 <input type="hidden" name="action" value="update" />
+                 <input type="hidden" name="command" value="update" />
+                 <input type="hidden" name="refpage" value="'.$refpage.'" />
                </form>');
 }
 
+#-------------------------------
+# display_interval_config
+#
+# Display the interval setting screen
+#
+#-------------------------------
+                                                                                   
+sub display_interval_config {
+    my ($r,$refpage,$interval_titles) = @_;
+    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 '.$lctype.'.'));
+    unless ($current eq '') {
+        $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})))) {
+        $r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}.
+                  '</option>'."\n");
+    }
+    $r->print('</select>&nbsp;&nbsp;
+               <input type="submit" name="display" value="'.
+               &mt('Change interval').'" /></form>');
+    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 %opposite = ( 
+                      'on' => 'off',
+                      'off' => 'on',
+                    );
+    $r->print('<script type="text/javascript">
+function toggle_countunread(choice) {
+    if (choice == "unchanged") {
+        document.discussionswitch.command.value = "";
+    }
+    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 [_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">
+<input type="hidden" name="command" value="newdiscconf" />
+<input type="hidden" name="refpage" value="'.$refpage.'" />
+<input type="hidden" name="countunread" value="'.$opposite{$current}.'" />
+');
+    $r->print('<br/>
+               <input type="button" name="display" value="'.
+               &mt('Change to [_1]',$opposite{$current}).'" 
+               onclick="javascript:toggle_countunread('."'change'".')" />
+               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;
+               <input type="button" name="nochange" value="'.
+               &mt("No change").'" 
+               onclick="javascript:toggle_countunread('."'unchanged'".')" />
+               </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 $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',
+                             'anis' => 'and is set to display',
+                             'padc' => 'Page display controlled by',
+                             'chce' => 'Choose '.$lctype.' entry',
+                             'moce' => 'Modify '.$lctype.' 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) {
+        my $chkstring;
+        if ($choice eq $control) {
+            $chkstring = ' checked="checked" ';
+        }  
+        $r->print('<nobr><label><input type="radio" name="courseinit_control" value="'.
+                   $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
+                   '&nbsp;&nbsp;</label></nobr>');
+    }
+    $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
+              ' - <br />'.$lt{'chce'}.": \n");
+    foreach my $choice (@chgentry) {
+        my $chkstring;
+        if (($choice eq $current) && ($control eq 'coursespecific')) {
+            $chkstring = ' checked="checked" ';
+        }
+        $r->print('<nobr><label><input type="radio" name="courseinit_page" value="'.
+                  $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
+                  '&nbsp;&nbsp;</label></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,
@@ -395,11 +700,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);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
-                                                                   $res_title);
+                                $countunread,$res_title,$rowColor1,$rowColor2);
             } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES
                 &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1,
                                                                    $rowColor2);
@@ -416,29 +721,19 @@ 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 %lastreadtime;
+    my @allres=$navmap->retrieveResources(undef,
+                     sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
     my %resourcetracker;
+    my $discussiontime;
 
 # Resource version changes
     if ($$show{'versionchanges'}) {
         &checkversions($cdom,$crs,$navmap,$changed,$starttime);
     }
 
-    if ($$show{'coursediscussions'}) {   
-        my %lastread = &Apache::lonnet::dump('nohist_'.
-                        $env{'request.course.id'}.'_discuss',
-                        $env{'user.domain'},$env{'user.name'},'lastread');
-        foreach my $key (keys(%lastread)) {
-            my $newkey = $key;
-            $newkey =~ s/_lastread$//;
-            $lastreadtime{$newkey} = $lastread{$key};
-        }
-    }
- 
     if ($$show{'abovethreshold'}) {
         %resourcetracker =  &Apache::lonnet::dump('nohist_resourcetracker',
                                                                    $cdom,$crs);
@@ -457,10 +752,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);
+            &check_discussions($resource,$symb,$ressymb,$title,
+			       $newdiscussions,$unread,$countunread);
         }
 
 # Check for ungraded problems
@@ -478,40 +773,29 @@ sub getitems {
 
 # Maxtries and degree of difficulty for problem parts, unless handgradeable
         if ($$show{'abovethreshold'}) {  
-            &check_thresholds($resource,$symb,\%resourcetracker,$triggered,
-                       $threshold,$warnings,$warningnum,$rowColor1,$rowColor2);
+            $warningnum = &check_thresholds($resource,$symb,\%resourcetracker,
+                                            $triggered,$threshold,$warnings,
+                                            $warningnum,$rowColor1,$rowColor2);
         }
 
     }
 }
 
 sub check_discussions {
-    my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,$unread,
-                                                           $lastreadtime) = @_;  
-# Check for unread discussion postings
-    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'};
-                        $unreadcount ++;
-                    }
-                }
-            }
-        }
-        if ($unreadcount) { push(@{$newdiscussions}, $ressymb); }
+    my ($resource,$symb,$ressymb,$title,$newdiscussions,$unread,
+	$countunread) = @_;
+
+    if (!$resource->hasDiscussion()) { return; }
+
+    %{$$unread{$ressymb}} = ();
+    $$unread{$ressymb}{'title'} = $title;
+    $$unread{$ressymb}{'symb'} = $symb;
+    push(@{$newdiscussions}, $ressymb);
+    
+    $$unread{$ressymb}{'lastpost'} = $resource->last_post_time();
+    
+    if ($countunread eq 'on') {
+	$$unread{$ressymb}{'unreadcount'} = $resource->unread_discussion();
     }
 }
 
@@ -527,7 +811,7 @@ sub check_handgraded {
             }
         }
         if ($handgradeable) {
-            my @ungraded = &Apache::bridgetask::get_users_in_queue(
+            my @ungraded = &Apache::bridgetask::get_queue_symb_status(
                                              'gradingqueue',$symb,$cdom,$cnum);
             if (@ungraded > 0) {
                 $$ungraded{$symb}{count} = scalar(@ungraded);
@@ -546,7 +830,7 @@ sub check_bombed {
         my @bombs = split(/,/, $errors);
         my $errorcount = scalar(@bombs);
         my $errorlink = '<a href="/adm/email?display='.
-                        &Apache::lonnet::escape($bombs[0]).'">'.
+                        &escape($bombs[0]).'">'.
                         $title.'</a>';
         $$bombed{$symb}{errorcount} = $errorcount;
         $$bombed{$symb}{errorlink} = $errorlink;
@@ -567,6 +851,9 @@ sub check_thresholds {
         if ($resource->handgrade($part) eq 'yes') {
             next;
         }
+        if ($resource->is_survey($part)) {
+            next;
+        }
         %{$stats{$part}} = ();
         my ($attempts,$users,$corrects,$degdiff,$av_attempts);
         if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) {
@@ -598,16 +885,17 @@ sub check_thresholds {
         }
     }
     if ($warning) {
-        if ($$warningnum %2 == 1) {
+        if ($warningnum%2 == 1) {
             $rowColor = $rowColor1;
         } else {
             $rowColor = $rowColor2;
         }
+        $$triggered{$symb}{rowColor} = $rowColor;
         $$triggered{$symb}{title} = $resource->title;
         foreach my $part (@parts) {
             if (exists($stats{$part}{users})) {
-                my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part);
-                my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part);
+                my $resetname = 'reset_'.&escape($symb."\0".$part);
+                my $resettitle = 'title_'.&escape($symb."\0".$part);
                 if ($$triggered{$symb}{numparts}) {
                     $$triggered{$symb}{text} .= '<tr bgcolor="'.$rowColor.'">'."\n";
                 }
@@ -623,37 +911,70 @@ sub check_thresholds {
                      <td align="right"><small>'.$stats{$part}{attempts}.'</small></td>
                      <td align="right"><small>'.$stats{$part}{degdiff}.'</small></td>
                      <td align="right"><small>'.$lastreset{$part}.'</small></td>
-                     <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&Apache::lonnet::escape($$triggered{$symb}{title}).'" /></td>
+                     <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>
                     </tr>';
                 $$triggered{$symb}{numparts} ++;
             }
         }
         push(@{$warnings},$symb);
-        $$warningnum ++;
+        $warningnum ++;
     }
+    return $warningnum;
 }
 
 
 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;
+    }
+    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};
+                }
+            }
+        }
     }
-    if (exists($coursesettings{'internal.threshold_numstudents'})) {
-        $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'};
+    return;
+}
+
+sub get_current {
+    my ($uname,$udom,$cid,$caller) = @_;
+    my $currvalue;
+    my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid.
+                                                                ':'.$caller);
+    my ($tmp) = %settings;
+    unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+        $currvalue = $settings{$cid.':'.$caller};
     }
+    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',
@@ -662,8 +983,8 @@ sub process_reset {
     my %titles = ();
     foreach my $key (keys(%env)) {
         next if ($key !~ /^form\.reset_(.+)$/);
-        my $title = &Apache::lonnet::unescape($env{'form.title_'.$1});
-        my $reset_item = &Apache::lonnet::unescape($1);
+        my $title = &unescape($env{'form.title_'.$1});
+        my $reset_item = &unescape($1);
         my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
         my %aggregates = ();
         my ($symb,$part) = split(/\0/,$reset_item);
@@ -689,17 +1010,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>',
@@ -721,7 +1042,7 @@ sub getnormalmail {
 
     my @messages = sort(&Apache::lonnet::getkeys('nohist_email'));
     foreach my $message (@messages) {
-	my $msgid=&Apache::lonnet::escape($message);
+	my $msgid=&escape($message);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
             &Apache::lonmsg::unpackmsgid($msgid);
         if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
@@ -733,7 +1054,6 @@ sub getnormalmail {
                     if ($shortsubj eq '') {
                         $shortsubj = &mt('No subject');
                     }
-                    $shortsubj = &Apache::lonnet::unescape($shortsubj);
                     push(@{$newmsgs}, {
                         msgid    => $msgid,
                         sendtime => $sendtime,
@@ -765,7 +1085,6 @@ sub getcritmail {
                 if ($shortsubj eq '') {
                     $shortsubj = &mt('No subject');
                 }
-                $shortsubj = &Apache::lonnet::unescape($shortsubj);
                 push(@{$critmsgs}, {
                         msgid    => $msgid,
                         sendtime => $sendtime,
@@ -784,10 +1103,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) {
@@ -797,7 +1113,6 @@ sub checkversions {
                     my $revdate = 
                           &Apache::lonnet::metadata($root.'.'.$extension,
                                                      'lastrevisiondate');
-                    print STDERR "revdate for $root and $extension is $revdate\n";
                     $revdate =  &Apache::lonlocal::locallocaltime($revdate);
                     my $linkurl=&Apache::lonnet::clutter($key);
                     my $usedversion=$navmap->usedVersion('version_'.$linkurl);
@@ -808,12 +1123,14 @@ sub checkversions {
                         $version = $currentversion;
                     }
                     foreach my $res (@resources) {
-                        my $symb = $res->symb();
-                        %{$$changed{$symb}} = (
+                         if (ref($res) eq 'Apache::lonnavmaps::resource') { 
+                            my $symb = $res->symb();
+                            %{$$changed{$symb}} = (
                                                 current => $currentversion,
                                                 version => $version,
                                                 revdate => $revdate,
-                        );
+                            );
+                        }
                     }
                 }
             }
@@ -841,7 +1158,7 @@ sub display_handgrade {
             }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
             my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&Apache::lonnet::escape($res);
+            $linkurl .= '?symb='.&escape($res);
                                                                                
             $r->print('<tr bgcolor="'.$rowColor.'"><td><a href="'.$linkurl.'"><small>'.$$ungraded{$res}{title}.'</small></a></td><td align="right"><small>'.$$ungraded{$res}{count}.'</small></td></tr>');
             $rowNum ++;
@@ -879,7 +1196,7 @@ sub display_haserrors {
 }
 
 sub display_abovethreshold {
-    my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -891,30 +1208,24 @@ sub display_abovethreshold {
                  rese => 'Reset counters to 0',
                  nopr => 'No problems satisfy threshold criteria',
     );
-    my $rowColor; 
-    my $warningnum = 0;
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
-        $r->print('<form name="reset_tracking" method="post">'.
-                '  <input type="hidden" name="action" value="reset" />'."\n");
+        $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'.
+                ' <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) {
-                $rowColor = $rowColor1;
-            } else {
-                $rowColor = $rowColor2;
-            }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
             my $linkurl=&Apache::lonnet::clutter($url);
             my $rowspan;
             if ($$triggered{$res}{numparts} > 1) {
                 $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"';
             }
-            $linkurl .= '?symb='.&Apache::lonnet::escape($res);
-            $r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text});
-            $warningnum ++;
+            $linkurl .= '?symb='.&escape($res);
+            $r->print('<tr bgcolor="'.$$triggered{$res}{rowColor}.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text});
         }
-        $r->print('<tr bgcolor="#cccccc"><td colspan="7" align="right"><br /><b><small><input type="submit" name="counters" value="'.$lt{'rese'}.'/></form>');
+        $r->print('<tr bgcolor="#cccccc"><td colspan="7" align="right"><br /><b><small><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></form>');
     } else {
         $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'nopr'}.'</small></i></b></center><br /></td></tr>');
     }
@@ -944,7 +1255,7 @@ sub display_versionchanges {
             }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($item);
             my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&Apache::lonnet::escape($item);
+            $linkurl .= '?symb='.&escape($item);
 
             $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$linkurl.'">'.$$res_title{$item}.'</a></small></td><td><small>'.$$changed{$item}{'revdate'}.'</small></td><td><small>'.$$changed{$item}{'current'}.'</small></td><td><small>'.$$changed{$item}{'version'}.'</small></td></tr>');
             $changenum ++;
@@ -956,19 +1267,30 @@ sub display_versionchanges {
 }
  
 sub display_coursediscussion {
-    my ($r,$newdiscussions,$unread,$res_title,$rowColor1,$rowColor2) = @_;
+    my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1,
+                                                              $rowColor2) = @_;
+    my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
                 'loca' => 'Location',
                 'type' => 'Type',
                 'numn' => 'Number of new posts',
-                'noun' => 'No unread posts in course discussions',
+                'noun' => 'No unread posts in '.$lctype.' 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;
@@ -979,17 +1301,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>'.
@@ -1000,6 +1328,7 @@ sub display_coursediscussion {
 sub display_coursenormalmail {
     my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_;
     my $rowColor;
+    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;
@@ -1015,13 +1344,14 @@ sub display_coursenormalmail {
             $mailcount ++;
         }
     } else {
-        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new course messages').'</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(&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;
@@ -1037,7 +1367,7 @@ sub display_coursecritmail {
             $mailcount ++;
         }
     } else {
-        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No unread critical messages in course').'</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>');
     }
 }
 
@@ -1050,35 +1380,150 @@ sub cmp_title {
 }
 
 sub get_display_settings {
-    my $udom = $env{'user.domain'};
-    my $uname = $env{'user.name'};
-    my $cid = $env{'request.course.id'};
+    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 /) {
+	    my $lctype = lc(&Apache::loncommon::course_type());
+            &Apache::lonnet::logthis('Error retrieving whatsnew settings: '.
+            $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid);
         }
     }
     return %settings;
 }
 
+sub store_display_settings {
+    my ($uname,$udom,$cid,$checkallowed) = @_;
+    my %whatsnew_settings;
+    my $result;
+    foreach my $key (keys(%{$checkallowed})) {
+	if ($key =~ /_section$/) { next; }
+        if (exists($env{'form.display_'.$key})) {
+            unless ($env{'form.display_'.$key} eq '') {
+                $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key};
+            }
+        }
+    }
+    if (keys(%whatsnew_settings)) {
+        $result = &Apache::lonnet::put('nohist_whatsnew',\%whatsnew_settings,
+                                                                 $udom,$uname);
+    } else {
+        $result = 'ok';
+    }
+    return $result;
+}
+
+sub store_interval_setting {
+    my ($uname,$udom,$cid,$interval_titles) = @_;
+    my %interval_settings = ();
+    my $result;
+    if (defined($env{'form.interval'})) {
+        $interval_settings{$cid.':interval'} = $env{'form.interval'};
+        my $outcome = &Apache::lonnet::put('nohist_whatsnew',
+                                             \%interval_settings,$udom,$uname);
+        if ($outcome eq 'ok') {
+            $result = &mt('Interval set to version changes [_1]',
+                  '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
+
+        } else {
+	    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].',
+                         '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>',
+                         '<tt>'.$outcome.'</tt>.<br />');
+        }
+    }
+    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 {
+	    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]'.
+                          ' 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 $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 $lctype now set by <b>user's global preferences</b>.");
+                } else {
+                    $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 '.
+                                         'setting: '.$outcome.' for '.$uname.
+                                         ':'.$udom.' in '.$lctype.' '.$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 '.$lctype.' to <b>[_2]</b> due to <tt>[_3]</tt>.<br />',
+                         $$initpage{$env{'form.courseinit_page'}},$outcome);
+                }
+            }
+        }
+    }
+    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}) {
-        $showhide = '<b><a href="javascript:change_display('."'".$caller.
-                                           "','hide'".');">Hide</a></b>';
+        $showhide = '<b><a href="javascript:change_display(document.visible.'.
+                               'display_'.$caller.",'hide'".');">Hide</a></b>';
    
     } else {
-        $showhide = '<b><a href="javascript:change_display('."'".$caller.
-                                            "','show'".');">Show</a></b>';
+        $showhide = '<b><a href="javascript:change_display(document.visible.'.
+                               'display_'.$caller.",'show'".');">Show</a></b>';
     }
     
     $r->print('
@@ -1097,15 +1542,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>