--- loncom/interface/lonwhatsnew.pm	2013/03/05 23:42:37	1.105.2.5
+++ loncom/interface/lonwhatsnew.pm	2012/10/04 11:31:58	1.108
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.5 2013/03/05 23:42:37 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.108 2012/10/04 11:31:58 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -285,11 +285,6 @@ END
         $scripttag.='document.visible.submit();
 }
 
-function thresholdreset() {
-    document.visible.command.value="reset";
-    document.visible.submit();
-}
-
 function togglelogins() {
     var total = document.visible.logincount.value;
     var sumrow = document.visible.loginrow.value;
@@ -532,33 +527,28 @@ sub display_actions_box {
         $headings{'crslogin'} = &mt('Last login for users in last 24 hours');
     }
 
-    my ($now,$starttime,$activatedstart,$expiredstart,$crsloginstart);
-    $now = time;
-
+    my $now = time;
     if ($timediff{'versions'} == -1) {
-        $starttime = 0;
-    } else {
-        $starttime = $now - $timediff{'versions'};
+        $timediff{'versions'} = time;
     }
+    my $starttime = $now - $timediff{'versions'};
 
     if ($timediff{'newroles'} == -1) {
-        $activatedstart = 0;
-    } else {
-        $activatedstart = $now - $timediff{'newroles'};
+        $timediff{'newroles'} = time;
     }
+    my $activatedstart = $now - $timediff{'newroles'};
 
     if ($timediff{'oldroles'} == -1) {
-        $expiredstart = 0;
-    } else {
-        $expiredstart = $now - $timediff{'oldroles'};
+        $timediff{'oldroles'} = time;
     }
+    my $expiredstart = $now - $timediff{'oldroles'};
 
     if ($timediff{'crslogin'} == -1) {
-        $crsloginstart = 0;
-    } else {
-        $crsloginstart = $now - $timediff{'crslogin'};
+        $timediff{'crslogin'} = time;
     }
 
+    my $crsloginstart = $now - $timediff{'crslogin'};
+
     my $countunread = $display_settings{$cid.':countunread'};
     unless (defined($countunread)) {
         $countunread = 'on';
@@ -1345,26 +1335,28 @@ sub getactivated {
     my (%stucounted,%advcounted);
     my $activatedcount = 0;
     if (keys(%changes) > 0) {
-        foreach my $chg (keys(%changes)) {
+        foreach my $chg (sort { $b <=> $a } (keys(%changes))) {
             if (ref($changes{$chg}) eq 'HASH') {
-                next if ($changes{$chg}{'delflag'});
-                if ($rolechgtime > 0) {
-                    next if ($changes{$chg}{'exe_time'} < $rolechgtime);
-                }
-                if ($changes{$chg}{'exe_time'}) {
-                    my $timestamp = $changes{$chg}{'exe_time'};
+                my $timestamp = $changes{$chg}{'exe_time'};
+                if ($timestamp) {
+                    if ($rolechgtime > 0) {
+                        if ($timestamp < $rolechgtime) {
+                            last;
+                        }
+                    }
                     if (ref($changes{$chg}{'logentry'}) eq 'HASH') {
-                        my $end = $changes{$chg}{'logentry'}{'end'};
-                        next if ($end && $end <= $now);
+                        next if ($changes{$chg}{'delflag'});
                         my $start = $changes{$chg}{'logentry'}{'start'};
-                        next if ($start >= $timestamp);
+                        my $end = $changes{$chg}{'logentry'}{'end'};
                         my $section = $changes{$chg}{'logentry'}{'section'};
-                        if (($viewablesec ne '') && ($section ne '')) {
-                            next if ($viewablesec ne $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 {
@@ -1612,13 +1604,13 @@ sub display_handgrade {
         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);
+            my $linkurl='/adm/grades';
             if ($$ungraded{$res}{'enclink'}) {
-                $linkurl =
-                    $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
+                $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
+            } else {
+                $linkurl.='?symb='.&escape($res);
             }
+            $linkurl.='&command=ungraded';
             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
         }
     } elsif ($itemserror) {
@@ -1671,9 +1663,12 @@ sub display_abovethreshold {
     );
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
+        $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'.
+                ' <input type="hidden" name="command" value="reset" />'."\n".
+                ' <input type="hidden" name="refpage" value="'.$refpage.'" />'.
+                "\n");
         $r->print('<tr class="LC_info_row">'.
-		  '<td class="LC_left_item">'.$lt{'reso'}.
-                  '<input type="hidden" name="command" value="" /></td>'.
+		  '<td class="LC_left_item">'.$lt{'reso'}.'</td>'.
 		  '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
 		  '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
 		  '<td>'.$lt{'lare'}.'</td><td  class="LC_right_item">'.
@@ -1709,7 +1704,7 @@ 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>');
+        $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>');
     } elsif ($itemserror) {
         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
@@ -1926,7 +1921,7 @@ sub display_coursediscussion {
             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';
             }