Return to lonwhatsnew.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonwhatsnew.pm between versions 1.38.2.1 and 1.101

-version 1.38.2.1, 2005/12/19 23:24:40
+version 1.101, 2010/02/28 22:38:11
  Line 36  use Apache::lonlocal;
  use Apache::loncoursedata();
  use Apache::lonnavmaps();
  use Apache::lonuserstate;
+ use Apache::lonuserutils;
  use Apache::Constants qw(:common :http);
  use Time::Local;
  use GDBM_File;
+ use lib '/home/httpd/lib/perl/';
+ use LONCAPA;
+ use HTML::Entities;
  #----------------------------
  # handler
- Line 52  sub handler {
+ Line 56  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');
+     my %checkallowed = ( coursenormalmail => 1,
-     $r->send_http_header;
+ 			 coursecritmail => 1, );
-     if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('bre',$env{'request.course.id'})))) {
+     foreach my $perm_check (['whn','whatsnew',1],
-         # Not in a course, or not allowed to view action items
+ 			    ['pch','coursediscussion',1],
-         $env{'user.error.msg'}="/adm/whatsnew:bre:0:0:Cannot display what's new screen";
+ 			    ['mgr','handgrading',1],
+ 			    ['vgr','abovethreshold',1],
+ 			    ['opa','haserrors',1],
+ 			    ['mdc','versionchanges',0],
+                             ['vcl','newroles',1],
+                             ['vcl','oldroles',1],
+ 			    ) {
+ 	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;
      }
-     my %checkallowed = (
+     &Apache::loncommon::content_type($r,'text/html');
-              coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}),
+     $r->send_http_header;
-              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,
-     );
      $r->print(&display_header($command,\%checkallowed));
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>'/adm/whatsnew',
-               text=>"Display Action Items"});
+               text=>"What's New?"});
-     if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+     if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
          &Apache::lonhtmlcommon::add_breadcrumb
-             ({href=>'/adm/whatsnew?command=chgthreshold',
+             ({href=>'/adm/whatsnew?command=chgthreshold&amp;refpage='.$refpage,
                text=>"Change thresholds"});
          $r->print(&Apache::lonhtmlcommon::breadcrumbs
-             (undef,'Course Action Items','Course_Action_Items_Thresholds'));
+             ("What's New?",#'Course_Action_Items_Thresholds'
-     } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+ 	     ));
+     } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
+         &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>'/adm/whatsnew?command=chginterval&amp;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=chginterval',
+             ({href=>'/adm/whatsnew?command=chgdisc&amp;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&amp;refpage='.$refpage,
+               text=>"Course initialization preference"});
+         $r->print(&Apache::lonhtmlcommon::breadcrumbs
+             ("What's New?",#'Course_Action_Items_Initialization'
+ 	     ));
+     } elsif ($command eq 'chgoldroleinterval' && $checkallowed{'oldroles'}) {
+         &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>'/adm/whatsnew?command=chgoldroleinterval&amp;refpage='.$refpage,
                text=>"Change interval"});
          $r->print(&Apache::lonhtmlcommon::breadcrumbs
-             (undef,'Course Action Items','Course_Action_Items_Intervals'));
+             ("What's New?",#'Course_Action_Items_Intervals'
+              ));
+     } elsif ($command eq 'chgnewroleinterval' && $checkallowed{'newroles'}) {
+         &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>'/adm/whatsnew?command=chgnewroleinterval&amp;refpage='.$refpage,
+               text=>"Change interval"});
+         $r->print(&Apache::lonhtmlcommon::breadcrumbs
+             ("What's New?",#'Course_Action_Items_Intervals'
+              ));
      } else {
          $r->print(&Apache::lonhtmlcommon::breadcrumbs
-             (undef,'Course Action Items','Course_Action_Items_Display'));
+             ("What's New?",#'Course_Action_Items_Display'
+ 	     ));
      }
-     &display_main_box($r,$command,\%checkallowed);
+     &display_main_box($r,$command,$refpage,\%checkallowed);
      return OK;
  }
- Line 107  sub handler {
+ Line 159  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 $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 %versions = (
+                        -1 => "version changes since start of $lctype",
+                   2592000 => 'version changes since last month',
+=> 'version changes since last week',
+=> 'version changes since yesterday',
+                    );
+     my %newroles = (
+                        -1 => "roles which have become active since start of $lctype",
+                   2592000 => 'roles which have become active since last month',
+=> 'roles which have become active since last week',
+=> 'roles which have become active since yesterday',
+                    );
+     my %oldroles = (
+                        -1 => "roles which expired since start of $lctype",
+                   2592000 => 'roles which expired since last month',
+=> 'roles which expired since last week',
+=> 'roles which expired since yesterday',
+                    );
      my %interval_titles = (
-                             -1 => 'since start of course',
+         versions => \%versions,
-                        2592000 => 'since last month',
+         newroles => \%newroles,
-=> 'since last week',
+         oldroles => \%oldroles,
-=> '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') &&
+     if (($command eq 'chgthreshold')
-                (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+ 	&& $checkallowed->{'abovethreshold'}) {
-         &display_threshold_config($r,$command,$tabbg,\%threshold_titles,
+         &display_threshold_config($r,$refpage,\%threshold_titles,
                                                                     $cdom,$crs);
-     } elsif (($command eq 'chginterval') &&
+     } elsif (($command eq 'chginterval')
-                (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
+ 	     && $checkallowed->{'versionchanges'}) {
-         &display_interval_config($r,\%interval_titles);
+         &display_interval_config($r,$refpage,\%interval_titles,'versions');
+     } elsif (($command eq 'chgdisc')
+ 	     && $checkallowed->{'coursediscussion'}) {
+         &display_discussion_config($r,$refpage);
+     } elsif ($command eq 'courseinit') {
+         &courseinit_config($r,$refpage,\%initpage);
+     } elsif (($command eq 'chgnewroleinterval')
+              && $checkallowed->{'newroles'}) {
+         &display_interval_config($r,$refpage,\%interval_titles,'newroles');
+     } elsif (($command eq 'chgoldroleinterval')
+              && $checkallowed->{'oldroles'}) {
+         &display_interval_config($r,$refpage,\%interval_titles,'oldroles');
      } else {
-         &display_actions_box($r,$command,\%threshold_titles,\%interval_titles,
+         &display_actions_box($r,$command,$refpage,\%threshold_titles,
-                                                      $cdom,$crs,$checkallowed);
+                         \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
      }
+     my $end_page = &Apache::loncommon::end_page();
      $r->print(<<END_OF_BLOCK);
    </td>
   </tr>
  </table><br />
- </body>
+ $end_page
- </html>
  END_OF_BLOCK
  }
- Line 155  END_OF_BLOCK
+ Line 240  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');
      my $scripttag;
-     unless ($command eq 'chgthreshold' || $command eq 'chginterval') {
+     unless ($command eq 'chgthreshold' || $command eq 'chginterval' ||
+             $command eq 'chgoldroleinterval' || $command eq 'chgnewroleinterval') {
         $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";
- Line 181  END
+ Line 267  END
  </script>
  ';
      }
-     return(<<ENDHEAD);
+     my $course_type=&Apache::loncommon::course_type();
- $html
+     return &Apache::loncommon::start_page("What's New?",
- <head>
+ 					  $scripttag);
- <title>Course Action Items</title>
- $scripttag
- </head>
- $bodytag
- ENDHEAD
  }
  #-------------------------------
- Line 198  ENDHEAD
+ Line 279  ENDHEAD
  #
  #-------------------------------
- sub display_actions_box() {
+ sub display_actions_box {
-     my ($r,$command,$threshold_titles,$interval_titles,$cdom,$crs,
+     my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
-                                                            $checkallowed) = @_;
+         $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',
+                     'Community' => 'members',
+                    );
      my %lt = &Apache::lonlocal::texthash(
-                  'yacc' => 'You are accessing an invalid course.',
+                  '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.',
                   'hial' => 'Hide all',
                   'shal' => 'Show all',
      );
- Line 231  sub display_actions_box() {
+ Line 311  sub display_actions_box() {
      my @warnings = ();
      my $msgcount = 0;
      my $critmsgcount = 0;
+     my $expirecount;
+     my %expired;
+     my $activecount;
+     my %activated;
      my %res_title = ();
      my %show = ();
      my $needitems = 0;
      my $boxcount = 0;
-     my $domain=&Apache::loncommon::determinedomain();
+     my $result;
-     my $function;
+     if ($command eq 'newcourseinit') {
-     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+         $result = &store_courseinit_setting($uname,$udom,$cid,$initpage);
-         $function='coordinator';
-     }
-     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-         $function='admin';
      }
-     my %threshold = (
+     my %threshold = ();
-                       av_attempts => 2,
+     my %pagedesc = &Apache::lonlocal::texthash (
-                       degdiff => 0.5,
+                      firstres => 'First resource',
-                       numstudents => 2,
+                      whatsnew => "What's New Page",
-                      );
+                      userpref => 'user preference',
+                      coursespecific => $lctype.' only',
+                      default => 'default',
+                    );
-     my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+     my ($initcontrol,$initdisp) = &curr_courseinit();
-     my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+     my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')';
      unless ($cid) {
-         $r->print('<br /><b><center>'.$lt{'yacc'}.'</center></b><br /><br />');
+         $r->print('<p><span style="text-align: center; font-weight: bold;">'.$lt{'yacc'}.'</span></p>');
          return;
      }
-     if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
+     my $header = '';
+     if ($refpage eq 'start') {
+         if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
              &GDBM_READER(),0640)) {
-         my $furl=$bighash{'first_url'};
+             my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&');
-         $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}.
+             untie(%bighash);
-                   '</a></font><a href="/adm/preferences?action=changecourseinit">'.
+             $header .= '<b><a href="'.$furl.'">'.$lt{'gtfr'}.
-                   '</font><br />'.$lt{'chyp'}.'</a> '.$lt{'tsup'}.'<br /><hr />');
+                   '</a></b><br />';
-         untie(%bighash);
+         }
      }
+     $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
-     my $result;
+               .' <span class="LC_nobreak">'
+               .&mt('Currently: [_1].','<i>'.$currinit.'</i>')
+               .'&nbsp;&nbsp;'
+               .&mt('[_1]Change[_2] for just [_3]this '.$lctype.'[_4] or for [_5]all your courses/communities[_6].'
+                   ,'<b>'
+                   ,'</b>'
+                   ,'<a href="/adm/whatsnew?command=courseinit&amp;refpage='.$refpage.'">'
+                   ,'</a>'
+                   ,'<a href="/adm/preferences?action=changecourseinit&amp;refpage='.$refpage.'">'
+                   ,'</a>')
+               .' </span>';
+     $r->print(&Apache::loncommon::head_subbox($header));
      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);
      unless ($store_result eq 'ok') {
-         &Apache::lonnet::logthis('Error storing whatsnew settings: '.
+         &Apache::lonnet::logthis('Error saving whatsnew settings: '.
-             $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid);
+             $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
-         $result .= &mt('Unable to store visibility settings due to [_1]',
+         $result .= '<span class="LC_error">'
-                        $store_result);
+                   .&mt('Unable to save visibility settings due to [_1]',
+                        $store_result)
+                   .'</span>';
      }
      if ($result) {
-         $r->print($result.'<hr width="100%" />');
+         $r->print($result.'<hr />');
      }
      $r->rflush();
+     my (%timediff,%interval);
      my %display_settings = &get_display_settings($uname,$udom,$cid);
-     my $timediff = $display_settings{$cid.':interval'};
+     $timediff{'versions'} = $display_settings{$cid.':interval'};
-     unless (defined($timediff)) { $timediff = 604800; }
+     unless (defined($timediff{'versions'})) { $timediff{'versions'} = 604800; }
-     my $now = time;
+     $interval{'versions'} = $interval_titles->{'versions'}->{$timediff{'versions'}};
-     my $interval = $$interval_titles{$timediff};
-     if ($timediff == -1) {
-         $timediff = time;
-     }
-     my $starttime = $now - $timediff;
-     my $countunread = 1;
      my %headings = &Apache::lonlocal::texthash(
-                 coursediscussion =>  'Unread course discussion posts',
+                 coursediscussion => 'Unread '.$lctype.' discussion posts',
-                 handgrading =>  'Problems requiring handgrading',
+                 handgrading      => 'Problems requiring handgrading',
-                 haserrors => 'Problems with errors',
+                 haserrors        => 'Problems with errors',
-                 versionchanges => 'Resources in course with version changes '.$interval,
+                 coursenormalmail => 'New '.$lctype.' messages',
-                 coursenormalmail => 'New course messages',
+                 coursecritmail   => 'New critical messages in '.$lctype,
-                 coursecritmail => 'New critical messages in course',
      );
+     if ($timediff{'versions'} == -1) {
+         $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since start of '.$lctype);
+     } elsif ($timediff{'versions'} == 2592000) {
+         $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last month');
+     } elsif ($timediff{'versions'} == 604800) {
+         $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last week');
+     } elsif ($timediff{'versions'} == 86400) {
+         $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since yesterday');
+     }
+     $timediff{'oldroles'} = $display_settings{$cid.':oldroleinterval'};
+     unless (defined($timediff{'oldroles'})) { $timediff{'oldroles'} = 604800; }
+     $interval{'oldroles'} = $interval_titles->{'oldroles'}->{$timediff{'oldroles'}};
+     if ($timediff{'oldroles'} == -1) {
+         $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since start of '.$lctype);
+     } elsif ($timediff{'oldroles'} == 2592000) {
+         $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last month');
+     } elsif ($timediff{'oldroles'} == 604800) {
+         $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last week');
+     } elsif ($timediff{'oldroles'} == 86400) {
+         $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since yesterday');
+     }
+     $timediff{'newroles'} = $display_settings{$cid.':newroleinterval'};
+     unless (defined($timediff{'newroles'})) { $timediff{'newroles'} = 604800; }
+     $interval{'newroles'} = $interval_titles->{'newroles'}->{$timediff{'newroles'}};
+     if ($timediff{'newroles'} == -1) {
+         $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since start of '.$lctype);
+     } elsif ($timediff{'newroles'} == 2592000) {
+         $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last month');
+     } elsif ($timediff{'newroles'} == 604800) {
+         $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last week');
+     } elsif ($timediff{'newroles'} == 86400) {
+         $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since yesterday');
+     }
+     my $now = time;
+     if ($timediff{'versions'} == -1) {
+         $timediff{'versions'} = time;
+     }
+     my $starttime = $now - $timediff{'versions'};
+     if ($timediff{'newroles'} == -1) {
+         $timediff{'newroles'} = time;
+     }
+     my $activatedstart = $now - $timediff{'newroles'};
+     if ($timediff{'oldroles'} == -1) {
+         $timediff{'oldroles'} = time;
+     }
+     my $expiredstart = $now - $timediff{'oldroles'};
+     my $countunread = $display_settings{$cid.':countunread'};
+     unless (defined($countunread)) {
+         $countunread = 'on';
+     }
      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'};
+     $headings{'abovethreshold'} =
+ 	&mt('(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions &ge; [_4]',
+ 	    $threshold{'av_attempts'},$threshold{'degdiff'},
+ 	    '<br />',$threshold{'numstudents'});
-     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
+     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
      foreach my $key (keys(%{$checkallowed})) {
+ 	if ($key =~ /_section$/) { next; }
          $show{$key} = 0;
          if ($$checkallowed{$key}) {
              unless ($display_settings{$cid.':'.$key} eq 'hide') {
- Line 332  sub display_actions_box() {
+ Line 487  sub display_actions_box() {
      }
      foreach my $item (@actionorder) {
-         unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail') {
+         unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' ||
+                 $item eq 'newroles' || $item eq 'oldroles') {
              if ($show{$item}) {
                  $needitems = 1;
                  last;
- Line 340  sub display_actions_box() {
+ Line 496  sub display_actions_box() {
          }
      }
+     my $itemserror;
      if ($needitems) {
-         &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
+         $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
      }
      if ($show{'coursenormalmail'}) {
-         &getnormalmail(\@newmsgs);
+         $msgcount = &getnormalmail(\@newmsgs);
      }
      if ($show{'coursecritmail'}) {
-         &getcritmail(\@critmsgs);
+         $critmsgcount = &getcritmail(\@critmsgs);
+     }
+     if ($show{'oldroles'}) {
+         $expirecount = &getexpired(\%expired,$expiredstart,'previous');
+     }
+     if ($show{'newroles'}) {
+         $activecount = &getactivated(\%activated,$activatedstart,'active');
      }
      $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('</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><table class="LC_double_column"><tr><td class="LC_left_col">');
      my $displayed = 0;
-     my $totalboxes = keys(%{$checkallowed});
+     my $totalboxes = 0;
-     my $halfway = int($totalboxes/2) + $totalboxes%2;
+     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 = 4;
+ #    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>&nbsp;</td><td class="LC_right_col" >');
              }
-             &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,$countunread);
+             &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror);
              $displayed ++;
          }
      }
      $r->print('
-            </table>
-           </td>
-          </tr>
-         </table>
        </td>
      </tr>
-    </table>');
+    </table>
+ ');
  }
  #-------------------------------
- Line 391  sub display_actions_box() {
+ Line 559  sub display_actions_box() {
  #-------------------------------
  sub display_threshold_config {
-     my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_;
+     my ($r,$refpage,$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 = (
+     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">
+     $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">'.
-         <table border="0" cellpadding="2" cellspacing="4">
+               &Apache::loncommon::start_data_table().
-          <tr>
+               &Apache::loncommon::start_data_table_header_row().
-           <td align="left" valign="top" width="45%">
+              '<th>'.&mt('Threshold Name').'</th>'."\n".
-            <table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">
+              '<th>'.&mt('Current value').'</th>'."\n".
-             <tr>
+              '<th>'.&mt('Change?').'</th>'."\n".
-              <td>
+               &Apache::loncommon::end_data_table_header_row());
-                <table border="0" cellpadding="1" cellspacing="1" bgcolor="#000000">
-                 <tr>
-                 <td bgcolor="#ffffff">
-                  <table cellspacing="0" cellpadding="4" border="0">
-      <tr bgcolor="'.$tabbg.'">
-       <th>Threshold Name</th>
-       <th>Current value</th>
-       <th>Change?</th>
-      </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']".
                '.checked=true;"';
-         if ($rowNum %2 == 1) {
+         $r->print(&Apache::loncommon::start_data_table_row()."\n".
-             $rowColor = $rowColor1;
+                  '<td>'.$threshold_titles{$type}.'</td>'."\n".
-         } else {
+                  '<td>'.&Apache::lonhtmlcommon::textbox($parameter.'_value',
-             $rowColor = $rowColor2;
-         }
-         $r->print('
-      <tr bgcolor="'.$rowColor.'">
-       <td>'.$threshold_titles{$type}.'</td>
-       <td>'.&Apache::lonhtmlcommon::textbox($parameter.'_value',
                                              $threshold{$type},
-,$onchange).'</td>
+,$onchange).'</td>'."\n".
-       <td>'
+                  '<td>'.
-            .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+                  &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
-       '</td>
+                  '</td>'."\n".
-      </tr>');
+                  &Apache::loncommon::end_data_table_row());
-         $rowNum ++;
      }
-     $r->print('</table></td></tr></table></td></tr></table>
+     $r->print(&Apache::loncommon::end_data_table()."\n".
-            <br /><input type="submit" name="threshold" value="Make changes" />
+           '<br /><input type="submit" name="threshold" value="'.&mt('Save').'" />
                   <input type="hidden" name="command" value="update" />
+                  <input type="hidden" name="refpage" value="'.$refpage.'" />
                 </form>');
  }
- Line 459  sub display_threshold_config {
+ Line 614  sub display_threshold_config {
  #-------------------------------
  sub display_interval_config {
-     my ($r,$interval_titles) = @_;
+     my ($r,$refpage,$interval_titles,$context) = @_;
-     my $current = &get_curr_interval($env{'user.name'},
+     my $setting = 'interval';
-                                 $env{'user.domain'},$env{'request.course.id'});
+     if ($context eq 'oldroles') {
-     $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the course.'));
+         $setting = 'oldroleinterval';
+     } elsif ($context eq 'newroles') {
+         $setting = 'newroleinterval';
+     }
+     my $lctype = lc(&Apache::loncommon::course_type());
+     my $current = &get_current($env{'user.name'},$env{'user.domain'},
+                                 $env{'request.course.id'},$setting);
+     if ($context eq 'oldroles') {
+         $r->print('<br />'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' expired.').'<br />');
+     } elsif ($context eq 'newroles') {
+         $r->print('<br />'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'<br />');
+     } else {
+         $r->print('<br />'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'<br />');
+     }
      unless ($current eq '') {
-         $r->print(' '.&mt('Current value is ').$$interval_titles{$current}.'<br /><br />');
+         if (ref($interval_titles->{$context}) eq 'HASH') {
+             $r->print(' '.&mt('Current value is "[_1]".','<b>'.
+                       $interval_titles->{$context}->{$current}.'</b>').'<br />');
+         }
      }
-     $r->print('<br /><br />
+     $r->print('<br />
  <form method="post" name="intervalswitch" action="/adm/whatsnew">
  <input type="hidden" name="command" value="newinterval" />
+ <input type="hidden" name="intervaltype" value="'.$context.'" />
+ <input type="hidden" name="refpage" value="'.$refpage.'" />'.
+ &mt('Display:').'
  <select name="interval">
+ <option value="" selected="selected">'.&mt('Select').'</option>
  ');
-     foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) {
+     if (ref($interval_titles) eq 'HASH') {
-         $r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}.
+         if (ref($interval_titles->{$context}) eq 'HASH') {
-                   '</option>'."\n");
+             foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) {
+                 $r->print('<option value="'.$key.'">'.&mt($interval_titles->{$context}->{$key}).
+                           '</option>'."\n");
+             }
+         }
      }
      $r->print('</select>&nbsp;&nbsp;
                 <input type="submit" name="display" value="'.
-                &mt('Change interval').'" /></form>');
+                &mt('Save').'" /></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 discussion board which has unread posts.')
+              .'<br />'
+              .&mt("This can increase the time taken to gather data for the [_1]What's New Page[_2] by a few seconds.",'<i>','</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]',&mt($opposite{$current})).'"
+                onclick="javascript:toggle_countunread('."'change'".')" />'.
+                ('&nbsp;' x7).
+                '<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' => 'Save',
+     );
+     $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('<span class="LC_nobreak"><label><input type="radio" name="courseinit_control" value="'.
+                    $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
+                    '&nbsp;&nbsp;</label></span>');
+     }
+     $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('<span class="LC_nobreak"><label><input type="radio" name="courseinit_page" value="'.
+                   $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
+                   '&nbsp;&nbsp;</label></span>');
+     }
+     $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,$show,$headings,$res_title,
-         $headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed,
+         $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
-         $warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs,
+         $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
-                           $critmsgcount,$critmsgs,$interval,$countunread) = @_;
+         $interval,$countunread,$expired,$expirecount,$activated,$activecount,
+         $crstype,$itemserror) = @_;
      if ($$checkallowed{$action}) {
-         &start_box($r,$tabbg,$show,$headings,$action);
+         &start_box($r,$show,$headings,$action,$refpage,$action);
          if ($$show{$action}) {
              if ($action eq 'handgrading') {    # UNGRADED ITEMS
-                 &display_handgrade($r,$tograde,$rowColor1,$rowColor2,
+                 &display_handgrade($r,$tograde,$ungraded,$itemserror);
-                                                                     $ungraded);
              } elsif ($action eq 'haserrors') { # BOMBS
-                 &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed,
+                 &display_haserrors($r,$bombs,$bombed,$res_title,$itemserror);
-                                                                    $res_title);
              } elsif ($action eq 'versionchanges') { # VERSION CHANGES
-                 &display_versionchanges($r,$changed,$res_title,$rowColor1,
+                 &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror);
-                                                          $rowColor2,$interval);
              } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
-                 &display_abovethreshold($r,$warnings,$triggered,$res_title,
+                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
-                                                         $rowColor1,$rowColor2);
+ 					$res_title,$itemserror);
              } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                  &display_coursediscussion($r,$newdiscussions,$unread,
-                                 $countunread,$res_title,$rowColor1,$rowColor2);
+                                 $countunread,$res_title,$itemserror);
              } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES
-                 &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1,
+                 &display_coursenormalmail($r,$msgcount,$newmsgs);
-                                                                    $rowColor2);
              } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES
-                 &display_coursecritmail($r,$critmsgcount,$critmsgs,$rowColor1,
+                 &display_coursecritmail($r,$critmsgcount,$critmsgs);
-                                                                    $rowColor2);
+             } elsif ($action eq 'newroles') { # ACTIVATED ROLES
+                 &display_rolechanges($r,$activecount,$activated,$interval->{'newroles'},
+                                      $crstype);
+             } elsif ($action eq 'oldroles') { # EXPIRED ROLES
+                 &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'},
+                                      $crstype);
              }
          }
          &end_box($r);
- Line 521  sub display_launcher {
+ Line 829  sub display_launcher {
  sub getitems {
      my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
-         $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs,
+         $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show,
-                                  $res_title,$show,$starttime,$countunread) = @_;
+         $starttime,$countunread) = @_;
      my $navmap = Apache::lonnavmaps::navmap->new();
+     if (!defined($navmap)) {
+         my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
+         return $itemserror;
+     }
      # force retrieve Resource to seed the part id cache we'll need it later
      my @allres=$navmap->retrieveResources(undef,
                       sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
-     my %lastreadtime;
      my %resourcetracker;
      my $discussiontime;
- Line 536  sub getitems {
+ Line 847  sub getitems {
          &checkversions($cdom,$crs,$navmap,$changed,$starttime);
      }
-     if ($$show{'coursediscussion'}) {
-         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);
      }
-     my $warningnum = 0;
      foreach my $resource (@allres) {
          my $result = '';
          my $applies = 0;
- Line 561  sub getitems {
+ Line 860  sub getitems {
          %{$$ungraded{$symb}} = ();
          %{$$triggered{$symb}} = ();
          $$triggered{$symb}{numparts} = 0;
+         if ($resource->encrypted()) {
+             $$triggered{$symb}{'enclink'} = $resource->link();
+             $$triggered{$symb}{'encsymb'} = $resource->shown_symb();
+         }
          my $title = $resource->compTitle();
          $$res_title{$symb} = $title;
          my $ressymb = $resource->wrap_symb();
  # Check if there are unread discussion postings
          if ($$show{'coursediscussion'}) {
-             &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title,
+             &check_discussions($resource,$symb,$ressymb,$title,
-                                                       $newdiscussions,$unread);
+ 			       $newdiscussions,$unread,$countunread);
          }
  # Check for ungraded problems
- Line 586  sub getitems {
+ Line 889  sub getitems {
  # Maxtries and degree of difficulty for problem parts, unless handgradeable
          if ($$show{'abovethreshold'}) {
-             &check_thresholds($resource,$symb,\%resourcetracker,$triggered,
+             &check_thresholds($resource,$symb,\%resourcetracker,
-                        $threshold,$warnings,$warningnum,$rowColor1,$rowColor2);
+ 			      $triggered,$threshold,$warnings);
          }
      }
-     my $hasdiscussion = @{$newdiscussions};
+     return;
-     if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post;
-         $discussiontime = $navmap->{DISCUSSION_TIME};
-         foreach my $ressymb (@{$newdiscussions}) {
-             $$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb};
-         }
-         if ($countunread) { #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,
+     my ($resource,$symb,$ressymb,$title,$newdiscussions,$unread,
-                                                                  $unread) = @_;
+ 	$countunread) = @_;
-     if ($resource->hasDiscussion()) {
-         %{$$unread{$ressymb}} = ();
-         $$unread{$ressymb}{'title'} = $title;
-         $$unread{$ressymb}{'symb'} = $symb;
-         push(@{$newdiscussions}, $ressymb);
-     }
- }
- sub get_discussions {
+     if (!$resource->hasDiscussion()) { return; }
-     my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_;
-     my $prevread = 0;
+     %{$$unread{$ressymb}} = ();
-     my $unreadcount = 0;
+     $$unread{$ressymb}{'title'} = $title;
-     if (defined($$lastreadtime{$ressymb})) {
+     $$unread{$ressymb}{'symb'} = $symb;
-         $prevread = $$lastreadtime{$ressymb};
+     if ($resource->encrypted()) {
-     }
+         $$unread{$ressymb}{'enclink'} = $resource->link();
-     my $version = $$discussiondata{'version:'.$ressymb};
+         $$unread{$ressymb}{'encsymb'} = $resource->shown_symb();
-     if ($version) {
+     }
-         my $hiddenflag = 0;
+     push(@{$newdiscussions}, $ressymb);
-         my $deletedflag = 0;
-         my ($hidden,$deleted);
+     $$unread{$ressymb}{'lastpost'} = $resource->last_post_time();
-         for (my $id=$version; $id>0; $id--) {
-             my $vkeys=$$discussiondata{$id.':keys:'.$ressymb};
+     if ($countunread eq 'on') {
-             my @keys=split(/:/,$vkeys);
+ 	$$unread{$ressymb}{'unreadcount'} =
-             if (grep/^hidden$/,@keys) {
+                             $resource->discussion_info('unread');
-                 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'};
-                     }
-                 }
-             }
-         }
-         $$unread{$ressymb}{'unreadcount'} = $unreadcount;
      }
  }
  sub check_handgraded {
      my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;
      if ($resource->is_problem()) {
- Line 675  sub check_handgraded {
+ Line 937  sub check_handgraded {
              if (@ungraded > 0) {
                  $$ungraded{$symb}{count} = scalar(@ungraded);
                  $$ungraded{$symb}{title} = $title;
-                 push(@{$tograde}, $symb);
+                 if ($resource->encrypted()) {
+                     $$ungraded{$symb}{'enclink'} = $resource->link();
+                     $$ungraded{$symb}{'encsymb'} = $resource->shown_symb();
+                 }
+                 push(@{$tograde},$symb);
              }
          }
      }
- Line 689  sub check_bombed {
+ Line 955  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;
- Line 698  sub check_bombed {
+ Line 964  sub check_bombed {
  }
  sub check_thresholds {
-     my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
+     my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
-                                        $warningnum,$rowColor1,$rowColor2) = @_;
  # Compile maxtries and degree of difficulty for problem parts, unless handgradeable
      my @parts = @{$resource->parts()};
      my %stats;
      my %lastreset = ();
      my $warning = 0;
-     my $rowColor;
      foreach my $part (@parts) {
          if ($resource->handgrade($part) eq 'yes') {
              next;
          }
+         if ($resource->is_anonsurvey($part)) {
+             next;
+         }
+         if ($resource->is_survey($part)) {
+             next;
+         }
          %{$stats{$part}} = ();
          my ($attempts,$users,$corrects,$degdiff,$av_attempts);
          if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) {
- Line 741  sub check_thresholds {
+ Line 1011  sub check_thresholds {
          }
      }
      if ($warning) {
-         if ($warningnum %2 == 1) {
-             $rowColor = $rowColor1;
-         } else {
-             $rowColor = $rowColor2;
-         }
          $$triggered{$symb}{title} = $resource->title;
+         my $partcount = 0;
+         @{$$triggered{$symb}{text}} = ();
          foreach my $part (@parts) {
              if (exists($stats{$part}{users})) {
-                 my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part);
+                 my $resetname = 'reset_'.&escape($symb."\0".$part);
-                 my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part);
+                 my $resettitle = 'title_'.&escape($symb."\0".$part);
-                 if ($$triggered{$symb}{numparts}) {
-                     $$triggered{$symb}{text} .= '<tr bgcolor="'.$rowColor.'">'."\n";
-                 }
                  if (@parts > 1) {
-                     $$triggered{$symb}{text} .= '
+                     $$triggered{$symb}{text}[$partcount] = '
-                      <td align="right"><small>part - '.$part.'<small></td>';
+                      <td>'.&mt('part - ').$part.'</td>';
                  } else {
-                     $$triggered{$symb}{text} .= '
+                     $$triggered{$symb}{text}[$partcount] = '
-                      <td align="right"><small>single part</small></td>';
+                      <td>'.&mt('single part').'</td>';
                  }
-                 $$triggered{$symb}{text} .= '
+                 $$triggered{$symb}{text}[$partcount] .= '
-                      <td align="right"><small>'.$stats{$part}{users}.'</small></td>
+                      <td>'.$stats{$part}{users}.'</td>
-                      <td align="right"><small>'.$stats{$part}{attempts}.'</small></td>
+                      <td>'.$stats{$part}{attempts}.'</td>
-                      <td align="right"><small>'.$stats{$part}{degdiff}.'</small></td>
+                      <td>'.$stats{$part}{degdiff}.'</td>
-                      <td align="right"><small>'.$lastreset{$part}.'</small></td>
+                      <td>'.$lastreset{$part}.'</td>
-                      <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&Apache::lonnet::escape($$triggered{$symb}{title}).'" /></td>
+                      <td><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
-                     </tr>';
+                 $partcount ++;
-                 $$triggered{$symb}{numparts} ++;
              }
+             $$triggered{$symb}{numparts} = $partcount;
          }
          push(@{$warnings},$symb);
-         $warningnum ++;
      }
  }
  sub get_curr_thresholds {
-     my ($threshold,$cdom,$crs) = @_;
+     my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_;
-     my %coursesettings = &Apache::lonnet::dump('environment',
+     # set default values
-                                      $cdom,$crs,'internal.threshold');
+     %$threshold = (av_attempts => 2,
-     if (exists($coursesettings{'internal.threshold_av_attempts'})) {
+                   degdiff => 0.5,
-         $$threshold{'av_attempts'} = $coursesettings{'internal.threshold_av_attempts'};
+                   numstudents => 2
+                   );
+     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'})) {
+     if ($thresholdcount == 3) {
-         $$threshold{'degdiff'} = $coursesettings{'internal.threshold_degdiff'};
+         return;
      }
-     if (exists($coursesettings{'internal.threshold_numstudents'})) {
+     my %coursesettings = &Apache::lonnet::dump('environment',
-         $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'};
+                                               $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 {
+ sub get_current {
-     my ($uname,$udom,$cid);
+     my ($uname,$udom,$cid,$caller) = @_;
-     my $interval;
+     my $currvalue;
-     my %settings = &Apache::lonnet::dump('nohist_whatsnew',$uname,$udom,$cid,':interval');
+     my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid.
+                                                                 ':'.$caller);
      my ($tmp) = %settings;
-     if ($tmp =~ /^Error/) {
+     unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-         &logthis();
+         $currvalue = $settings{$cid.':'.$caller};
-     } else {
-         $interval = $settings{$cid.':interval'};
      }
-     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',
- Line 818  sub process_reset {
+ Line 1105  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 $title = &unescape($env{'form.title_'.$1});
-         my $reset_item = &Apache::lonnet::unescape($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);
- Line 845  sub process_reset {
+ Line 1132  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 />';
+     my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br/><br />';
      foreach (keys %env) {
          next if ($_!~/^form\.(.+)\_setparmval$/);
          my $name  = $1;
          my $value = $env{'form.'.$name.'_value'};
-         if ($name && defined($value)) {
+         if ($name && defined($value) && ($value ne '')) {
-             my $put_result = &Apache::lonnet::put('environment',
+             my $put_result = &Apache::lonnet::put('nohist_whatsnew',
-                                                   {$name=>$value},$dom,$crs);
+                                                   {$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]',
+                 $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Set threshold for [_1] to [_2]',
  				'<b>'.$$threshold_titles{$shortname}.'</b>',
- 				'<b>'.$value.'</b>').'<br />';
+ 				'<b>'.$value.'</b>').'<br />');
  	    } else {
-                 $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
+                 $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
  				'<b>'.$name.'</b>','<b>'.$value.'</b>',
- 				'<tt>'.$put_result.'</tt>').'<br />';
+ 				'<tt>'.$put_result.'</tt>').'<br />',1);
              }
          }
      }
-     return $setoutput;
+     return &Apache::loncommon::confirmwrapper($setoutput);
  }
  sub getnormalmail {
- Line 877  sub getnormalmail {
+ Line 1164  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'})) {
              if (defined($sendtime) && $sendtime!~/error/) {
-                 my $numsendtime = $sendtime;
-                 $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
                  if ($status eq 'new') {
-                     $msgcount ++;
+                 $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+ 		    $msgcount ++;
                      if ($shortsubj eq '') {
                          $shortsubj = &mt('No subject');
                      }
-                     $shortsubj = &Apache::lonnet::unescape($shortsubj);
                      push(@{$newmsgs}, {
                          msgid    => $msgid,
                          sendtime => $sendtime,
- Line 915  sub getcritmail {
+ Line 1200  sub getcritmail {
              &Apache::lonmsg::unpackmsgid($msgid);
          if (($fromcid) && ($fromcid eq  $env{'request.course.id'})) {
              if (defined($sendtime) && $sendtime!~/error/) {
-                 my $numsendtime = $sendtime;
                  $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
                  $critmsgcount ++;
                  if ($shortsubj eq '') {
                      $shortsubj = &mt('No subject');
                  }
-                 $shortsubj = &Apache::lonnet::unescape($shortsubj);
                  push(@{$critmsgs}, {
                          msgid    => $msgid,
                          sendtime => $sendtime,
- Line 935  sub getcritmail {
+ Line 1218  sub getcritmail {
      return $critmsgcount;
  }
+ sub getexpired {
+     my ($rolechgs,$rolechgtime,$status) = @_;
+     my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status);
+     return $expirecount;
+ }
+ sub getactivated {
+     my ($rolechgs,$rolechgtime,$status) = @_;
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $now = time();
+     my $context = 'course';
+     my ($permission,$allowed) =
+         &Apache::lonuserutils::get_permission($context);
+     my $viewablesec = &Apache::lonuserutils::viewable_section($permission);
+     my %changes=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
+     my (%stucounted,%advcounted);
+     my $activatedcount = 0;
+     if (keys(%changes) > 0) {
+         foreach my $chg (sort { $b <=> $a } (keys(%changes))) {
+             if (ref($changes{$chg}) eq 'HASH') {
+                 my $timestamp = $changes{$chg}{'exe_time'};
+                 if ($timestamp) {
+                     if ($rolechgtime > 0) {
+                         if ($timestamp < $rolechgtime) {
+                             last;
+                         }
+                     }
+                     if (ref($changes{$chg}{'logentry'}) eq 'HASH') {
+                         next if ($changes{$chg}{'delflag'});
+                         my $start = $changes{$chg}{'logentry'}{'start'};
+                         my $end = $changes{$chg}{'logentry'}{'end'};
+                         my $section = $changes{$chg}{'logentry'}{'section'};
+                         my $role = $changes{$chg}{'logentry'}{'role'};
+                         my $uname = $changes{$chg}{'uname'};
+                         my $udom = $changes{$chg}{'udom'};
+                         next if ($end && $end <= $now);
+                         if (($viewablesec ne '') && ($section ne '')) {
+                             next if ($viewablesec ne $section);
+                         }
+                         next if ($start >= $timestamp);
+                         if ($role eq 'st') {
+                             $stucounted{$uname.':'.$udom.':'.$section} = $start.':'.$end;
+                         } else {
+                             $advcounted{$uname.':'.$udom.':'.$role.':'.$section} = $start.':'.$end;
+                         }
+                         my %chginfo = (
+                                        'section' => $section,
+                                        'uname'   => $uname,
+                                        'udom'    => $udom,
+                                        'role'    => $role,
+                                        'status'  => $status,
+                         );
+                         $activatedcount ++;
+                         push (@{$rolechgs->{$timestamp}},\%chginfo);
+                     }
+                 }
+             }
+         }
+     }
+     $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,\%stucounted,\%advcounted);
+     return $activatedcount;
+ }
+ sub getrolechanges {
+     my ($rolechgs,$rolechgtime,$status,$stucountref,$advcountref) = @_;
+     my (%stucounted,%advcounted);
+     if (ref($stucountref) eq 'HASH') {
+         %stucounted = %{$stucountref};
+     }
+     if (ref($advcountref) eq 'HASH') {
+         %advcounted = %{$advcountref};
+     }
+     my $withsec = 1;
+     my $hidepriv = 1;
+     my $context = 'course';
+     my @statuses = ($status);
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $now = time();
+     my ($permission,$allowed) =
+         &Apache::lonuserutils::get_permission($context);
+     my $viewablesec = &Apache::lonuserutils::viewable_section($permission);
+     my $classlist = &Apache::loncoursedata::get_classlist();
+     my $secidx = &Apache::loncoursedata::CL_SECTION();
+     my $startidx = &Apache::loncoursedata::CL_START();
+     my $endidx = &Apache::loncoursedata::CL_END();
+     my $rolechgcount = 0;
+     foreach my $key (keys(%{$classlist})) {
+         my ($userstatus,$eventtime);
+         my $student = $classlist->{$key};
+         if (ref($student) eq 'ARRAY') {
+             my $start = $student->[$startidx];
+             my $end = $student->[$endidx];
+             my $sec = $student->[$secidx];
+             my ($stuname,$studom) = split(/:/,$key);
+             if ($status eq 'active') {
+                 if (exists($stucounted{$key.':'.$sec})) {
+                     next;
+                 }
+             }
+             if (($end == 0) || ($end > $start)) {
+                 if ($start <= $now) {
+                     if ($end && $end < $now) {
+                         if ($rolechgtime > 0) {
+                             if ($end > $rolechgtime) {
+                                 $userstatus = 'previous';
+                             }
+                         } else {
+                             $userstatus = 'previous';
+                         }
+                     } else {
+                         if ($rolechgtime > 0) {
+                             if ($start >= $rolechgtime) {
+                                 $userstatus = 'active';
+                             }
+                         } else {
+                             $userstatus = 'active';
+                         }
+                     }
+                 }
+             }
+             next if ($userstatus ne $status);
+             if ($status eq 'active') {
+                 $eventtime = $start;
+             } else {
+                 $eventtime = $end;
+             }
+             if (($viewablesec ne '') && ($sec ne '')) {
+                 next if ($viewablesec ne $sec);
+             }
+             my %chginfo = (
+                             'section' => $sec,
+                             'uname'   => $stuname,
+                             'udom'    => $studom,
+                             'role'    => 'st',
+                             'status'  => $userstatus,
+                           );
+             $rolechgcount ++;
+             push (@{$rolechgs->{$eventtime}},\%chginfo);
+         }
+     }
+     my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
+                               \@statuses,undef,undef,$withsec,$hidepriv);
+     foreach my $item (keys(%advrolehash)) {
+         my ($userstatus,$eventtime);
+         my ($uname,$udom,$role,$section) = split(/:/,$item,-1);
+         my ($start,$end) = split(/:/,$advrolehash{$item});
+         if ($start eq '-1' && $end eq '-1') {
+             next;
+         } else {
+             if ($status eq 'active') {
+                 if (exists($advcounted{$item})) {
+                     next;
+                 }
+             }
+             if (($end == 0) || ($end > $start)) {
+                 if ($start <= $now) {
+                     if ($end && $end < $now) {
+                         if ($rolechgtime > 0) {
+                             if ($end > $rolechgtime) {
+                                 $userstatus = 'previous';
+                             }
+                         } else {
+                             $userstatus = 'previous';
+                         }
+                     } else {
+                         if ($rolechgtime > 0) {
+                             if ($start >= $rolechgtime) {
+                                 $userstatus = 'active';
+                             }
+                         } else {
+                             $userstatus = 'active';
+                         }
+                     }
+                 }
+             }
+             next if ($userstatus ne $status);
+             if ($status eq 'active') {
+                 $eventtime = $start;
+             } else {
+                 $eventtime = $end;
+             }
+         }
+         if (($viewablesec ne '') && ($section ne '')) {
+             next if ($viewablesec ne $section);
+         }
+         my %chginfo = (
+                         'section' => $section,
+                         'uname'   => $uname,
+                         'udom'    => $udom,
+                         'role'    => $role,
+                         'status'  => $userstatus,
+                       );
+         $rolechgcount ++;
+         push (@{$rolechgs->{$eventtime}},\%chginfo);
+     }
+     return $rolechgcount;
+ }
  sub checkversions {
      my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
      my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
      my ($tmp) = keys(%changes);
-     if ($tmp =~/^error\:/) {
+     unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-         &Apache::lonnet::logthis('Error retrieving version update information: '.
-         $tmp.' for '.$cdom.'_'.$crs.' in whatsnew');
-     } else {
          if (keys(%changes) > 0) {
              foreach my $key (sort(keys(%changes))) {
                  if ($changes{$key} > $starttime) {
- Line 980  sub checkversions {
+ Line 1459  sub checkversions {
  }
  sub display_handgrade {
-     my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_;
+     my ($r,$tograde,$ungraded,$itemserror) = @_;
-     my $rowColor;
      my %lt = &Apache::lonlocal::texthash(
                          'prna' => 'Problem Name',
                          'nmun' => 'Number ungraded',
                          'nopr' => 'No problems require handgrading',
      );
      if (@{$tograde} > 0) {
-         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'prna'}.'</small></b></td><td align="right"><b><small>'.$lt{'nmun'}.'</small></b></td></tr>');
+         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
+                   $lt{'prna'}.'</td><td class="LC_right_item">'.
+                   $lt{'nmun'}.'</td></tr>');
          my $rowNum = 0;
          foreach my $res (@{$tograde}) {
-             if ($rowNum %2 == 1) {
+             $rowNum ++;
-                 $rowColor = $rowColor1;
+             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
-             } else {
-                 $rowColor = $rowColor2;
-             }
              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);
+             if ($$ungraded{$res}{'enclink'}) {
-             $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>');
+                 $linkurl =
-             $rowNum ++;
+                     $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
+             }
+             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
          }
+     } elsif ($itemserror) {
+         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
      } else {
-         $r->print('<tr><td bgcolor="#ffffff"><br><center><i><b><small>&nbsp;&nbsp;'.$lt{'nopr'}.'&nbsp;&nbsp;</small><br><br></b></i></td></tr>');
+         $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
      }
  }
  sub display_haserrors {
-     my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_;
+     my ($r,$bombs,$bombed,$res_title,$itemserror) = @_;
      my $bombnum = 0;
-     my $rowColor;
      my %lt = &Apache::lonlocal::texthash(
                                     reso => 'Resource',
                                     nmer => 'Number of errors',
                                     noer => 'No problems with errors',
      );
      if (@{$bombs} > 0) {
-         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'nmer'}.'</small></b></td></tr>');
+         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
+                   $lt{'reso'}.'</td><td class="LC_right_item">'.
+                   $lt{'nmer'}.'</td></tr>');
          @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs};
          foreach my $bomb (@{$bombs}) {
-             if ($bombnum %2 == 1) {
-                 $rowColor = $rowColor1;
-             } else {
-                 $rowColor = $rowColor2;
-             }
-             $r->print('<tr bgcolor="'.$rowColor.'"><td><small>'.$$bombed{$bomb}{errorlink}.'</small></td><td align="right"><small>'.$$bombed{$bomb}{errorcount}.'</small></td></tr>');
              $bombnum ++;
+             my $css_class = $bombnum%2?' class="LC_odd_row"':'';
+             $r->print('<tr'.$css_class.'><td>'.$$bombed{$bomb}{errorlink}.
+                       '</td><td class="LC_right_item">'.
+                       $$bombed{$bomb}{errorcount}.'</td></tr>');
          }
+     } elsif ($itemserror) {
+         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
      } else {
-         $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'noer'}.'</small></i></b></center><br /></td></tr>');
+         $r->print('<tr class="LC_empty_row"><td>'.$lt{'noer'}.'</td></tr>');
      }
      return;
  }
  sub display_abovethreshold {
-     my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_;
+     my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_;
      my %lt = &Apache::lonlocal::texthash(
                   reso => 'Resource',
                   part => 'Part',
- Line 1048  sub display_abovethreshold {
+ Line 1530  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" action="/adm/whatsnew">'.
-                 '  <input type="hidden" name="command" value="reset" />'."\n");
+                 ' <input type="hidden" name="command" value="reset" />'."\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>');
+                 ' <input type="hidden" name="refpage" value="'.$refpage.'" />'.
+                 "\n");
+         $r->print('<tr class="LC_info_row">'.
+ 		  '<td class="LC_left_item">'.$lt{'reso'}.'</td>'.
+ 		  '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
+ 		  '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
+ 		  '<td>'.$lt{'lare'}.'</td><td  class="LC_right_item">'.
+                   $lt{'reco'}.'</td></tr>');
+ 	my $row;
          foreach my $res (@{$warnings}) {
-             if ($warningnum %2 == 1) {
+ 	    $row++;
-                 $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);
+             $linkurl .= '?symb='.&escape($res);
-             $r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text});
+             if ($$triggered{$res}{'enclink'}) {
-             $warningnum ++;
+                 $linkurl =
+                   $$triggered{$res}{'enclink'}.'?symb='.$$triggered{$res}{'encsymb'};
+             }
+             my $css_class = $row%2?' class="LC_odd_row"':'';
+             $r->print('<tr'.$css_class.'>'.
+ 		      '<td class="LC_first_item" '.$rowspan.'><a href="'.$linkurl.'">'.
+ 		      $$triggered{$res}{title}.'</a></td>');
+                       if (ref($$triggered{$res}{text}) eq 'ARRAY') {
+ 		          $r->print($$triggered{$res}{text}[0]);
+                       }
+                       $r->print('</tr>');
+             if (ref($$triggered{$res}{text}) eq 'ARRAY') {
+                 if (@{$$triggered{$res}{text}} > 1) {
+                     for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) {
+                         $r->print('<tr class="'.$css_class.'">'.
+                                   $$triggered{$res}{text}[$i].'</tr>');
+                     }
+                 }
+             }
          }
-         $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 class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>');
+     } elsif ($itemserror) {
+         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
      } else {
-         $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'nopr'}.'</small></i></b></center><br /></td></tr>');
+         $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
      }
  }
  sub display_versionchanges {
-     my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_;
+     my ($r,$changed,$res_title,$interval,$itemserror) = @_;
      my %lt = &Apache::lonlocal::texthash(
          'reso' => 'Resource',
          'revd' => 'Last revised',
          'newv' => 'New version',
          'veru' => 'Version used',
-         'noup' => 'No updated versions',
      );
-     my $rowColor;
      if (keys(%{$changed}) > 0) {
-         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td><b><small>'.$lt{'revd'}.'</small></b></td><td><b><small>'.$lt{'newv'}.'</small></b></td><td><b><small>'.$lt{'veru'}.'</small></b></td></tr>');
+         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
+                   $lt{'reso'}.'</td><td>'.$lt{'revd'}.'</td><td>'.
+                   $lt{'newv'}.'</td><td class="LC_right_item">'.
+                   $lt{'veru'}.'</td></tr>');
          my @changes = sort { &cmp_title($a,$b,$res_title) } keys(%{$changed});
          my $changenum = 0;
          foreach my $item (@changes) {
-             if ($changenum %2 == 1) {
+             $changenum ++;
-                 $rowColor = $rowColor1;
+             my $css_class = $changenum%2?' class="LC_odd_row"':'';
-             } else {
-                 $rowColor = $rowColor2;
-             }
              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>');
+             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.
-             $changenum ++;
+                       $$res_title{$item}.'</a></td><td>'.
+                       $$changed{$item}{'revdate'}.'</td><td>'.
+                       $$changed{$item}{'current'}.'</td><td>'.
+                       $$changed{$item}{'version'}.'</td></tr>');
+         }
+     } elsif ($itemserror) {
+         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
+     } else {
+         $r->print('<tr class="LC_empty_row"><td>'
+                  .&mt('No '.$interval).'</td></tr>');
+     }
+     return;
+ }
+ sub display_rolechanges {
+     my ($r,$chgcount,$changed,$interval,$crstype) = @_;
+     my $now = time();
+     my %lt = &Apache::lonlocal::texthash(
+         'user'  => 'User',
+         'tich'  => 'Time of change',
+         'role'  => 'Role',
+         'sec'   => 'Section',
+         'status'  => 'Status',
+     );
+     if ($chgcount) {
+         $r->print('<tr class="LC_info_row">'.
+                   '<td class="LC_left_item">'.$lt{'tich'}.'</td>'.
+                   '<td class="LC_left_item">'.$lt{'user'}.'</td>'.
+                   '<td class="LC_left_item">'.$lt{'role'}.'</td>'.
+                   '<td class="LC_left_item">'.$lt{'sec'}.'</td>'.
+                   '<td class="LC_left_item">'.$lt{'status'}.'</td></tr>');
+         if (ref($changed) eq 'HASH') {
+             my @changes = sort { $b <=> $a } (keys(%{$changed}));
+             my $changenum = 0;
+             foreach my $item (@changes) {
+                 if (ref($changed->{$item}) eq 'ARRAY') {
+                     foreach my $chg (@{$changed->{$item}}) {
+                         if (ref($chg) eq 'HASH') {
+                             my $section;
+                             my $role =
+                                 &Apache::lonnet::plaintext($chg->{'role'},$crstype);
+                             my $status = &mt($chg->{'status'});
+                             if ($chg->{'section'} eq '') {
+                                 $section = &mt('none');
+                             } else {
+                                 $section = $chg->{'section'};
+                             }
+                             my $uname = $chg->{'uname'};
+                             my $udom = $chg->{'udom'};
+                             $changenum ++;
+                             my $css_class = $changenum%2?' class="LC_odd_row"':'';
+                             my $link =
+                                 &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
+                             $r->print('<tr'.$css_class.'>'.
+                                       '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
+                                       '<td>'.$link.'</td>'.
+                                       '<td>'.$role.'</td>'.
+                                       '<td>'.$section.'</td>'.
+                                       '<td>'.$status.'</td></tr>');
+                         }
+                     }
+                 }
+             }
          }
      } else {
-         $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'noup'}.' '.$interval.'</small></i></b></center><br /></td></tr>');
+         $r->print('<tr class="LC_empty_row"><td>'
+                  .&mt('There are no '.$interval).'</td></tr>');
      }
      return;
  }
  sub display_coursediscussion {
-     my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1,
+     my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_;
-                                                               $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'}.
+         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-                   '</small></b></td><td><b><small>'.$lt{'type'}.
+                   $lt{'loca'}.'</td><td>'.
-                   '</small></b>');
+                   $lt{'type'}.'</td>');
-         if ($countunread) {
+         if ($countunread eq 'on') {
-             $r->print('<td><b><small>'.$lt{'tmlp'}.'</small></b></td>'.
+             $r->print('<td>'.$lt{'tmlp'}.'</td>'.
-                       '<td align="right"><b><small>'.$lt{'numn'}.
+                       '<td class="LC_right_item">'.$lt{'numn'}.'</td>');
-                       '</small></b></td>');
          } else {
-             $r->print('<td align="right"><b><small>'.$lt{'tmlp'}.
+             $r->print('<td class="LC_right_item">'.$lt{'tmlp'}.'</td>');
-                          '</small></b></td>');
          }
          $r->print("</tr>\n");
          @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) }
                                                              @{$newdiscussions};
          my $rowNum = 0;
          foreach my $ressymb (@{$newdiscussions}) {
+             $rowNum ++;
              my $forum_title = $$unread{$ressymb}{'title'};
              my $type = 'Resource';
              my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
+             my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb};
              if ($feedurl =~ /bulletinboard/) {
-                 $type = 'Bulletin Board';
+                 $type = 'Discussion Board';
              }
-             if ($rowNum %2 == 1) {
+             if ($$unread{$ressymb}{'enclink'}) {
-                 $rowColor = $rowColor1;
+                 $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'};
-             } else {
-                 $rowColor = $rowColor2;
              }
+             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
              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>');
+             $r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;</td><td>'.&mt($type).'&nbsp;</td>');
-             if ($countunread) {
+             if ($countunread eq 'on') {
                  my $unreadnum = $$unread{$ressymb}{'unreadcount'};
-                 $r->print('<td><small>'.$lastpost.'<small></td><td align="right">'.
+                 $r->print('<td>'.$lastpost.'</td><td class="LC_right_item">'.
-                           '<small>',$unreadnum.'&nbsp;</small></td>');
+                           $unreadnum.'&nbsp;</td>');
              } else {
-                 $r->print('<td align="right"><small>'.$lastpost.'</small></td>');
+                 $r->print('<td class="LC_right_item">'.$lastpost.'</td>');
              }
              $r->print("</tr>\n");
-             $rowNum ++;
          }
+     } elsif ($itemserror) {
+         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
      } else {
-         $r->print('<tr><td bgcolor="#ffffff"><br><center>&nbsp;<i><b><small>'.
+         $r->print('<tr class="LC_empty_row"><td>'.$lt{'noun'}.'</td></tr>');
-                   $lt{'noun'}.'</small></b></i><br><br></td></tr>');
      }
  }
  sub display_coursenormalmail {
-     my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_;
+     my ($r,$msgcount,$newmsgs) = @_;
-     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>');
+         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-         my $rowNum = 0;
+                   &mt('Number').'</td><td>'.&mt('Subject').'</td><td>'.
-         my $mailcount = 1;
+                   &mt('Sender').'</td><td class="LC_right_item">'.
+                   &mt('Date/Time').'</td></tr>');
+         my $mailcount = 0;
          foreach my $msg (@{$newmsgs}) {
-             if ($rowNum %2 == 1) {
-                 $rowColor = $rowColor1;
-             } else {
-                 $rowColor = $rowColor2;
-             }
-             $r->print('<tr bgcolor="'.$rowColor.'"><td valign="top"><small>'.$mailcount.'. &nbsp;</small></td><td valign="top"><small><a href="/adm/communicate">'.$msg->{'shortsub'}.'</a>&nbsp; &nbsp;</small></td><td valign="top"><small>&nbsp;'.$msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</small></td><td valign="top"><small>'.$msg->{'sendtime'}.'</small></td></tr>');
-             $rowNum ++;
              $mailcount ++;
+             my $css_class = $mailcount%2?' class="LC_odd_row"':'';
+             $r->print('<tr'.$css_class.'><td>'.$mailcount
+                       .'.&nbsp;</td><td><a href="/adm/email?display='
+                       .$msg->{'msgid'}.'">'
+                       .$msg->{'shortsub'}.'</a>&nbsp;&nbsp;</td><td>&nbsp;'
+                       .$msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'
+                       .$msg->{'sendtime'}.'</td></tr>');
          }
      } 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 class="LC_empty_row"><td>'.
+                   &mt('No new '.$lctype.' messages').'</td></tr>');
      }
  }
  sub display_coursecritmail {
-     my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_;
+     my ($r,$critmsgcount,$critmsgs) = @_;
-     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>');
+         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-         my $rowNum = 0;
+                   &mt('Number').'</td><td>'.&mt('Subject').'</td><td>'.
-         my $mailcount = 1;
+                   &mt('Sender').'</td><td class="LC_right_item">'.
+                   &mt('Date/Time').'</td></tr>');
+         my $mailcount = 0;
          foreach my $msg (@{$critmsgs}) {
-             if ($rowNum %2 == 1) {
-                 $rowColor = $rowColor1;
-             } else {
-                 $rowColor = $rowColor2;
-             }
-             $r->print('<tr bgcolor="'.$rowColor.'"><td valign="top"><small>'.$mailcount.'. &nbsp;<small></td><td valign="top"><small><a href="/adm/email?folder=critical">'.$msg->{'shortsub'}.'</a>&nbsp; &nbsp;</small></td><td valign="top"><small>&nbsp;'.$msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</small></td><td valign="top"><small>'.$msg->{'sendtime'}.'</small></td></tr>');
-             $rowNum ++;
              $mailcount ++;
+             my $css_class = $mailcount%2?' class="LC_odd_row"':'';
+             $r->print('<tr'.$css_class.'><td>'.$mailcount.
+                       '. &nbsp;</td><td><a href="/adm/email?folder=critical">'.
+                       $msg->{'shortsub'}.'</a>&nbsp; &nbsp;</td><td>&nbsp;'.
+                       $msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
+                       $msg->{'sendtime'}.'</td></tr>');
          }
      } 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 class="LC_empty_row"><td>'.
+                   &mt('No unread critical messages in '.$lctype).
+                   '</td></tr>');
      }
  }
- Line 1226  sub get_display_settings {
+ Line 1793  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') {
+         unless ($tmp =~ /^error: 2 /) {
-             &logthis('Error retrieving whatsnew settings: '.$tmp.' for '.
+ 	    my $lctype = lc(&Apache::loncommon::course_type());
-                                 $uname.':'.$udom.' for course: '.$cid);
+             &Apache::lonnet::logthis('Error retrieving whatsnew settings: '.
+             $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid);
          }
      }
      return %settings;
- Line 1241  sub store_display_settings {
+ Line 1809  sub store_display_settings {
      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};
- Line 1260  sub store_interval_setting {
+ Line 1829  sub store_interval_setting {
      my ($uname,$udom,$cid,$interval_titles) = @_;
      my %interval_settings = ();
      my $result;
-     if (defined($env{'form.interval'})) {
+     my $context = $env{'form.intervaltype'};
-         $interval_settings{$cid.':interval'} = $env{'form.interval'};
+     if ($env{'form.interval'} ne '') {
+         if ($context eq 'oldroles') {
+             $interval_settings{$cid.':oldroleinterval'} = $env{'form.interval'};
+         } elsif ($context eq 'newroles') {
+             $interval_settings{$cid.':newroleinterval'} = $env{'form.interval'};
+         } else {
+             $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]',
+             if (ref($interval_titles->{$context}) eq 'HASH') {
-                   '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
+                 $result = &Apache::lonhtmlcommon::confirm_success(&mt('New filter setting: [_1].','<b>'.
+                               $interval_titles->{$context}->{$env{'form.interval'}}.'</b>').'<br />');
+             }
+         } else {
+ 	    my $lctype = lc(&Apache::loncommon::course_type());
+             &Apache::lonnet::logthis('Error saving whatsnew '.$context.' interval setting'.
+                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
+             $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set interval to [_1] due to [_2].',
+                          '<b>'.$interval_titles->{$context}->{$env{'form.interval'}}.'</b>',
+                          '<tt>'.$outcome.'</tt>'),1);
+         }
+     }
+     return &Apache::loncommon::confirmwrapper($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 = &Apache::lonhtmlcommon::confirm_success(&mt('Count unread posts in discussions display set to [_1]',
+                   '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />');
+         } else {
+ 	    my $lctype = lc(&Apache::loncommon::course_type());
+             &Apache::lonnet::logthis('Error saving whatsnew countunread setting'.
+                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
+             $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set "number unread posts display" to [_1]'.
+                           ' due to [_2].',
+                          '<b>'.&mt($env{'form.countunread'}).'</b>',
+                          '<tt>'.$outcome.'</tt>'),1);
+         }
+     }
+     return &Apache::loncommon::confirmwrapper($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 {
-             &Apache::lonnet::logthis('Error storing whatsnew interval setting'.
+             if (defined($env{'form.courseinit_page'})) {
-                      ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid);
+                 $courseinit_settings{$cid.':courseinit'} =
-             $result = &mt('Unable to set interval to [_1] due to [_2].',
+                                                   $env{'form.courseinit_page'};
-                          '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>',
+                 $page_control = 'course specific setting';
-                          '<tt>'.$outcome.'</tt>.<br />');
+             }
+         }
+         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 = &Apache::lonhtmlcommon::confirm_success(&mt("Page displayed after role selection in $lctype now set by [_1]user's global preferences[_2].",'<b>','</b>'));
+                 } else {
+                     $result = &Apache::lonhtmlcommon::confirm_success(&mt('Page displayed after role selection in this '.$lctype.' set to [_1].'
+                                  ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'));
+                 }
+             } else {
+                 &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
+                                          'setting: '.$outcome.' for '.$uname.
+                                          ':'.$udom.' in '.$lctype.' '.$cid);
+                 if ($page_control eq 'global preferences') {
+                     $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set control of page display to [_1]'.
+                           ' due to [_2].',
+                          '<b>'.$page_control.'</b>',
+                          '<tt>'.$outcome.'</tt>'),1);
+                 } else {
+                     $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].'
+                                  ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'
+                                  ,'<tt>'.$outcome.'</tt>'),1);
+                 }
+             }
          }
      }
-     return $result;
+     return &Apache::loncommon::confirmwrapper($result);
  }
  sub start_box {
-     my ($r,$tabbg,$show,$heading,$caller) = @_;
+     my ($r,$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(document.visible.'.
-                                'display_'.$caller.",'hide'".');">Hide</a></b>';
+                                'display_'.$caller.",'hide'".');">'.
+                                &mt('Hide').'</a></b>';
      } else {
          $showhide = '<b><a href="javascript:change_display(document.visible.'.
-                                'display_'.$caller.",'show'".');">Show</a></b>';
+                                'display_'.$caller.",'show'".');">'.
+                                &mt('Show').'</a></b>';
      }
      $r->print('
-          <table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000" width="100%">
+          <table class="LC_nested_outer">
            <tr>
-            <td>
+            <th class="LC_left_item">'.$$heading{$caller}.'</th>
-             <table border="0" cellpadding="1" cellspacing="1" bgcolor="#000000" width="100%">
+            <th class="LC_right_item">'.$showhide.'</th>
-               <tr>
+           </tr>');
-                <td bgcolor="'.$tabbg.'">
-                 <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                   <td><b>'.$$heading{$caller}.'</b></td>
-                   <td valign="top" align="right">'.$showhide.'</td>
-                  </tr>
-                 </table>
-                </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 class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgthreshold&amp;refpage='.$refpage.'">'.$lt{'chth'}.'</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"><b><small>'.$lt{'chin'}.'</small></b></a></td>
+                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chginterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
                </tr>');
+          }
+      } elsif ($caller eq 'coursediscussion') {
+          if ($$show{$caller}) {
+              $r->print('
+               <tr>
+                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgdisc&amp;refpage='.$refpage.'">'.$lt{'chop'}.'</a></td>
+               </tr>');
+          }
+      } elsif (($caller eq 'newroles') && ($$show{$caller})) {
+          if ($$show{$caller}) {
+              $r->print('
+               <tr>
+                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgnewroleinterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+               </tr>');
+          }
+      } elsif (($caller eq 'oldroles') && ($$show{$caller})) {
+          if ($$show{$caller}) {
+              $r->print('
+               <tr>
+                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+               </tr>');
+          }
       }
-      $r->print('
+     $r->print('
                <tr>
-                <td bgcolor="#ffffff">
+                <td colspan="2">
-                 <table cellpadding="2" cellspacing="0" border="0" width="100%">
+                 <table class="LC_nested">
  ');
      return;
  }
- Line 1332  sub start_box {
+ Line 2001  sub start_box {
  sub end_box {
      my ($r) = shift;
      $r->print('
-       </table>
-      </td>
-     </tr>
     </table>
    </td>
   </tr>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.38.2.1
changed lines
	Added in v.1.101