--- loncom/interface/lonwhatsnew.pm	2013/12/14 02:08:30	1.105.2.9
+++ loncom/interface/lonwhatsnew.pm	2025/03/22 21:18:30	1.132
@@ -1,5 +1,7 @@
+# The LearningOnline Network
+# What's New in a course
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.9 2013/12/14 02:08:30 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.132 2025/03/22 21:18:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,17 +64,37 @@ sub handler {
     my $command = $env{'form.command'};
     my $refpage = $env{'form.refpage'};
 
-    my %checkallowed = ( coursenormalmail => 1,
-			 coursecritmail => 1, );
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my ($isadhoc,%checkallowed);
+
+    if ($env{'request.role'} =~ m{^(cc|co)/}) {
+        my $rolecode = $1;
+        if ($env{"environment.internal.$cdom.$crs.$env{'request.role'}.adhoc"}) {
+            $isadhoc = 1;
+        }
+    } elsif ($env{'request.role'} =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)\./}) {
+        my $rolename = $1;
+        if ($env{"environment.internal.$cdom.$crs.cr/$cdom/$cdom-domainconfig/$rolename.adhoc"}) {
+            $isadhoc = 1;
+        }
+    }
+    unless ($isadhoc) {
+        %checkallowed = ( coursenormalmail => 1,
+			  coursecritmail => 1,);
+    }
     foreach my $perm_check (['whn','whatsnew',1],
 			    ['pch','coursediscussion',1],
 			    ['mgr','handgrading',1],
 			    ['vgr','abovethreshold',1],
-			    ['opa','haserrors',1],
-			    ['mdc','versionchanges',0],
+			    ['vgr','haserrors',1],
+			    ['whn','versionchanges',1],
                             ['vcl','newroles',1],
                             ['vcl','oldroles',1],
                             ['whn','crslogin',1],
+                            ['vcl','sessions',1],
+                            ['mgr','resetcounters',1],
 			    ) {
 	my ($perm,$key,$check_section) = @{ $perm_check };
 	my $scope = $env{'request.course.id'};
@@ -96,7 +118,23 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print(&display_header($command,\%checkallowed));
+    my $udom = $env{'user.domain'};
+    my $uname = $env{'user.name'};
+    my $cid = $env{'request.course.id'};
+    my $store_result = &store_display_settings($uname,$udom,$cid,\%checkallowed);
+    my $store_error;
+
+    unless ($store_result eq 'ok') {
+        my $lctype = lc(&Apache::loncommon::course_type());
+        &Apache::lonnet::logthis('Error saving whatsnew settings: '.
+            $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
+        $store_error = '<span class="LC_error">'
+                  .&mt('Unable to save visibility settings due to [_1]',
+                       $store_result)
+                  .'</span>';
+    }
+
+    $r->print(&display_header($command,$uname,$udom,$cid,\%checkallowed));
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -151,12 +189,19 @@ sub handler {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Intervals'
              ));
+    } elsif ($command eq 'chgsessionlimit' && $checkallowed{'sessions'}) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/whatsnew?command=chgsessionlimit&amp;refpage='.$refpage,
+              text=>"Change session range"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+            ("What's New?",#'Course_Action_Items_Sessions'
+             ));
     } else {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Display'
 	     ));
     }
-    &display_main_box($r,$command,$refpage,\%checkallowed);
+    &display_main_box($r,$command,$refpage,\%checkallowed,$cdom,$crs,$store_error);
     return OK;
 }
 
@@ -167,11 +212,10 @@ sub handler {
 #------------------------------
                                                                                 
 sub display_main_box {
-    my ($r,$command,$refpage,$checkallowed) = @_;
+    my ($r,$command,$refpage,$checkallowed,$cdom,$crs,$store_error) = @_;
     my $domain=&Apache::loncommon::determinedomain();
     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 = &Apache::lonlocal::texthash (
                          av_attempts => 'Average number of attempts',
@@ -202,25 +246,31 @@ sub display_main_box {
                    604800 => 'last logins for users in last 7 days',
                     86400 => 'last logins for users in last 24 hours',
                    );
+    my %sessions = (
+                     300  => 'course sessions active in the last 5 minutes',
+                     600  => 'course sessions active in the last 10 minutes',
+                     1800 => 'course sessions active in the last 30 minutes',
+                     7200 => 'course sessions active in the last 2 hours',
+                    -7200 => 'course sessions with last activity more than 2 hours ago',
+                   );
     my %interval_titles = (
         versions => \%versions,
         newroles => \%newroles,
         oldroles => \%oldroles,
         crslogin => \%crslogins,
+        sessions => \%sessions,
     );
-    my %initpage = &Apache::lonlocal::texthash (
+    my %initpage = (
                      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'};
+    $r->print('<div class="LC_landmark" role="main">');
 
     if (($command eq 'chgthreshold') 
 	&& $checkallowed->{'abovethreshold'}) {
-        &display_threshold_config($r,$refpage,\%threshold_titles,
-                                                                   $cdom,$crs);
+        &display_threshold_config($r,$refpage,\%threshold_titles,$cdom,$crs);
     } elsif (($command eq 'chginterval') 
 	     && $checkallowed->{'versionchanges'}) {
         &display_interval_config($r,$refpage,\%interval_titles,'versions');
@@ -238,17 +288,16 @@ sub display_main_box {
     } elsif (($command eq 'chgcrslogininterval')
              && $checkallowed->{'crslogin'}) {
         &display_interval_config($r,$refpage,\%interval_titles,'crslogin');
+    } elsif (($command eq 'chgsessionlimit')
+             && $checkallowed->{'sessions'}) {
+        &display_interval_config($r,$refpage,\%interval_titles,'sessions');
     } else {
         &display_actions_box($r,$command,$refpage,\%threshold_titles,
-                        \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
+                        \%interval_titles,\%initpage,$cdom,$crs,
+                        $checkallowed,$store_error);
     }
     my $end_page = &Apache::loncommon::end_page();
-    $r->print(<<END_OF_BLOCK);
-  </td>
- </tr>
-</table><br />
-$end_page
-END_OF_BLOCK
+    $r->print('<br /></div>'.$end_page);
 }
 
 #-------------------------------
@@ -259,13 +308,48 @@ END_OF_BLOCK
 #-------------------------------
 
 sub display_header {
-    my ($command,$checkallowed) = @_;
-    
+    my ($command,$uname,$udom,$cid,$checkallowed) = @_;
+
     my $scripttag;
-    unless ($command eq 'chgthreshold' || $command eq 'chginterval' || 
-            $command eq 'chgoldroleinterval' ||
-            $command eq 'chgnewroleinterval' || $command eq 'chgcrslogininterval') {
-       $scripttag = <<"END";
+    my $args = {};
+    my %loadentries;
+
+    if ($command eq 'courseinit') {
+        $scripttag = <<"END";
+<script type="text/javascript">
+// <![CDATA[
+function toggleCourseInit(form) {
+    if (document.getElementById('courseinit_by_course')) {
+        var radioelem = form.elements['courseinit_control'];
+        if (radioelem.length) {
+            for (var i=0; i<radioelem.length; i++) {
+                if (radioelem[i].checked) {
+                    if (radioelem[i].value == 'coursespecific') {
+                        document.getElementById('courseinit_by_course').style.display = 'inline';
+                    } else {
+                         document.getElementById('courseinit_by_course').style.display = 'none';
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+END
+        $loadentries{'onload'} = 'toggleCourseInit(document.courseinitswitch);';
+    } else {
+        unless (($command eq 'chgthreshold' && $checkallowed->{'abovethreshold'}) ||
+                ($command eq 'chginterval' && $checkallowed->{'versionchanges'}) ||
+                ($command eq 'chgdisc' && $checkallowed->{'coursediscussion'}) ||
+                ($command eq 'chgoldroleinterval' && $checkallowed->{'oldroles'}) ||
+                ($command eq 'chgnewroleinterval' && $checkallowed->{'newroles'}) ||
+                ($command eq 'chgcrslogininterval' && $checkallowed->{'crslogin'}) ||
+                ($command eq 'chgsessionlimit' && $checkallowed->{'sessions'})) {
+            my %display_settings = &get_display_settings($uname,$udom,$cid);
+            $scripttag = <<"END";
 <script type="text/javascript">
 // <![CDATA[
 function change_display(caller,change) {
@@ -275,14 +359,15 @@ function change_display(caller,change) {
 
 function changeAll(change) {
 END
-        foreach my $item (keys(%{$checkallowed})) {
-	    if ($item =~ /_section$/) { next; }
-            if ($$checkallowed{$item}) {
-                $scripttag.='document.visible.display_'.$item.'.value=change'.
-                            "\n";
+            foreach my $item (keys(%{$checkallowed})) {
+	        if ($item =~ /_section$/) { next; }
+                if ($$checkallowed{$item}) {
+                    $scripttag.='document.visible.display_'.$item.'.value=change'.
+                                "\n";
+                }
             }
-        }
-        $scripttag.='document.visible.submit();
+            $scripttag.=<<"ENDTOGG";
+    document.visible.submit();
 }
 
 function thresholdreset() {
@@ -290,45 +375,45 @@ function thresholdreset() {
     document.visible.submit();
 }
 
-function togglelogins() {
-    var total = document.visible.logincount.value;
-    var sumrow = document.visible.loginrow.value;
+function toggledetails(prefix) {
+    var total = document.visible[prefix+'count'].value;
+    var sumrow = document.visible[prefix+'row'].value;
     if (total == 0) {
         return;
     }
-    var showlogindetails = 0;
-    for (var i=0; i<document.visible.logindetails.length; i++) {
-        if (document.visible.logindetails[i].checked) {
-            showlogindetails = document.visible.logindetails[i].value;
+    var showdetails = 0;
+    for (var i=0; i<document.visible[prefix+'details'].length; i++) {
+        if (document.visible[prefix+'details'][i].checked) {
+            showdetails = document.visible[prefix+'details'][i].value;
         }
     }
     var detval = "none";
     var sumval = "";
-    if (showlogindetails == 1) {
+    if (showdetails == 1) {
         detval = "";
         sumval = "none";
     }
     for (var j=0; j<total; j++) {
         var counter = j+1;
-        var itemid = "logindet_"+counter;
+        var itemid = prefix+"det_"+counter;
         personele = document.getElementById(itemid);
         if (personele != null) {
             personele.style.display = detval;
         }
     }
-    var detheaderele = document.getElementById("logintitledet");
+    var detheaderele = document.getElementById(prefix+"titledet");
     if (detheaderele != null) {
         detheaderele.style.display = detval;
     }
     for (var k=0; k<sumrow; k++) {
         var counter = k+1;
-        var itemid = "loginsum_"+counter;
-        logincatele = document.getElementById(itemid);
-        if (logincatele != null) {
-            logincatele.style.display = sumval;
+        var itemid = prefix+"sum_"+counter;
+        catele = document.getElementById(itemid);
+        if (catele != null) {
+            catele.style.display = sumval;
         }
     }
-    var sumheaderele = document.getElementById("logintitlesum");
+    var sumheaderele = document.getElementById(prefix+"titlesum");
     if (sumheaderele != null) {
         sumheaderele.style.display = sumval;
     }
@@ -336,11 +421,21 @@ function togglelogins() {
 }
 // ]]>
 </script>
-';
+ENDTOGG
+            if (($checkallowed->{'crslogin'}) && ($display_settings{$cid.':crslogin'} ne 'hide')) {
+                $loadentries{'onload'} = "toggledetails('login');";
+            }
+            if (($checkallowed->{'sessions'}) && ($display_settings{$cid.':sessions'} ne 'hide')) {
+                $loadentries{'onload'} .= "toggledetails('session');";
+            }
+        }
     }
     my $course_type=&Apache::loncommon::course_type();
+    if (keys(%loadentries)) {
+        $args->{'add_entries'} = \%loadentries;
+    }
     return &Apache::loncommon::start_page("What's New?",
-					  $scripttag);
+					  $scripttag,$args);
 }
 
 #-------------------------------
@@ -352,7 +447,7 @@ function togglelogins() {
                                                                                 
 sub display_actions_box {
     my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
-        $cdom,$crs,$checkallowed) = @_;
+        $cdom,$crs,$checkallowed,$store_error) = @_;
     my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};
     my $cid = $env{'request.course.id'};
@@ -388,6 +483,8 @@ sub display_actions_box {
     my %activated;
     my %loggedin;
     my $logincount;
+    my %sessions;
+    my $sessioncount;
     my %res_title = ();
     my %show = ();
     my $needitems = 0;
@@ -427,7 +524,7 @@ sub display_actions_box {
     }
     $header .= &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>')
+              .&mt('Currently: [_1].','<span class="LC_cusr_emph">'.$currinit.'</span>')
               .'&nbsp;&nbsp;'
               .&mt('[_1]Change[_2] for just [_3]this '.$lctype.'[_4] or for [_5]all your courses/communities[_6].'
                   ,'<b>'
@@ -441,7 +538,7 @@ sub display_actions_box {
     $r->print(&Apache::loncommon::head_subbox($header));
 
     if ($command eq 'reset') {
-        $result = &process_reset($cdom,$crs);
+        $result = &process_reset($cdom,$crs,$checkallowed);
     } elsif ($command eq 'update') {
         $result = &process_update($uname,$udom,$threshold_titles);
     } elsif ($command eq 'newinterval') {
@@ -450,15 +547,8 @@ sub display_actions_box {
         $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 saving whatsnew settings: '.
-            $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
-        $result .= '<span class="LC_error">'
-                  .&mt('Unable to save visibility settings due to [_1]',
-                       $store_result)
-                  .'</span>';
+    if ($store_error) {
+        $result = $store_error;
     }
 
     if ($result) {
@@ -532,6 +622,22 @@ sub display_actions_box {
         $headings{'crslogin'} = &mt('Last login for users in last 24 hours');
     }
 
+    $timediff{'sessions'} = $display_settings{$cid.':sessionactivity'};
+    unless (defined($timediff{'sessions'})) { $timediff{'sessions'} = 7200; }
+    $interval{'sessions'} = $interval_titles->{'sessions'}->{$timediff{'sessions'}};
+
+    if ($timediff{'sessions'} == -7200) {
+        $headings{'sessions'} = &mt('Session with activity more than 2 hours ago');
+    } elsif ($timediff{'sessions'} == 7200) {
+        $headings{'sessions'} = &mt('Session with activity in last 2 hours');
+    } elsif ($timediff{'sessions'} == 1800) {
+        $headings{'sessions'} = &mt('Session with activity in last 30 minutes');
+    } elsif ($timediff{'sessions'} == 600) {
+        $headings{'sessions'} = &mt('Session with activity in last 10 minutes');
+    } elsif ($timediff{'sessions'} == 300) {
+        $headings{'sessions'} = &mt('Session with activity in last 5 minutes');
+    }
+
     my ($now,$starttime,$activatedstart,$expiredstart,$crsloginstart);
     $now = time;
 
@@ -572,7 +678,20 @@ sub display_actions_box {
 	    $threshold{'av_attempts'},$threshold{'degdiff'},
 	    '<br />',$threshold{'numstudents'});
 
-    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin');
+    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin','sessions');
+    my %actioncolumn = (
+                         handgrading      => 'left',
+                         haserrors        => 'left',
+                         abovethreshold   => 'left',
+                         versionchanges   => 'left',
+                         coursediscussion => 'right',
+                         coursenormalmail => 'right',
+                         coursecritmail   => 'right',
+                         newroles         => 'right',
+                         oldroles         => 'right',
+                         crslogin         => 'right',
+                         sessions         => 'right',
+                       );
 
     foreach my $key (keys(%{$checkallowed})) {
 	if ($key =~ /_section$/) { next; }
@@ -586,7 +705,8 @@ sub display_actions_box {
 
     foreach my $item (@actionorder) {
         unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' ||
-                $item eq 'newroles' || $item eq 'oldroles') {
+                $item eq 'newroles' || $item eq 'oldroles' || 
+                $item eq 'crslogin' || $item eq 'sessions') {
             if ($show{$item}) {
                 $needitems = 1;
                 last;
@@ -596,10 +716,10 @@ sub display_actions_box {
 
     my $itemserror;
     if ($needitems) {
-        $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
+        $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread,$checkallowed);
     }
     my $classlist;
-    if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'}) {
+    if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'} || $show{'sessions'}) {
         $classlist = &Apache::loncoursedata::get_classlist();
     }
     if ($show{'coursenormalmail'}) {
@@ -617,9 +737,16 @@ sub display_actions_box {
     if ($show{'crslogin'}) {
         $logincount = &getloggedin($cdom,$crs,\%loggedin,$crsloginstart);
     }
-    $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|);
+    if ($show{'sessions'}) {
+        $sessioncount = &getsessions($cdom,$crs,\%sessions,$timediff{'sessions'},$classlist);
+    }
+    my $showhideall = <<"END";
+<span class="LC_nobreak"><a href="javascript:changeAll('hide');">$lt{'hial'}</a>
+&nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a></span>
+END
+    $r->print(&Apache::loncommon::head_subbox($showhideall));
+    $r->print(qq|<form method="post" name="visible" action="/adm/whatsnew">\n|);
+
     foreach my $item (keys(%{$checkallowed})) {
 	if ($item =~ /_section$/) { next; }
         if ($$checkallowed{$item}) {
@@ -627,7 +754,9 @@ sub display_actions_box {
         }
     }
 
-    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" /><table class="LC_double_column"><tr><td class="LC_left_col">');
+    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" />'."\n".
+              '<div class=" LC_landmark" style="clear: both; width: 100%">'."\n".
+              '<div class="LC_floatleft LC_landmark" style="width: 48%">');
 
     my $displayed = 0;
     my $totalboxes = 0;
@@ -638,21 +767,19 @@ sub display_actions_box {
             $totalboxes ++;
         }
     }
-    my $halfway = 4;
+    my $currcolumn = 'left';
 #    my $halfway = int($totalboxes/2) + $totalboxes%2;
     foreach my $actionitem (@actionorder) {
-        if ($$checkallowed{$actionitem}) {
-            if ($displayed == $halfway) {
-                $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
+        if ($checkallowed->{$actionitem}) {
+            if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) {
+                $r->print('</div><div class="LC_floatright LC_landmark" style="width: 48%">');
+                $currcolumn = 'right';
             }
-            &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,\%loggedin,$logincount,$classlist);
+            &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,\%loggedin,$logincount,\%sessions,$sessioncount,$classlist);
             $displayed ++; 
         }
     }
-    $r->print('
-      </td>
-    </tr>
-   </table>
+    $r->print('</div></div><div style="padding:0;clear:both;margin:0;border:0"></div>
    </form>
 ');
 }
@@ -695,13 +822,18 @@ sub display_threshold_config {
         my $onchange = 'onfocus="javascript:window.document.forms'.
               "['thresholdform'].elements['".$parameter."_setparmval']".
               '.checked=true;"';
+        my $aria_textbox = ' aria-label="'.&mt('Threshold value for [_1]',
+                                               $threshold_titles{$type}).'"';
+        my $aria_checkbox = ' aria-label="'.&mt('Change threshold value for [_1]',
+                                                $threshold_titles{$type}).'"';
         $r->print(&Apache::loncommon::start_data_table_row()."\n".
                  '<td>'.$threshold_titles{$type}.'</td>'."\n".
                  '<td>'.&Apache::lonhtmlcommon::textbox($parameter.'_value',
                                             $threshold{$type},
-                                            10,$onchange).'</td>'."\n".
+                                            10,$onchange.$aria_textbox).'</td>'."\n".
                  '<td>'.
-                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+                 &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval',
+                                                  '','',$aria_checkbox).
                  '</td>'."\n".
                  &Apache::loncommon::end_data_table_row());
     }
@@ -726,6 +858,8 @@ sub display_interval_config {
         $setting = 'oldroleinterval';
     } elsif ($context eq 'newroles') {
         $setting = 'newroleinterval'; 
+    } elsif ($context eq 'sessions') {
+        $setting = 'sessionactivity';
     }
     my $lctype = lc(&Apache::loncommon::course_type());
     my $current = &get_current($env{'user.name'},$env{'user.domain'},
@@ -736,6 +870,8 @@ sub display_interval_config {
         $r->print('<br />'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'<br />');
     } elsif ($context eq 'crslogin') {
         $r->print('<br />'.&mt('Choose the time window to use to display the last login by a user in the '.$lctype).'<br />');
+    } elsif ($context eq 'sessions') {
+        $r->print('<br />'.&mt('Choose the time limit to use to display active user sessions in the '.$lctype.'.').'<br />');
     } else {
         $r->print('<br />'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'<br />');
     }
@@ -751,12 +887,19 @@ sub display_interval_config {
 <input type="hidden" name="intervaltype" value="'.$context.'" />
 <input type="hidden" name="refpage" value="'.$refpage.'" />'.
 &mt('Display:').' 
-<select name="interval">
+<select name="interval" aria-label="'.&mt('Choose time window').'">
 <option value="" selected="selected">'.&mt('Select').'</option>
 ');
     if (ref($interval_titles) eq 'HASH') {
         if (ref($interval_titles->{$context}) eq 'HASH') {
-            foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) {
+            my @sorted;
+            if ($context eq 'sessions') {
+                @sorted = sort { $a <=> $b } (keys(%{$interval_titles->{$context}}));
+                push(@sorted,shift(@sorted));
+            } else {
+                @sorted = reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})));
+            }
+            foreach my $key (@sorted) {
                 $r->print('<option value="'.$key.'">'.&mt($interval_titles->{$context}->{$key}).
                           '</option>'."\n");
             }
@@ -832,46 +975,49 @@ sub courseinit_config {
     my ($control,$current) = &curr_courseinit();
     my @chgstate = ('userpref','coursespecific');
     my @chgentry = ('firstres','whatsnew');
+    my $courseinitsty = 'display:none;';
+    if ($control eq 'coursespecific') {
+        $courseinitsty = 'display:inline;';
+    }
     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',
+                             'chce' => "Choose $lctype entry",
                              'moce' => 'Save',
     );
-    $r->print(<<"END"); 
+    $lt{'cuva'} = &mt('Current value is determined by[_1]'.$initpage->{$control}.'[_2] and is set to display[_1]'.$initpage->{$current}.'[_2].',
+                      ': <span class="LC_cusr_emph">','</span>');
+    $r->print(<<"END");
 <br />$lt{'chwp'}
-<br />$lt{'cuva'}: <b>
-$$initpage{$control}</b> $lt{'anis'} <b>
-$$initpage{$current}</b>.<br /><br />
+<br />$lt{'cuva'}
+<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;
+<fieldset style="display:inline"><legend>$lt{'padc'}</legend>
 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}.
+                   $choice.'"'.$chkstring.' onclick="toggleCourseInit(this.form);" />'.&mt($initpage->{$choice}).
                    '&nbsp;&nbsp;</label></span>');
     }
-    $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
-              ' - <br />'.$lt{'chce'}.": \n");
+    $r->print('</fieldset><fieldset id="courseinit_by_course" style="'.$courseinitsty.'">'.
+              '<legend>'.$lt{'chce'}.'</legend>'."\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>');
+                  $choice.'"'.$chkstring.'/>'.&mt($initpage->{$choice}).
+                  '&nbsp;&nbsp;</label></span> ');
     }
-    $r->print('<br /><br /><input type="submit" name="display" value="'.
+    $r->print('</fieldset><br /><br /><input type="submit" name="display" value="'.
                $lt{'moce'}.'" /></form>');
     return;
 }
@@ -901,7 +1047,8 @@ sub display_launcher {
         $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
         $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
         $interval,$countunread,$expired,$expirecount,$activated,$activecount,
-        $crstype,$itemserror,$loggedin,$logincount,$classlist) = @_;
+        $crstype,$itemserror,$loggedin,$logincount,$sessions,$sessioncount,
+        $classlist) = @_;
 
     if ($$checkallowed{$action}) {
         &start_box($r,$show,$headings,$action,$refpage);
@@ -914,7 +1061,7 @@ sub display_launcher {
                 &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror);
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
-					$res_title,$itemserror);
+					$res_title,$itemserror,$checkallowed);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
                                 $countunread,$res_title,$itemserror);
@@ -929,8 +1076,11 @@ sub display_launcher {
                 &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'},
                                      $crstype,$classlist);
             } elsif ($action eq 'crslogin') { #LAST LOGIN
-                &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'},
+                &display_activity($r,'logins',$logincount,$loggedin,$interval->{'crslogin'},
                                    $crstype,$classlist);
+            } elsif ($action eq 'sessions') { #ACTIVE SESSIONS
+                &display_activity($r,'sessions',$sessioncount,$sessions,$interval->{'sessions'},
+                                  $crstype,$classlist);
             }
         }
         &end_box($r);
@@ -941,7 +1091,7 @@ sub display_launcher {
 sub getitems {
     my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
         $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show,
-        $starttime,$countunread) = @_;
+        $starttime,$countunread,$checkallowed) = @_;
     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>';
@@ -1001,9 +1151,9 @@ sub getitems {
 # Maxtries and degree of difficulty for problem parts, unless handgradeable
         if ($$show{'abovethreshold'}) {  
             &check_thresholds($resource,$symb,\%resourcetracker,
-			      $triggered,$threshold,$warnings);
+			      $triggered,$threshold,$warnings,
+                              $checkallowed);
         }
-
     }
     return; 
 }
@@ -1034,12 +1184,28 @@ sub check_discussions {
 sub check_handgraded {
     my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;
     if ($resource->is_problem()) {
-        my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+        my ($handgradeable,$is_task);
         my $partlist=$resource->parts();
-        my $handgradeable;
-        foreach my $part (@$partlist) {
-            if ($resource->handgrade($part) eq 'yes') {
-                $handgradeable=1; last;
+        if ($resource->is_task()) {
+            $is_task = 1;
+            foreach my $part (@$partlist) {
+                if ($resource->handgrade($part) eq 'yes') {
+                    $handgradeable=1;
+                    last;
+                }
+            }
+        } else {
+            foreach my $part (@$partlist) {
+                my @types = $resource->responseType($part);
+                if (grep(/^essay$/,@types)) {
+                    $handgradeable=1;
+                    last;
+                } elsif (grep(/^custom$/,@types)) {
+                    if ($resource->handgrade($part) eq 'yes') {
+                        $handgradeable=1;
+                        last;
+                    }
+                }
             }
         }
         if ($handgradeable) {
@@ -1048,6 +1214,7 @@ sub check_handgraded {
             if (@ungraded > 0) {
                 $$ungraded{$symb}{count} = scalar(@ungraded);
                 $$ungraded{$symb}{title} = $title;
+                $$ungraded{$symb}{is_task} = $is_task;
                 if ($resource->encrypted()) {
                     $$ungraded{$symb}{'enclink'} = $resource->link();
                     $$ungraded{$symb}{'encsymb'} = $resource->shown_symb();
@@ -1075,7 +1242,8 @@ sub check_bombed {
 }
 
 sub check_thresholds {
-    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
+    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
+        $checkallowed) = @_;
 # Compile maxtries and degree of difficulty for problem parts, unless handgradeable
     my @parts = @{$resource->parts()};
     my %stats;
@@ -1141,8 +1309,14 @@ sub check_thresholds {
                      <td>'.$stats{$part}{users}.'</td>
                      <td>'.$stats{$part}{attempts}.'</td>
                      <td>'.$stats{$part}{degdiff}.'</td>
-                     <td>'.$lastreset{$part}.'</td>
-                     <td><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+                     <td>'.$lastreset{$part}.'</td>';
+                if ($checkallowed->{'resetcounters'}) {
+                    my $aria = ' aria-label="'.&mt('Reset counter for [_1] (part [_2])',
+                                                  $$triggered{$symb}{title},$part).'"';
+                    $$triggered{$symb}{text}[$partcount] .=
+                        '<td><input type="checkbox" name="'.$resetname.'"'.$aria.' />'.
+                        '<input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+                }
                 $partcount ++;
             }
             $$triggered{$symb}{numparts} = $partcount;
@@ -1164,7 +1338,7 @@ sub get_curr_thresholds {
     my $thresholdcount = 0;
     my ($tmp) = %thresholdsettings;
     unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-        foreach my $item (keys %{$threshold}) { 
+        foreach my $item (keys(%{$threshold})) { 
             if (exists($thresholdsettings{$cid.':threshold_'.$item})) {
                 $$threshold{$item} = 
                              $thresholdsettings{$cid.':threshold_'.$item};
@@ -1179,7 +1353,7 @@ sub get_curr_thresholds {
                                               $cdom,$crs,'internal.threshold');
     my ($temp) = %coursesettings;
     unless ($temp =~ /^(con_lost|error|no_such_host)/i) {  
-        foreach my $item (keys %{$threshold}) {
+        foreach my $item (keys(%{$threshold})) {
             unless (exists($thresholdsettings{$cid.':threshold_'.$item})) {
                 if (exists($coursesettings{'internal.threshold_'.$item})) {
                     $$threshold{$item} = 
@@ -1204,7 +1378,11 @@ sub get_current {
 }
 
 sub process_reset {
-    my ($dom,$crs) = @_;
+    my ($dom,$crs,$checkallowed) = @_;
+    if (!$checkallowed->{'resetcounters'}) {
+        return '<b>'.&mt('You do not have the required privileges to reset counters').
+               '</b><br />';
+    }
     my $result = '<b>'.&mt('Counters reset for following problems (and parts):').
                            '</b><br />';
     my @agg_types = ('attempts','users','correct');
@@ -1246,9 +1424,13 @@ sub process_reset {
 sub process_update {
     my ($uname,$udom,$threshold_titles) = @_;
     my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br/><br />';
-    foreach (keys %env) {
-        next if ($_!~/^form\.(.+)\_setparmval$/);
-        my $name  = $1;
+    foreach my $key (keys(%env)) {
+        my $name;
+        if ($key =~/^form\.(.+)\_setparmval$/) {
+            $name  = $1;
+        } else {
+            next;
+        }
         my $value = $env{'form.'.$name.'_value'};
         if ($name && defined($value) && ($value ne '')) {
             my $put_result = &Apache::lonnet::put('nohist_whatsnew',
@@ -1271,29 +1453,37 @@ sub process_update {
 
 sub getnormalmail {
     my ($newmsgs) = @_;
-# Check for unread mail in course
+# Check for unread messages in user's INBOX (which were sent in context of current course).
     my $msgcount = 0;
-
-    my @messages = sort(&Apache::lonnet::getkeys('nohist_email'));
-    foreach my $message (@messages) {
-	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/) {
-                if ($status eq 'new') {
-                $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-		    $msgcount ++;
-                    if ($shortsubj eq '') {
-                        $shortsubj = &mt('No subject');
+    my @messages = &Apache::lonnet::getkeys('nohist_email');
+    return $msgcount if (!@messages);
+    my %emailstatus = &Apache::lonnet::dump('email_status');
+    foreach my $msgid (sort(@messages)) {
+        if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+            my $skipstatus;
+            if ($emailstatus{$msgid} eq 'new') {
+                $skipstatus = 1;
+            }
+            my $esc_msgid = &escape($msgid);
+            my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
+                &Apache::lonmsg::unpackmsgid($esc_msgid,undef,$skipstatus,undef,
+                                             $env{'request.course.id'});
+            if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
+                if (defined($sendtime) && $sendtime!~/error/) {
+                    if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) {
+                        $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+		        $msgcount ++;
+                        if ($shortsubj eq '') {
+                            $shortsubj = &mt('No subject');
+                        }
+                        push(@{$newmsgs}, {
+                            msgid    => $esc_msgid,
+                            sendtime => $sendtime,
+                            shortsub => $shortsubj,
+                            from     => $fromname,
+                            fromdom  => $fromdom
+                            });
                     }
-                    push(@{$newmsgs}, {
-                        msgid    => $msgid,
-                        sendtime => $sendtime,
-                        shortsub => $shortsubj,
-                        from     => $fromname,
-                        fromdom  => $fromdom
-                        });
                 }
             }
         }
@@ -1303,13 +1493,15 @@ sub getnormalmail {
 
 sub getcritmail {
     my ($critmsgs) = @_; 
-# Check for critical messages in course
+# Check for critical messages which were sent in context of current course.
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
     my $critmsgcount = 0;
     foreach my $msgid (sort(keys(%what))) {
+        my $esc_msgid = &escape($msgid);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-            &Apache::lonmsg::unpackmsgid($msgid);
+            &Apache::lonmsg::unpackmsgid($esc_msgid,undef,1,undef,
+                                         $env{'request.course.id'});
         if (($fromcid) && ($fromcid eq  $env{'request.course.id'})) {
             if (defined($sendtime) && $sendtime!~/error/) {
                 $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
@@ -1318,7 +1510,7 @@ sub getcritmail {
                     $shortsubj = &mt('No subject');
                 }
                 push(@{$critmsgs}, {
-                        msgid    => $msgid,
+                        msgid    => $esc_msgid,
                         sendtime => $sendtime,
                         shortsub => $shortsubj,
                         from     => $fromname,
@@ -1563,6 +1755,78 @@ sub getloggedin {
     return $logincount;
 }
 
+sub getsessions {
+    my ($cdom,$cnum,$sessions,$lastactive,$classlist) = @_;
+    my $context = 'course';
+    my ($permission,$allowed) =
+        &Apache::lonuserutils::get_permission($context);
+    my %crs_sessions = &Apache::lonnet::get_course_sessions($cnum,$cdom,$lastactive);
+    my $sessioncount = 0;
+    if (keys(%crs_sessions) > 0) {
+        if (ref($classlist) eq 'HASH') {
+            my $viewablesec = &Apache::lonuserutils::viewable_section($permission);
+            my $secidx = &Apache::loncoursedata::CL_SECTION();
+            my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'_'.$cnum,1);
+            my %personnel;
+            foreach my $role (sort(keys(%coursepersonnel))) {
+                my ($rolecode,$section);
+                if ($role =~ /:/) {
+                    ($rolecode,$section) = split(/:/,$role);
+                } else {
+                    $rolecode = $role;
+                }
+                if ($viewablesec ne '') {
+                    next if ($viewablesec ne $section);
+                }
+                foreach my $user (split(/\,/,$coursepersonnel{$role})) {
+                    push(@{$personnel{$user}{$rolecode}},$section);
+                }
+            }
+            foreach my $key (keys(%crs_sessions)) {
+                if (exists($classlist->{$key})) {
+                    my $student = $classlist->{$key};
+                    my $section = $student->[$secidx];
+                    my $lastaccess = $crs_sessions{$key};
+                    if ($viewablesec ne '') {
+                        next if ($viewablesec ne $section);
+                    }
+                    my ($stuname,$studom) = split(/:/,$key);
+                    my %info = (
+                                 'section' => $section,
+                                 'role'    => 'st',
+                                 'uname'   => $stuname,
+                                 'udom'    => $studom,
+                    );
+                    $sessioncount ++;
+                    push(@{$sessions->{$lastaccess}},\%info);
+                } elsif (exists($personnel{$key})) {
+                    my $lastaccess = $crs_sessions{$key};
+                    my ($uname,$udom) = split(/:/,$key);
+                    if (ref($personnel{$key}) eq 'HASH') {
+                        my ($showrole,$showsec);
+                        foreach my $possrole ('cc','co','in','ta','ep','ad','st') {
+                            if (exists($personnel{$key}{$possrole})) {
+                                $showrole = $possrole;
+                                $showsec = join(', ',@{$personnel{$key}{$possrole}});
+                                last;
+                            }
+                        }
+                        my %info = (
+                                     'section' => $showsec,
+                                     'role'    => $showrole,
+                                     'uname'   => $uname,
+                                     'udom'    => $udom,
+                        );
+                        $sessioncount ++;
+                        push(@{$sessions->{$lastaccess}},\%info);
+                    }
+                }
+            }
+        }
+    }
+    return $sessioncount;
+}
+
 sub checkversions {
     my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
     my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
@@ -1611,26 +1875,50 @@ sub display_handgrade {
                         'nopr' => 'No problems require handgrading',
     );
     if (@{$tograde} > 0) {
-        $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-                  $lt{'prna'}.'</td><td class="LC_right_item">'.
-                  $lt{'nmun'}.'</td></tr>');
+        $r->print('<tr class="LC_info_row"><th class="LC_left_item">'.
+                  $lt{'prna'}.'</th><th class="LC_right_item">'.
+                  $lt{'nmun'}.'</th></tr>');
         my $rowNum = 0;
+        my $usediv; 
+        if (@{$tograde} > 1) {
+            $usediv = 1;
+        } 
         foreach my $res (@{$tograde}) {
             $rowNum ++;
             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
-            my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
-            my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&escape($res);
-            if ($$ungraded{$res}{'enclink'}) {
-                $linkurl =
-                    $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
+            my $linkurl;
+            if ($$ungraded{$res}{'is_task'}) {
+                my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
+                $linkurl=&Apache::lonnet::clutter($url);
+                $linkurl .= '?symb='.&escape($res);
+                if ($$ungraded{$res}{'enclink'}) {
+                    $linkurl =
+                        $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
+                }
+            } else {
+                $linkurl='/adm/grades';
+                if ($$ungraded{$res}{'enclink'}) {
+                    $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
+                } else {
+                    $linkurl.='?symb='.&escape($res);
+                }
+                $linkurl.='&amp;command=ungraded';
+            }
+            $r->print('<tr'.$css_class.'><td>');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print('<a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a>');
+            if ($usediv) {
+                $r->print('</div>');
             }
-            $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
+            $r->print('</td>'.
+                      '<td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
         }
     } elsif ($itemserror) {
-        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$itemserror.'</th></tr>');
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$lt{'nopr'}.'</th></tr>');
     }
 }
 
@@ -1643,27 +1931,38 @@ sub display_haserrors {
                                    noer => 'No problems with errors',
     );
     if (@{$bombs} > 0) {
-        $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-                  $lt{'reso'}.'</td><td class="LC_right_item">'.
-                  $lt{'nmer'}.'</td></tr>');
+        $r->print('<tr class="LC_info_row"><th class="LC_left_item">'.
+                  $lt{'reso'}.'</th><th class="LC_right_item">'.
+                  $lt{'nmer'}.'</th></tr>');
         @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs};
+        my $usediv;
+        if (@{$bombs} > 1) {
+            $usediv = 1;
+        }
         foreach my $bomb (@{$bombs}) {
             $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">'.
+            $r->print('<tr'.$css_class.'><td style="vertical-align:middle;">');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print($$bombed{$bomb}{errorlink});
+            if ($usediv) {
+                $r->print('</div>');
+            } 
+            $r->print('</td><td class="LC_right_item" style="vertical-align:middle;">'.
                       $$bombed{$bomb}{errorcount}.'</td></tr>');
         }
     } elsif ($itemserror) {
-        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$itemserror.'</th></tr>');
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'noer'}.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$lt{'noer'}.'</th></tr>');
     }
     return;
 }
 
 sub display_abovethreshold {
-    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror,$checkallowed) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -1678,13 +1977,19 @@ sub display_abovethreshold {
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
         $r->print('<tr class="LC_info_row">'.
-		  '<td class="LC_left_item">'.$lt{'reso'}.
-                  '<input type="hidden" name="command" value="" /></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;
+		  '<th class="LC_left_item">'.$lt{'reso'}.
+                  '<input type="hidden" name="command" value="" /></th>'.
+		  '<th>'.$lt{'part'}.'</th><th>'.$lt{'nust'}.'</th>'.
+		  '<th>'.$lt{'avat'}.'</th><th>'.$lt{'dedi'}.'</th>'.
+		  '<th>'.$lt{'lare'}.'</th>');
+        if ($checkallowed->{'resetcounters'}) {
+            $r->print('<th class="LC_right_item">'.$lt{'reco'}.'</th>');
+        }
+        $r->print('</tr>');
+	my ($usediv,$row);
+        if (@{$warnings} > 1) {
+            $usediv = 1;
+        }
         foreach my $res (@{$warnings}) {
 	    $row++;
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
@@ -1700,12 +2005,20 @@ sub display_abovethreshold {
             }
             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>');
+		      '<td class="LC_first_item" '.$rowspan.'>');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print('<a href="'.$linkurl.'">'.
+		      $$triggered{$res}{title}.'</a>');
+            if ($usediv) {
+                $r->print('</div>');
+            }
+            $r->print('</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++) {
@@ -1715,11 +2028,13 @@ sub display_abovethreshold {
                 }
             }
         }
-        $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
+        if ($checkallowed->{'resetcounters'}) {
+            $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
+        }
     } elsif ($itemserror) {
-        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$itemserror.'</th></tr>');
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$lt{'nopr'}.'</th></tr>');
     }
 }
 
@@ -1732,12 +2047,18 @@ sub display_versionchanges {
         'veru' => 'Version used',
     );
     if (keys(%{$changed}) > 0) {
-        $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>');
+        $r->print('<tr class="LC_info_row">'.
+                  '<th class="LC_left_item LC_nobreak">'.$lt{'reso'}.'</th>'.
+                  '<th class="LC_left_item LC_nobreak">'.$lt{'revd'}.'</th>'.
+                  '<th class="LC_left_item LC_nobreak">'.$lt{'newv'}.'</th>'.
+                  '<th class="LC_left_item LC_nobreak">'.$lt{'veru'}.'</th>'.
+                  '</tr>');
         my @changes = sort { &cmp_title($a,$b,$res_title) } keys(%{$changed});
         my $changenum = 0;
+        my $usediv;
+        if (@changes > 1) {
+            $usediv = 1;
+        }
         foreach my $item (@changes) {
             $changenum ++;
             my $css_class = $changenum%2?' class="LC_odd_row"':'';
@@ -1745,17 +2066,25 @@ sub display_versionchanges {
             my $linkurl=&Apache::lonnet::clutter($url);
             $linkurl .= '?symb='.&escape($item);
 
-            $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.
-                      $$res_title{$item}.'</a></td><td>'.
+            $r->print('<tr'.$css_class.'><td>');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print('<a href="'.$linkurl.'">'.
+                      $$res_title{$item}.'</a>');
+            if ($usediv) {
+                $r->print('</div>');
+            }
+            $r->print('</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>');
+        $r->print('<tr class="LC_empty_row"><th>'.$itemserror.'</th></tr>');
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'
-                 .&mt('No '.$interval).'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'
+                 .&mt('No '.$interval).'</th></tr>');
     }
     return;
 }
@@ -1772,15 +2101,19 @@ sub display_rolechanges {
     );
     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>');
+                  '<th class="LC_left_item">'.$lt{'tich'}.'</th>'.
+                  '<th class="LC_left_item">'.$lt{'user'}.'</th>'.
+                  '<th class="LC_left_item">'.$lt{'role'}.'</th>'.
+                  '<th class="LC_left_item">'.$lt{'sec'}.'</th>'.
+                  '<th class="LC_left_item">'.$lt{'status'}.'</th></tr>');
         if (ref($changed) eq 'HASH') {
             my @changes = sort { $b <=> $a } (keys(%{$changed}));
             my $changenum = 0;
             my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();
+            my $usediv;
+            if ($chgcount > 1) {
+                $usediv = 1;
+            }
             foreach my $item (@changes) {
                 if (ref($changed->{$item}) eq 'ARRAY') {
                     foreach my $chg (@{$changed->{$item}}) {
@@ -1808,7 +2141,15 @@ sub display_rolechanges {
                                 &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
                             $r->print('<tr'.$css_class.'>'.
                                       '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
-                                      '<td>'.$link.'</td>'.
+                                      '<td>');
+                            if ($usediv) {
+                                $r->print('<div class="LC_minheight">');
+                            }
+                            $r->print($link);
+                            if ($usediv) {
+                                $r->print('</div>');
+                            }
+                            $r->print('</td>'.
                                       '<td>'.$role.'</td>'.
                                       '<td>'.$section.'</td>'.
                                       '<td>'.$status.'</td></tr>');
@@ -1818,14 +2159,14 @@ sub display_rolechanges {
             }
         }
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'
-                 .&mt('There are no '.$interval).'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'
+                 .&mt('There are no '.$interval).'</th></tr>');
     }
     return;
 }
 
-sub display_crslogins {
-    my ($r,$logincount,$loggedin,$interval,$crstype,$classlist) = @_;
+sub display_activity {
+    my ($r,$context,$count,$details,$interval,$crstype,$classlist) = @_;
     return unless (ref($classlist) eq 'HASH');
     my %lt = &Apache::lonlocal::texthash(
         'user'   => 'User',
@@ -1833,29 +2174,42 @@ sub display_crslogins {
         'sec'    => 'Section',
         'number' => 'Total number of logins',
     );
-    if ($logincount) {
-
-        my $hdr = '<tr class="LC_info_row" style="display:none" id="logintitledet">'.
-                  '<td class="LC_left_item">'.$lt{'user'}.'</td>'.
-                  '<td class="LC_left_item">'.$lt{'role'}.'</td>'.
-                  '<td class="LC_left_item">'.$lt{'sec'}.'</td></tr>'.
-                  '<tr class="LC_info_row" id="logintitlesum">'.
-                  '<td class="LC_left_item">'.$lt{'number'}.'</td>'.
-                  '<td class="LC_left_item">'.$lt{'role'}.'</td>'.
-                  '<td class="LC_left_item">'.$lt{'sec'};
+    my $prefix = 'login';
+    if ($context eq 'sessions') {
+        $lt{'number'} = &mt('Total number of active user sessions');
+        $lt{'active'} = &mt('Last active');
+        $prefix = 'session';
+    }
+    if ($count) {
+
+        my $hdr = '<tr class="LC_info_row" style="display:none" id="'.$prefix.'titledet">'.
+                  '<th class="LC_left_item">'.$lt{'user'}.'</th>'.
+                  '<th class="LC_left_item">'.$lt{'role'}.'</th>'.
+                  '<th class="LC_left_item">'.$lt{'sec'}.'</th>';
+        if ($context eq 'sessions') {
+            $hdr .= '<th class="LC_left_item">'.$lt{'active'}.'</th>';
+        }
+        $hdr .= '</tr>'."\n".
+                '<tr class="LC_info_row" id="'.$prefix.'titlesum">'.
+                '<th class="LC_left_item">'.$lt{'number'}.'</th>'.
+                '<th class="LC_left_item">'.$lt{'role'}.'</th>'.
+                '<th class="LC_left_item">'.$lt{'sec'};
         my (%bylastname,%counts);
-        if (ref($loggedin) eq 'HASH') {
-            my @logins = sort { $b <=> $a } (keys(%{$loggedin}));
-            my $numlogin = 0;
+        if (ref($details) eq 'HASH') {
+            my @items = sort { $b <=> $a } (keys(%{$details}));
+            my $num = 0;
             my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();
-            foreach my $item (@logins) {
-                if (ref($loggedin->{$item}) eq 'ARRAY') {
-                    foreach my $user (@{$loggedin->{$item}}) {
+            my $usediv;
+            if ($count > 1) {
+                $usediv = 1;
+            }
+            foreach my $item (@items) {
+                if (ref($details->{$item}) eq 'ARRAY') {
+                    foreach my $user (@{$details->{$item}}) {
                         if (ref($user) eq 'HASH') {
                             my $section;
                             my $role =
                                 &Apache::lonnet::plaintext($user->{'role'},$crstype);
-                            my $status = &mt($user->{'status'});
                             if ($user->{'section'} eq '') {
                                 $section = &mt('none');
                             } else {
@@ -1872,10 +2226,21 @@ sub display_crslogins {
                             }
                             my $link =
                                 &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
-                            push(@{$bylastname{$fullname}},
-                                                          '<td>'.$link.'</td>'.
-                                                          '<td>'.$role.'</td>'.
-                                                          '<td>'.$section.'</td>');
+                            my $entry = '<td>';
+                            if ($usediv) {
+                                $entry .= '<div class="LC_minheight">';
+                            }
+                            $entry .= $link;
+                            if ($usediv) {
+                                $entry .= '</div>';
+                            }
+                            $entry .= '</td>'.
+                                      '<td>'.$role.'</td>'.
+                                      '<td>'.$section.'</td>';
+                            if ($context eq 'sessions') {
+                                $entry .= '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>';
+                            }
+                            push(@{$bylastname{$fullname}},$entry);
                         }
                     }
                 }
@@ -1884,9 +2249,9 @@ sub display_crslogins {
             foreach my $person (sort(keys(%bylastname))) {
                 if (ref($bylastname{$person}) eq 'ARRAY') {
                     foreach my $item (@{$bylastname{$person}}) {
-                        $numlogin ++;
-                        my $css_class = $numlogin%2?' class="LC_odd_row"':'';
-                        $table .= '<tr'.$css_class.' style="display:none;"  id="logindet_'.$numlogin.'">'.$item.'</tr>';
+                        $num ++;
+                        my $css_class = $num%2?' class="LC_odd_row"':'';
+                        $table .= '<tr'.$css_class.' style="display:none;"  id="'.$prefix.'det_'.$num.'">'.$item.'</tr>';
                     }
                 }
             }
@@ -1897,56 +2262,60 @@ sub display_crslogins {
                     foreach my $sec (sort { $b <=> $a } (keys(%{$counts{$role}}))) {
                         $numrow ++;
                         my $css_class = $numrow%2?' class="LC_odd_row"':'';
-                        $table .= '<tr '.$css_class.' id="loginsum_'.$numrow.'">'.
+                        $table .= '<tr '.$css_class.' id="'.$prefix.'sum_'.$numrow.'">'.
                                   '<td>'.$counts{$role}{$sec}.'</td>'.
                                   '<td>'.$showrole.'</td>'.
                                   '<td>'.$sec.'</td></tr>';
                    }
                 }
             }
-            $r->print($hdr.'<input type="hidden" name="logincount" value="'.$numlogin.
-                      '" /><input type="hidden" name="loginrow" value="'.$numrow.
-                      '" /></td></tr>'.$table);
+            $r->print($hdr.'<input type="hidden" name="'.$prefix.'count" value="'.$num.
+                      '" /><input type="hidden" name="'.$prefix.'row" value="'.$numrow.
+                      '" /></th></tr>'.$table);
         }
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.
+        $r->print('<tr class="LC_empty_row"><th>'.
                   &mt('There are no '.$interval).
-                  '<input type="hidden" name="logincount" value="'.$logincount.
-                  '." /></td></tr>');
+                  '<input type="hidden" name="'.$prefix.'count" value="'.$count.
+                  '." /></th></tr>');
     }
     return;
 }
- 
+
 sub display_coursediscussion {
     my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_;
     my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
                 'loca' => 'Location',
                 'type' => 'Type',
-                'numn' => 'Number of new posts',
+                'numn' => 'New posts',
                 'noun' => 'No unread posts in '.$lctype.' discussions',
                 'tmlp' => 'Time of last post', 
     );
     if (@{$newdiscussions} > 0) {
-        $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-                  $lt{'loca'}.'</td><td>'.
-                  $lt{'type'}.'</td>');
+        $r->print('<tr class="LC_info_row">'.
+                  '<th class="LC_left_item LC_nobreak">'.$lt{'loca'}.'</th>'.
+                  '<th class="LC_left_item LC_nobreak">'.$lt{'type'}.'</th>');
         if ($countunread eq 'on') {
-            $r->print('<td>'.$lt{'tmlp'}.'</td>'.
-                      '<td class="LC_right_item">'.$lt{'numn'}.'</td>');
+            $r->print('<th class="LC_left_item LC_nobreak">'.$lt{'tmlp'}.'</th>'.
+                      '<th class="LC_left_item LC_nobreak">'.$lt{'numn'}.'</th>');
         } else {
-            $r->print('<td class="LC_right_item">'.$lt{'tmlp'}.'</td>');
+            $r->print('<th class="LC_left_item">'.$lt{'tmlp'}.'</th>');
         }
         $r->print("</tr>\n");
         @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) }
                                                             @{$newdiscussions};
         my $rowNum = 0;
+        my $usediv;
+        if (@{$newdiscussions} > 1) {
+            $usediv = 1;
+        }
         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='.&escape($$unread{$ressymb}{symb});
+            my $disclink = $feedurl.'?symb='. &escape($$unread{$ressymb}{symb});
             if ($feedurl =~ /bulletinboard/) {
                 $type = 'Discussion Board';
             }
@@ -1956,20 +2325,29 @@ 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>'.&mt($type).'&nbsp;</td>');
+            $r->print('<tr'.$css_class.'><td>');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print('<a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;');
+            if ($usediv) {
+                $r->print('</div>');
+            }
+            $r->print('</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">'.
-                          $unreadnum.'&nbsp;</td>');
+                $r->print('<td>'.$lastpost.'</td><td class="LC_left_item">'.
+                          $unreadnum.'</td>');
             } else {
-                $r->print('<td class="LC_right_item">'.$lastpost.'</td>');
+                $r->print('<td class="LC_left_item">'.$lastpost.'</td>');
             }
             $r->print("</tr>\n");
         }
     } elsif ($itemserror) {
-        $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$itemserror.'</th></tr>');
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.$lt{'noun'}.'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.$lt{'noun'}.'</th></tr>');
     }
 }
 
@@ -1977,24 +2355,37 @@ sub display_coursenormalmail {
     my ($r,$msgcount,$newmsgs) = @_;
     my $lctype = lc(&Apache::loncommon::course_type());
     if ($msgcount > 0) {
-        $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-                  &mt('Number').'</td><td>'.&mt('Subject').'</td><td>'.
-                  &mt('Sender').'</td><td class="LC_right_item">'.
-                  &mt('Date/Time').'</td></tr>');
+        $r->print('<tr class="LC_info_row"><th class="LC_left_item">'.
+                  &mt('Number').'&nbsp;</th><th class="LC_left_item">'.
+                  &mt('Subject').'</th><th class="LC_left_item">'.
+                  &mt('Sender').'</th><th class="LC_left_item">'.
+                  &mt('Date/Time').'</th></tr>');
         my $mailcount = 0;
+        my $usediv;
+        if (@{$newmsgs}) {
+            $usediv = 1;
+        }
         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/email?display='
+                      .'.&nbsp;</td><td>');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print('<a href="/adm/email?display='
                       .$msg->{'msgid'}.'">'
-                      .$msg->{'shortsub'}.'</a>&nbsp;&nbsp;</td><td>&nbsp;'
-                      .$msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'
+                      .$msg->{'shortsub'}.'</a>&nbsp;&nbsp;');
+            if ($usediv) {
+                $r->print('</div>');
+            }
+            $r->print('</td><td>'
+                      .$msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;&nbsp;</td><td>'
                       .$msg->{'sendtime'}.'</td></tr>');
         }
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.
-                  &mt('No new '.$lctype.' messages').'</td></tr>');
+        $r->print('<tr class="LC_empty_row"><th>'.
+                  &mt('No new '.$lctype.' messages').'</th></tr>');
     }
 }
 
@@ -2002,24 +2393,37 @@ sub display_coursecritmail {
     my ($r,$critmsgcount,$critmsgs) = @_;
     my $lctype = lc(&Apache::loncommon::course_type());
     if ($critmsgcount > 0) {
-        $r->print('<tr class="LC_info_row"><td class="LC_left_item">'.
-                  &mt('Number').'</td><td>'.&mt('Subject').'</td><td>'.
-                  &mt('Sender').'</td><td class="LC_right_item">'.
-                  &mt('Date/Time').'</td></tr>');
+        $r->print('<tr class="LC_info_row"><th class="LC_left_item">'.
+                  &mt('Number').'</th><th>'.&mt('Subject').'</th><th>'.
+                  &mt('Sender').'</th><th class="LC_right_item">'.
+                  &mt('Date/Time').'</th></tr>');
         my $mailcount = 0;
+        my $usediv;
+        if (@{$critmsgs} > 1) {
+            $usediv = 1;
+        }
         foreach my $msg (@{$critmsgs}) {
             $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;'.
+                      '. &nbsp;</td>'.
+                      '<td>');
+            if ($usediv) {
+                $r->print('<div class="LC_minheight">');
+            }
+            $r->print('<a href="/adm/email?folder=critical">'.
+                      $msg->{'shortsub'}.'</a>&nbsp; &nbsp;');
+            if ($usediv) {
+                $r->print('</div>');
+            }
+            $r->print('</td><td>&nbsp;'.
                       $msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
                       $msg->{'sendtime'}.'</td></tr>');
         }
     } else {
-        $r->print('<tr class="LC_empty_row"><td>'.
+        $r->print('<tr class="LC_empty_row"><th>'.
                   &mt('No unread critical messages in '.$lctype).
-                  '</td></tr>');
+                  '</th></tr>');
     }
 }
 
@@ -2079,6 +2483,8 @@ sub store_interval_setting {
             $interval_settings{$cid.':newroleinterval'} = $env{'form.interval'};
         } elsif ($context eq 'crslogin') {
             $interval_settings{$cid.':crslogininterval'} = $env{'form.interval'};
+        } elsif ($context eq 'sessions') {
+            $interval_settings{$cid.':sessionactivity'} = $env{'form.interval'};
         } else {
             $interval_settings{$cid.':interval'} = $env{'form.interval'};
         }
@@ -2151,7 +2557,7 @@ sub store_courseinit_setting {
                     $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>'));
+                                 ,'<b>'.&mt($initpage->{$env{'form.courseinit_page'}}).'</b>'));
                 }
             } else {
                 &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
@@ -2164,7 +2570,7 @@ sub store_courseinit_setting {
                          '<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>'
+                                 ,'<b>'.&mt($initpage->{$env{'form.courseinit_page'}}).'</b>'
                                  ,'<tt>'.$outcome.'</tt>'),1);
                 }
             }
@@ -2237,11 +2643,17 @@ sub start_box {
         if ($$show{$caller}) {
             $r->print('
               <tr>
-                <td class="LC_subheader" align="left"><span class="LC_nobreak"><label><input type="radio" name="logindetails" value="0" checked="checked" onclick="javascript:togglelogins();" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="logindetails" value="1" onclick="javascript:togglelogins();" />&nbsp;'.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgcrslogininterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+                <td class="LC_subheader" align="left"><fieldset class="LC_landmark"><legend><span class="LC_visually_hidden">'.&mt('Go').'</span></legend><span class="LC_nobreak"><label><input type="radio" name="logindetails" value="0" checked="checked" onclick="javascript:toggledetails('."'login'".');" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="logindetails" value="1" onclick="javascript:toggledetails('."'login'".');" />&nbsp;'.&mt('Details').'</label></span></fieldset></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgcrslogininterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+              </tr>');
+        }
+    } elsif (($caller eq 'sessions') && ($$show{$caller})) {
+        if ($$show{$caller}) {
+            $r->print('
+              <tr>
+                <td class="LC_subheader" align="left"><fieldset class="LC_landmark"><legend><span class="LC_visually_hidden">'.&mt('Leave').'</span></legend><span class="LC_nobreak"><label><input type="radio" name="sessiondetails" value="0" checked="checked" onclick="javascript:toggledetails('."'session'".');" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="sessiondetails" value="1" onclick="javascript:toggledetails('."'session'".');" />&nbsp;'.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgsessionlimit&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
               </tr>');
         }
     }
-
     $r->print('
               <tr>
                <td colspan="2">