--- loncom/interface/lonwhatsnew.pm	2007/02/27 22:16:02	1.68
+++ loncom/interface/lonwhatsnew.pm	2008/12/12 15:48:05	1.83
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.68 2007/02/27 22:16:02 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.83 2008/12/12 15:48:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ 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;
@@ -68,6 +69,8 @@ sub handler {
 			    ['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'};
@@ -99,32 +102,46 @@ sub handler {
               text=>"Display Action Items"});
     if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Thresholds'
 	     ));
     } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
               text=>"Change interval"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Intervals'
 	     ));
     } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
               text=>"Change discussion display"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Intervals'
 	     ));
     } elsif ($command eq 'courseinit') {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
               text=>"Course initialization preference"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Initialization'
 	     ));
+    } elsif ($command eq 'chgoldroleinterval' && $checkallowed{'oldroles'}) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/whatsnew?command=chgoldroleinterval&refpage='.$refpage,
+              text=>"Change interval"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+            ("What's New?",#'Course_Action_Items_Intervals'
+             ));
+    } elsif ($command eq 'chgnewroleinterval' && $checkallowed{'newroles'}) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/whatsnew?command=chgnewroleinterval&refpage='.$refpage,
+              text=>"Change interval"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+            ("What's New?",#'Course_Action_Items_Intervals'
+             ));
     } else {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Display'
@@ -144,7 +161,6 @@ sub display_main_box {
     my ($r,$command,$refpage,$checkallowed) = @_;
     my $domain=&Apache::loncommon::determinedomain();
     my $function = &Apache::loncommon::get_users_function();
-    my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     my $lctype = lc(&Apache::loncommon::course_type());
     $r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">');
 
@@ -153,14 +169,29 @@ sub display_main_box {
                          degdiff => 'Degree of difficulty',
                          numstudents => 'Total number of students with submissions',
     );
-
-    my %interval_titles = &Apache::lonlocal::texthash (
-                            -1 => "since start of $lctype",
-                       2592000 => 'since last month',
-                        604800 => 'since last week',
-                         86400 => 'since yesterday',
+    my %versions = (
+                       -1 => "version changes since start of $lctype",
+                  2592000 => 'version changes since last month',
+                   604800 => 'version changes since last week',
+                    86400 => 'version changes since yesterday',
+                   );
+    my %newroles = (
+                       -1 => "roles which have become active since start of $lctype",
+                  2592000 => 'roles which have become active since last month',
+                   604800 => 'roles which have become active since last week',
+                    86400 => 'roles which have become active since yesterday',
+                   );
+    my %oldroles = (
+                       -1 => "roles which expired since start of $lctype",
+                  2592000 => 'roles which expired since last month',
+                   604800 => 'roles which expired since last week',
+                    86400 => 'roles which expired since yesterday',
+                   );
+    my %interval_titles = (
+        versions => \%versions,
+        newroles => \%newroles,
+        oldroles => \%oldroles,
     );
-
     my %initpage = &Apache::lonlocal::texthash (
                      firstres => "first resource in the $lctype",
                      whatsnew => "what's new? page",
@@ -172,18 +203,24 @@ sub display_main_box {
 
     if (($command eq 'chgthreshold') 
 	&& $checkallowed->{'abovethreshold'}) {
-        &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,
+        &display_threshold_config($r,$refpage,\%threshold_titles,
                                                                    $cdom,$crs);
     } elsif (($command eq 'chginterval') 
 	     && $checkallowed->{'versionchanges'}) {
-        &display_interval_config($r,$refpage,\%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,$tabbg,$command,$refpage,\%threshold_titles,
+        &display_actions_box($r,$command,$refpage,\%threshold_titles,
                         \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
     }
     my $end_page = &Apache::loncommon::end_page();
@@ -206,12 +243,13 @@ sub display_header {
     my ($command,$checkallowed) = @_;
     
     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(); 
+    document.visible.submit();
 }
 
 function changeAll(change) {
@@ -241,8 +279,8 @@ END
 #-------------------------------
                                                                                 
 sub display_actions_box {
-    my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles,
-                                      $initpage,$cdom,$crs,$checkallowed) = @_;
+    my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
+        $cdom,$crs,$checkallowed) = @_;
     my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};
     my $cid = $env{'request.course.id'};
@@ -272,7 +310,10 @@ 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;
@@ -296,7 +337,7 @@ sub display_actions_box {
     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;
     }
 
@@ -305,14 +346,22 @@ sub display_actions_box {
             &GDBM_READER(),0640)) {
             my $furl=$bighash{'first_url'};
             untie(%bighash);
-            $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}.
-                  '</a></font><br />');
+            $r->print('<span style="font-size: larger;"><a href="'.$furl.'">'.$lt{'gtfr'}.
+                  '</a></span><br />');
         }
     }
-    $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).
-              '. <nobr>'.&mt('Currently: <i>[_1]</i>',$currinit).'.&nbsp;&nbsp;'.
-              &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '.
-              &mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses</a>',$refpage).'</nobr><br /><hr />');
+    $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
+              .' <span class="LC_nobreak">'
+              .&mt('Currently: [_1].','<i>'.$currinit.'</i>')
+              .'&nbsp;&nbsp;'
+              .&mt('[_1]Change[_2] for just [_3]this course[_4] or for all [_5]your courses[_6].'
+                  ,'<b>'
+                  ,'</b>'
+                  ,'<a href="/adm/whatsnew?command=courseinit&amp;refpage='.$refpage.'">'
+                  ,'</a>'
+                  ,'<a href="/adm/preferences?action=changecourseinit&amp;refpage='.$refpage.'">'
+                  ,'</a>')
+              .' </span><br /><hr />');
 
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
@@ -327,9 +376,9 @@ sub display_actions_box {
     my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed);
 
     unless ($store_result eq 'ok') { 
-        &Apache::lonnet::logthis('Error storing whatsnew settings: '.
+        &Apache::lonnet::logthis('Error saving whatsnew settings: '.
             $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
-        $result .= &mt('Unable to store visibility settings due to [_1]',
+        $result .= &mt('Unable to save visibility settings due to [_1]',
                        $store_result); 
     }
 
@@ -338,40 +387,88 @@ sub display_actions_box {
     }
     $r->rflush();
 
-
+    my (%timediff,%interval);
     my %display_settings = &get_display_settings($uname,$udom,$cid);
-    my $timediff = $display_settings{$cid.':interval'};
-    unless (defined($timediff)) { $timediff = 604800; } 
-    my $now = time;
-    my $interval = $$interval_titles{$timediff};
-    if ($timediff == -1) {
-        $timediff = time;
-    } 
-    my $starttime = $now - $timediff;
-    my $countunread = $display_settings{$cid.':countunread'};
-    unless (defined($countunread)) {
-        $countunread = 'on';
-    }
+    $timediff{'versions'} = $display_settings{$cid.':interval'};
+    unless (defined($timediff{'versions'})) { $timediff{'versions'} = 604800; } 
+    $interval{'versions'} = $interval_titles->{'versions'}->{$timediff{'versions'}};
 
     my %headings = &Apache::lonlocal::texthash(
-                coursediscussion =>  'Unread '.$lctype.' discussion posts',
-                handgrading =>  'Problems requiring handgrading',
-                haserrors => 'Problems with errors',
-                versionchanges => 'Resources in '.$lctype.' with version changes '.$interval,
+                coursediscussion => 'Unread '.$lctype.' discussion posts',
+                handgrading      => 'Problems requiring handgrading',
+                haserrors        => 'Problems with errors',
                 coursenormalmail => 'New '.$lctype.' messages',
-                coursecritmail => 'New critical messages in '.$lctype,
+                coursecritmail   => 'New critical messages in '.$lctype,
     );
 
+    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,$uname,$udom,$cid,$cdom,$crs);
     }
 
     $headings{'abovethreshold'} = 
-	&mt('Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2] <br /> and total number of '.$stulabel{$crstype}.' with submissions &ge; [_3]',
+	&mt('(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions &ge; [_4]',
 	    $threshold{'av_attempts'},$threshold{'degdiff'},
-	    $threshold{'numstudents'});
+	    '<br />',$threshold{'numstudents'});
 
-    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
+    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
 
     foreach my $key (keys(%{$checkallowed})) {
 	if ($key =~ /_section$/) { next; }
@@ -384,7 +481,8 @@ 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;
@@ -401,7 +499,12 @@ sub display_actions_box {
     if ($show{'coursecritmail'}) {
         $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|);
@@ -412,7 +515,7 @@ sub display_actions_box {
         }
     }
 
-    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'"></form><br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
+    $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 = 0;
@@ -423,24 +526,22 @@ sub display_actions_box {
             $totalboxes ++;
         }
     }
-    my $halfway = int($totalboxes/2) + $totalboxes%2;
+    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="6%">&nbsp;</td><td align="left" valign="top" width="47%">');
+                $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
             }
-            &display_launcher($r,$actionitem,$refpage,$checkallowed,$tabbg,\%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);
             $displayed ++; 
         }
     }
     $r->print('
-           </table>
-          </td>
-         </tr>
-        </table>
       </td>
     </tr>
-   </table>');
+   </table>
+');
 }
 
 #-------------------------------
@@ -451,7 +552,7 @@ sub display_actions_box {
 #-------------------------------
                                                                                 
 sub display_threshold_config {
-    my ($r,$refpage,$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'};
@@ -471,9 +572,9 @@ sub display_threshold_config {
     $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">'.
               &Apache::loncommon::start_data_table().
               &Apache::loncommon::start_data_table_header_row().
-             '<th>Threshold Name</th>'."\n".
-             '<th>Current value</th>'."\n".
-             '<th>Change?</th>'."\n".
+             '<th>'.&mt('Threshold Name').'</th>'."\n".
+             '<th>'.&mt('Current value').'</th>'."\n".
+             '<th>'.&mt('Change?').'</th>'."\n".
               &Apache::loncommon::end_data_table_header_row());
     foreach my $type (@thresholditems) {
         my $parameter = $env{'request.course.id'}.':threshold_'.$type;
@@ -492,7 +593,7 @@ sub display_threshold_config {
                  &Apache::loncommon::end_data_table_row());
     }
     $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('Make changes').'" />
                  <input type="hidden" name="command" value="update" />
                  <input type="hidden" name="refpage" value="'.$refpage.'" />
                </form>');
@@ -506,24 +607,45 @@ sub display_threshold_config {
 #-------------------------------
                                                                                    
 sub display_interval_config {
-    my ($r,$refpage,$interval_titles) = @_;
+    my ($r,$refpage,$interval_titles,$context) = @_;
+    my $setting = 'interval';
+    if ($context eq 'oldroles') {
+        $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'},'interval');
-    $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.'));
+                                $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 [_1]','<b>'.
-                  $$interval_titles{$current}.'</b>.'));
+        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="refpage" value="'.$refpage.'" />
+<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})))) {
-        $r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}.
-                  '</option>'."\n");
+    if (ref($interval_titles) eq 'HASH') {
+        if (ref($interval_titles->{$context}) eq 'HASH') {
+            foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) {
+                $r->print('<option value="'.$key.'">'.&mt($interval_titles->{$context}->{$key}).
+                          '</option>'."\n");
+            }
+        }
     }
     $r->print('</select>&nbsp;&nbsp;
                <input type="submit" name="display" value="'.
@@ -557,7 +679,13 @@ function toggle_countunread(choice) {
     document.discussionswitch.submit();
 }
 </script>');
-    $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"<i>What's New?</i>").'&nbsp;&nbsp;'.&mt('Currently set to [_1].','<b>'.$current.'</b>'));
+    $r->print('<br />'
+             .&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.')
+             .'<br />'
+             .&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.")
+             .'&nbsp;&nbsp;'
+             .&mt('Currently set to [_1].','<b>'.$current.'</b>.')
+    );
     $r->print('<br /><br />
 <form method="post" name="discussionswitch" action="/adm/whatsnew">
 <input type="hidden" name="command" value="newdiscconf" />
@@ -566,10 +694,10 @@ function toggle_countunread(choice) {
 ');
     $r->print('<br/>
                <input type="button" name="display" value="'.
-               &mt('Change to [_1]',$opposite{$current}).'" 
-               onclick="javascript:toggle_countunread('."'change'".')" />
-               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;
-               <input type="button" name="nochange" value="'.
+               &mt('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>');
@@ -613,9 +741,9 @@ END
         if ($choice eq $control) {
             $chkstring = ' checked="checked" ';
         }  
-        $r->print('<nobr><label><input type="radio" name="courseinit_control" value="'.
+        $r->print('<span class="LC_nobreak"><label><input type="radio" name="courseinit_control" value="'.
                    $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
-                   '&nbsp;&nbsp;</label></nobr>');
+                   '&nbsp;&nbsp;</label></span>');
     }
     $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
               ' - <br />'.$lt{'chce'}.": \n");
@@ -624,9 +752,9 @@ END
         if (($choice eq $current) && ($control eq 'coursespecific')) {
             $chkstring = ' checked="checked" ';
         }
-        $r->print('<nobr><label><input type="radio" name="courseinit_page" value="'.
+        $r->print('<span class="LC_nobreak"><label><input type="radio" name="courseinit_page" value="'.
                   $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
-                  '&nbsp;&nbsp;</label></nobr>');
+                  '&nbsp;&nbsp;</label></span>');
     }
     $r->print('<br /><br /><input type="submit" name="display" value="'.
                $lt{'moce'}.'" /></form>');
@@ -654,20 +782,21 @@ sub curr_courseinit {
 }
 
 sub display_launcher {
-    my ($r,$action,$refpage,$checkallowed,$tabbg,$show,$headings,$res_title,
+    my ($r,$action,$refpage,$checkallowed,$show,$headings,$res_title,
         $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
         $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
-        $interval,$countunread) = @_;
+        $interval,$countunread,$expired,$expirecount,$activated,$activecount,
+        $crstype) = @_;
 
     if ($$checkallowed{$action}) {
-        &start_box($r,$tabbg,$show,$headings,$action,$refpage,$action);
+        &start_box($r,$show,$headings,$action,$refpage,$action);
         if ($$show{$action}) {
             if ($action eq 'handgrading') {    # UNGRADED ITEMS
                 &display_handgrade($r,$tograde,$ungraded);
             } elsif ($action eq 'haserrors') { # BOMBS
                 &display_haserrors($r,$bombs,$bombed,$res_title);
             } elsif ($action eq 'versionchanges') { # VERSION CHANGES
-                &display_versionchanges($r,$changed,$res_title,$interval);
+                &display_versionchanges($r,$changed,$res_title,$interval->{'versions'});
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
 					$res_title);
@@ -678,6 +807,12 @@ sub display_launcher {
                 &display_coursenormalmail($r,$msgcount,$newmsgs);
             } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES
                 &display_coursecritmail($r,$critmsgcount,$critmsgs);
+            } 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);
@@ -870,10 +1005,10 @@ sub check_thresholds {
                 my $resettitle = 'title_'.&escape($symb."\0".$part);
                 if (@parts > 1) {
                     $$triggered{$symb}{text}[$partcount] = '
-                     <td>part - '.$part.'</td>';
+                     <td>'.&mt('part - ').$part.'</td>';
                 } else {
                     $$triggered{$symb}{text}[$partcount] = '
-                     <td>single part</td>';
+                     <td>'.&mt('single part').'</td>';
                 }
                 $$triggered{$symb}{text}[$partcount] .= '
                      <td>'.$stats{$part}{users}.'</td>
@@ -983,7 +1118,7 @@ sub process_reset {
 
 sub process_update {
     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 />';
     foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
@@ -1070,6 +1205,205 @@ 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) = @_;
@@ -1235,7 +1569,6 @@ sub display_versionchanges {
         'revd' => 'Last revised',
         'newv' => 'New version',
         'veru' => 'Version used',
-        'noup' => 'No updated versions', 
     );
     if (keys(%{$changed}) > 0) {
         $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
@@ -1258,8 +1591,65 @@ sub display_versionchanges {
                       $$changed{$item}{'version'}.'</td></tr>');
         }
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'noup'}.
-                  ' '.$interval.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><td>'
+                 .&mt('No '.$interval).'</td></tr>');
+    }
+    return;
+}
+
+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 class="LC_empty_row"><td>'
+                 .&mt('There are no '.$interval).'</td></tr>');
     }
     return;
 }
@@ -1303,7 +1693,7 @@ sub display_coursediscussion {
             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
             my $lastpost = &Apache::lonnavmaps::timeToHumanString(
                                                $$unread{$ressymb}{'lastpost'});
-            $r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;</td><td>'.$type.'&nbsp;</td>');
+            $r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;</td><td>'.&mt($type).'&nbsp;</td>');
             if ($countunread eq 'on') {
                 my $unreadnum = $$unread{$ressymb}{'unreadcount'};
                 $r->print('<td>'.$lastpost.'</td><td class="LC_right_item">'.
@@ -1330,11 +1720,12 @@ sub display_coursenormalmail {
         foreach my $msg (@{$newmsgs}) {
             $mailcount ++;
             my $css_class = $mailcount%2?' class="LC_odd_row"':'';
-            $r->print('<tr'.$css_class.'><td>'.$mailcount.
-                      '. &nbsp;</td><td><a href="/adm/communicate">'.
-                      $msg->{'shortsub'}.'</a>&nbsp; &nbsp;</td><td>&nbsp;'.
-                      $msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
-                      $msg->{'sendtime'}.'</td></tr>');
+            $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 class="LC_empty_row"><td>'.
@@ -1357,7 +1748,7 @@ sub display_coursecritmail {
             $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->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
                       $msg->{'sendtime'}.'</td></tr>');
         }
     } else {
@@ -1415,20 +1806,28 @@ sub store_interval_setting {
     my ($uname,$udom,$cid,$interval_titles) = @_;
     my %interval_settings = ();
     my $result;
-    if (defined($env{'form.interval'})) {
-        $interval_settings{$cid.':interval'} = $env{'form.interval'};
+    my $context = $env{'form.intervaltype'};
+    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]',
-                  '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
-
+            if (ref($interval_titles->{$context}) eq 'HASH') {
+                $result = &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 storing whatsnew interval setting'.
+            &Apache::lonnet::logthis('Error saving whatsnew '.$context.' interval setting'.
                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
             $result = &mt('Unable to set interval to [_1] due to [_2].',
-                         '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>',
+                         '<b>'.$interval_titles->{$context}->{$env{'form.interval'}}.'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
         }
     }
@@ -1445,15 +1844,15 @@ sub store_discussion_setting {
                                              \%discussion_settings,$udom,$uname);
         if ($outcome eq 'ok') {
             $result = &mt('Count unread posts in discussions display set to [_1]',
-                  '<b>'.$env{'form.countunread'}.'</b><br />');
+                  '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />';
                                                                                   
         } else {
 	    my $lctype = lc(&Apache::loncommon::course_type());
-            &Apache::lonnet::logthis('Error storing whatsnew countunread setting'.
+            &Apache::lonnet::logthis('Error saving whatsnew countunread setting'.
                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
             $result = &mt('Unable to set "number unread posts display" to [_1]'.
                           ' due to [_2].',
-                         '<b>'.$env{'form.countunread'}.'</b>',
+                         '<b>'.&mt($env{'form.countunread'}).'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
         }
     }
@@ -1482,12 +1881,13 @@ sub store_courseinit_setting {
                                            \%courseinit_settings,$udom,$uname);
             if ($outcome eq 'ok') {
                 if ($page_control eq 'global preferences') {
-                    $result = &mt("Page displayed after role selection in $lctype now set by <b>user's global preferences</b>.");
+                    $result = &mt("Page displayed after role selection in $lctype now set by [_1]user's global preferences[_2].",'<b>','</b>');
                 } else {
-                    $result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}});
+                    $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_1].'
+                                 ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>');
                 }
             } else {
-                &Apache::lonnet::logthis('Error storing whatsnew courseinit '.
+                &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
                                          'setting: '.$outcome.' for '.$uname.
                                          ':'.$udom.' in '.$lctype.' '.$cid);
                 if ($page_control eq 'global preferences') {
@@ -1496,8 +1896,10 @@ sub store_courseinit_setting {
                          '<b>'.$page_control.'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
                 } else {
-                    $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to <b>[_2]</b> due to <tt>[_3]</tt>.<br />',
-                         $$initpage{$env{'form.courseinit_page'}},$outcome);
+                    $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].'
+                                 ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'
+                                 ,'<tt>'.$outcome.'</tt>')
+                             .'<br />';
                 }
             }
         }
@@ -1506,7 +1908,7 @@ sub store_courseinit_setting {
 }
 
 sub start_box {
-    my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_;
+    my ($r,$show,$heading,$caller,$refpage) = @_;
     my %lt = &Apache::lonlocal::texthash( 
                        chth => 'Change thresholds?',
                        chin => 'Change interval?',
@@ -1515,17 +1917,19 @@ sub start_box {
     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 class="LC_nested_outer">
           <tr>
-           <th>'.$$heading{$caller}.'</th>
+           <th class="LC_left_item">'.$$heading{$caller}.'</th>
            <th class="LC_right_item">'.$showhide.'</th>
           </tr>');
      if (($caller eq 'abovethreshold') && ($$show{$caller})) {
@@ -1549,6 +1953,20 @@ sub start_box {
                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgdisc&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&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&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+              </tr>');
+         }
      }
     $r->print('
               <tr>