--- loncom/interface/lonwhatsnew.pm	2010/08/10 03:28:53	1.98.2.3
+++ loncom/interface/lonwhatsnew.pm	2012/08/27 15:27:58	1.105.2.2
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.98.2.3 2010/08/10 03:28:53 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.105.2.2 2012/08/27 15:27:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,7 +89,7 @@ sub handler {
 
     if ( ! $env{'request.course.fn'} || ! $checkallowed{'whatsnew'}) {
         # Not in a course, or no whn priv in course
-        $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page";
+        $env{'user.error.msg'}="/adm/whatsnew:whn:0:0:Cannot display what's new page";
         return HTTP_NOT_ACCEPTABLE;
     }
 
@@ -197,10 +197,10 @@ sub display_main_box {
                     86400 => 'roles which expired since yesterday',
                    );
     my %crslogins = (
-                       -1 => 'last login for anyone who has ever logged in',
-                  2592000 => 'last login for users in last 30 days',
-                   604800 => 'last login for users in last 7 days',
-                    86400 => 'last login for users in last 24 hours',
+                       -1 => 'last logins for anyone who has ever logged in',
+                  2592000 => 'last logins for users in last 30 days',
+                   604800 => 'last logins for users in last 7 days',
+                    86400 => 'last logins for users in last 24 hours',
                    );
     my %interval_titles = (
         versions => \%versions,
@@ -237,7 +237,7 @@ sub display_main_box {
         &display_interval_config($r,$refpage,\%interval_titles,'oldroles');
     } elsif (($command eq 'chgcrslogininterval')
              && $checkallowed->{'crslogin'}) {
-        &display_interval_config($r,$refpage,\%interval_titles,'crslogin'); 
+        &display_interval_config($r,$refpage,\%interval_titles,'crslogin');
     } else {
         &display_actions_box($r,$command,$refpage,\%threshold_titles,
                         \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
@@ -263,7 +263,7 @@ sub display_header {
     
     my $scripttag;
     unless ($command eq 'chgthreshold' || $command eq 'chginterval' || 
-            $command eq 'chgoldroleinterval' || 
+            $command eq 'chgoldroleinterval' ||
             $command eq 'chgnewroleinterval' || $command eq 'chgcrslogininterval') {
        $scripttag = <<"END";
 <script type="text/javascript">
@@ -301,11 +301,11 @@ function togglelogins() {
     var sumval = "";
     if (showlogindetails == 1) {
         detval = "";
-        sumval = "none";   
+        sumval = "none";
     }
     for (var j=0; j<total; j++) {
         var counter = j+1;
-        var itemid = "logindet_"+counter; 
+        var itemid = "logindet_"+counter;
         personele = document.getElementById(itemid);
         if (personele != null) {
             personele.style.display = detval;
@@ -348,7 +348,6 @@ function togglelogins() {
 sub display_actions_box {
     my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
         $cdom,$crs,$checkallowed) = @_;
-    my $custommenu = &Apache::loncommon::needs_gci_custom();
     my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};
     my $cid = $env{'request.course.id'};
@@ -412,7 +411,7 @@ sub display_actions_box {
     }
 
     my $header = '';
-    if (($refpage eq 'start') && (!$custommenu)) {
+    if ($refpage eq 'start') {
         if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
             &GDBM_READER(),0640)) {
             my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&');
@@ -421,8 +420,7 @@ sub display_actions_box {
                   '</a></b><br />';
         }
     }
-    unless ($custommenu) {
-        $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
+    $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>')
               .'&nbsp;&nbsp;'
@@ -435,8 +433,7 @@ sub display_actions_box {
                   ,'</a>')
               .' </span>';
 
-        $r->print(&Apache::loncommon::head_subbox($header));
-    }
+    $r->print(&Apache::loncommon::head_subbox($header));
 
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
@@ -544,7 +541,6 @@ sub display_actions_box {
     if ($timediff{'oldroles'} == -1) {
         $timediff{'oldroles'} = time;
     }
-
     my $expiredstart = $now - $timediff{'oldroles'};
 
     if ($timediff{'crslogin'} == -1) {
@@ -558,24 +554,15 @@ sub display_actions_box {
         $countunread = 'on';
     }
     if ($$checkallowed{'abovethreshold'}) {
-        &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs,$custommenu);
+        &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs);
     }
 
-    if ($custommenu) {
-        $headings{'abovethreshold'} = &mt('Questions with submissions');  
-    } else {
-        $headings{'abovethreshold'} = 
-	    &mt('(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions &ge; [_4]',
-	        $threshold{'av_attempts'},$threshold{'degdiff'},
-	        '<br />',$threshold{'numstudents'});
-    }
+    $headings{'abovethreshold'} = 
+	&mt('(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions &ge; [_4]',
+	    $threshold{'av_attempts'},$threshold{'degdiff'},
+	    '<br />',$threshold{'numstudents'});
 
-    my @actionorder;
-    if ($custommenu) {
-        @actionorder = ('coursenormalmail','coursecritmail','abovethreshold','newroles','oldroles','crslogin');
-    } else {
-        @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
-    }
+    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin');
 
     foreach my $key (keys(%{$checkallowed})) {
 	if ($key =~ /_section$/) { next; }
@@ -599,7 +586,7 @@ 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,$custommenu);
+        $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
     }
     if ($show{'coursenormalmail'}) {
         $msgcount = &getnormalmail(\@newmsgs);
@@ -616,7 +603,6 @@ 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|);
@@ -627,11 +613,7 @@ sub display_actions_box {
         }
     }
 
-    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" />');
-    unless($custommenu) {
-        $r->print('</form>');
-    }
-    $r->print('<table class="LC_double_column"><tr><td class="LC_left_col">');
+    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" /><table class="LC_double_column"><tr><td class="LC_left_col">');
 
     my $displayed = 0;
     my $totalboxes = 0;
@@ -644,15 +626,12 @@ sub display_actions_box {
     }
     my $halfway = 4;
 #    my $halfway = int($totalboxes/2) + $totalboxes%2;
-    if ($custommenu) {
-        $halfway = 3;
-    }
     foreach my $actionitem (@actionorder) {
         if ($$checkallowed{$actionitem}) {
             if ($displayed == $halfway) {
                 $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
             }
-            &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,$custommenu);
+            &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);
             $displayed ++; 
         }
     }
@@ -660,10 +639,8 @@ sub display_actions_box {
       </td>
     </tr>
    </table>
+   </form>
 ');
-    if ($custommenu) {
-        $r->print("</form>\n");
-    }
 }
 
 #-------------------------------
@@ -796,14 +773,12 @@ sub display_discussion_config {
                       'off' => 'on',
                     );
     $r->print('<script type="text/javascript">
-// <![CDATA[
 function toggle_countunread(choice) {
     if (choice == "unchanged") {
         document.discussionswitch.command.value = "";
     }
     document.discussionswitch.submit();
 }
-// ]]>
 </script>');
     $r->print('<br />'
              .&mt('Choose whether or not to display a count of the number of new posts for each resource or discussion board which has unread posts.')
@@ -912,10 +887,10 @@ 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,$custommenu) = @_;
+        $crstype,$itemserror,$loggedin,$logincount) = @_;
 
     if ($$checkallowed{$action}) {
-        &start_box($r,$show,$headings,$action,$refpage,$action,$custommenu);
+        &start_box($r,$show,$headings,$action,$refpage);
         if ($$show{$action}) {
             if ($action eq 'handgrading') {    # UNGRADED ITEMS
                 &display_handgrade($r,$tograde,$ungraded,$itemserror);
@@ -925,7 +900,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,$custommenu);
+					$res_title,$itemserror);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
                                 $countunread,$res_title,$itemserror);
@@ -942,7 +917,6 @@ sub display_launcher {
             } elsif ($action eq 'crslogin') { #LAST LOGIN
                 &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'},
                                    $crstype);
-                                     
             }
         }
         &end_box($r);
@@ -953,7 +927,7 @@ sub display_launcher {
 sub getitems {
     my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
         $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show,
-        $starttime,$countunread,$custommenu) = @_;
+        $starttime,$countunread) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
         my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
@@ -1013,7 +987,7 @@ sub getitems {
 # Maxtries and degree of difficulty for problem parts, unless handgradeable
         if ($$show{'abovethreshold'}) {  
             &check_thresholds($resource,$symb,\%resourcetracker,
-			      $triggered,$threshold,$warnings,$custommenu);
+			      $triggered,$threshold,$warnings);
         }
 
     }
@@ -1087,7 +1061,7 @@ sub check_bombed {
 }
 
 sub check_thresholds {
-    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,$custommenu) = @_;
+    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
 # Compile maxtries and degree of difficulty for problem parts, unless handgradeable
     my @parts = @{$resource->parts()};
     my %stats;
@@ -1097,6 +1071,9 @@ sub check_thresholds {
         if ($resource->handgrade($part) eq 'yes') {
             next;
         }
+        if ($resource->is_anonsurvey($part)) {
+            next;
+        }
         if ($resource->is_survey($part)) {
             next;
         }
@@ -1119,6 +1096,7 @@ sub check_thresholds {
             $av_attempts = $attempts/$users;
             $av_attempts = sprintf("%.2f",$av_attempts);
         }
+        &Apache::lonnet::statslog($symb,$part,$users,$av_attempts,$degdiff);
         if ((($degdiff ne '' && $degdiff >= $$threshold{'degdiff'}) || ($av_attempts ne '' && $av_attempts >= $$threshold{'av_attempts'})) && ($users >= $$threshold{'numstudents'})) {
             $stats{$part}{degdiff} = $degdiff;
             $stats{$part}{attempts} = $av_attempts;
@@ -1145,17 +1123,12 @@ sub check_thresholds {
                     $$triggered{$symb}{text}[$partcount] = '
                      <td>'.&mt('single part').'</td>';
                 }
-                if ($custommenu) {
-                    $$triggered{$symb}{text}[$partcount] .= '
-                         <td class="LC_right_item">'.$stats{$part}{users}.'</td>';
-                } else {
-                    $$triggered{$symb}{text}[$partcount] .= '
-                         <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>';
-                }
+                $$triggered{$symb}{text}[$partcount] .= '
+                     <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>';
                 $partcount ++;
             }
             $$triggered{$symb}{numparts} = $partcount;
@@ -1166,14 +1139,7 @@ sub check_thresholds {
 
 
 sub get_curr_thresholds {
-    my ($threshold,$uname,$udom,$cid,$cdom,$crs,$custommenu) = @_;
-    if ($custommenu) {
-        %$threshold = (av_attempts => 0,
-                  degdiff => 0.00000000000000,
-                  numstudents => 1
-                  );
-        return;
-    }
+    my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_;
     # set default values
     %$threshold = (av_attempts => 2,
                   degdiff => 0.5,
@@ -1265,7 +1231,7 @@ sub process_reset {
 
 sub process_update {
     my ($uname,$udom,$threshold_titles) = @_;
-    my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br />';
+    my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br/><br />';
     foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
@@ -1276,17 +1242,17 @@ sub process_update {
            
             my ($shortname) = ($name =~ /^\Q$env{'request.course.id'}\E:threshold_(.+)$/);
             if ($put_result eq 'ok') {
-                $setoutput.=&mt('Set threshold for [_1] to [_2]',
+                $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Set threshold for [_1] to [_2]',
 				'<b>'.$$threshold_titles{$shortname}.'</b>',
-				'<b>'.$value.'</b>').'<br />';
+				'<b>'.$value.'</b>').'<br />');
 	    } else {
-                $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
+                $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
 				'<b>'.$name.'</b>','<b>'.$value.'</b>',
-				'<tt>'.$put_result.'</tt>').'<br />';
+				'<tt>'.$put_result.'</tt>').'<br />',1);
             }
         }
     }
-    return $setoutput;
+    return &Apache::loncommon::confirmwrapper($setoutput);
 }
 
 sub getnormalmail {
@@ -1301,7 +1267,6 @@ sub getnormalmail {
             &Apache::lonmsg::unpackmsgid($msgid);
         if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
             if (defined($sendtime) && $sendtime!~/error/) {
-                my $numsendtime = $sendtime;
                 if ($status eq 'new') {
                 $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
 		    $msgcount ++;
@@ -1333,7 +1298,6 @@ sub getcritmail {
             &Apache::lonmsg::unpackmsgid($msgid);
         if (($fromcid) && ($fromcid eq  $env{'request.course.id'})) {
             if (defined($sendtime) && $sendtime!~/error/) {
-                my $numsendtime = $sendtime;
                 $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
                 $critmsgcount ++;
                 if ($shortsubj eq '') {
@@ -1583,7 +1547,7 @@ sub getloggedin {
         }
     }
     return $logincount;
-} 
+}
 
 sub checkversions {
     my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
@@ -1601,7 +1565,7 @@ sub checkversions {
                                                      'lastrevisiondate');
                     $revdate =  &Apache::lonlocal::locallocaltime($revdate);
                     my $linkurl=&Apache::lonnet::clutter($key);
-                    my $usedversion=$navmap->usedVersion('version_'.$linkurl);
+                    my $usedversion=$navmap->usedVersion($linkurl);
                     my @resources = $navmap->getResourceByUrl($linkurl,1);
                     if (($usedversion) && ($usedversion ne 'mostrecent')) {
                         $version = $usedversion;     
@@ -1644,9 +1608,9 @@ sub display_handgrade {
             my $linkurl=&Apache::lonnet::clutter($url);
             $linkurl .= '?symb='.&escape($res);
             if ($$ungraded{$res}{'enclink'}) {
-                $linkurl = 
+                $linkurl =
                     $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
-            } 
+            }
             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
         }
     } elsif ($itemserror) {
@@ -1685,7 +1649,7 @@ sub display_haserrors {
 }
 
 sub display_abovethreshold {
-    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror,$custommenu) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -1699,35 +1663,16 @@ sub display_abovethreshold {
     );
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
-        if ($custommenu) {
-            my (%bynum,@overthresh);
-            foreach my $item (@{$warnings}) {
-                my ($probnum) = ($res_title->{$item} =~ /^Problem\s+(\d+)$/);
-                if ($probnum ne '') {
-                    $bynum{$probnum} = $item;
-                }
-            }
-            foreach my $num (sort { $a <=> $b } keys(%bynum)) {
-                push(@overthresh,$bynum{$num});
-            }
-            @{$warnings} = @overthresh;
-        }
-        if ($custommenu) {
-            $r->print('<tr class="LC_info_row">'.
-                      '<td class="LC_left_item">'.$lt{'reso'}.'</td>'.
-                      '<td>'.$lt{'part'}.'</td><td class="LC_right_item">'.$lt{'nust'}.'</td></tr>');
-        } else {
-            $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'.
+        $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'}.'</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>');
-        }
+        $r->print('<tr class="LC_info_row">'.
+		  '<td class="LC_left_item">'.$lt{'reso'}.'</td>'.
+		  '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
+		  '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
+		  '<td>'.$lt{'lare'}.'</td><td  class="LC_right_item">'.
+                  $lt{'reco'}.'</td></tr>');
 	my $row;
         foreach my $res (@{$warnings}) {
 	    $row++;
@@ -1759,9 +1704,7 @@ sub display_abovethreshold {
                 }
             }
         }
-        unless ($custommenu) {
-            $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>');
-        }
+        $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 {
@@ -1872,7 +1815,7 @@ sub display_crslogins {
         '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>'.
@@ -1914,18 +1857,18 @@ sub display_crslogins {
             }
             my $table;
             foreach my $person (sort(keys(%bylastname))) {
-                if (ref($bylastname{$person}) eq 'ARRAY') { 
-                    foreach my $item (@{$bylastname{$person}}) { 
+                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>'; 
+                        $table .= '<tr'.$css_class.' style="display:none;"  id="logindet_'.$numlogin.'">'.$item.'</tr>';
                     }
                 }
             }
             my $numrow = 0;
             foreach my $role (sort(keys(%counts))) {
                 my $showrole = &Apache::lonnet::plaintext($role,$crstype);
-                if (ref($counts{$role}) eq 'HASH') { 
+                if (ref($counts{$role}) eq 'HASH') {
                     foreach my $sec (sort { $b <=> $a } (keys(%{$counts{$role}}))) {
                         $numrow ++;
                         my $css_class = $numrow%2?' class="LC_odd_row"':'';
@@ -2118,19 +2061,19 @@ sub store_interval_setting {
                                              \%interval_settings,$udom,$uname);
         if ($outcome eq 'ok') {
             if (ref($interval_titles->{$context}) eq 'HASH') {
-                $result = &mt('New filter setting: [_1].','<b>'. 
-                              $interval_titles->{$context}->{$env{'form.interval'}}.'</b>').'<br />';
+                $result = &Apache::lonhtmlcommon::confirm_success(&mt('New filter setting: [_1].','<b>'. 
+                              $interval_titles->{$context}->{$env{'form.interval'}}.'</b>').'<br />');
             }
         } else {
 	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error saving whatsnew '.$context.' interval setting'.
                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
-            $result = &mt('Unable to set interval to [_1] due to [_2].',
+            $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set interval to [_1] due to [_2].',
                          '<b>'.$interval_titles->{$context}->{$env{'form.interval'}}.'</b>',
-                         '<tt>'.$outcome.'</tt>.<br />');
+                         '<tt>'.$outcome.'</tt>'),1);
         }
     }
-    return $result;
+    return &Apache::loncommon::confirmwrapper($result);
 }
 
 sub store_discussion_setting {
@@ -2142,20 +2085,20 @@ sub store_discussion_setting {
         my $outcome = &Apache::lonnet::put('nohist_whatsnew',
                                              \%discussion_settings,$udom,$uname);
         if ($outcome eq 'ok') {
-            $result = &mt('Count unread posts in discussions display set to [_1]',
-                  '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />';
+            $result = &Apache::lonhtmlcommon::confirm_success(&mt('Count unread posts in discussions display set to [_1]',
+                  '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />');
                                                                                   
         } else {
 	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error saving whatsnew countunread setting'.
                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
-            $result = &mt('Unable to set "number unread posts display" to [_1]'.
+            $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set "number unread posts display" to [_1]'.
                           ' due to [_2].',
                          '<b>'.&mt($env{'form.countunread'}).'</b>',
-                         '<tt>'.$outcome.'</tt>.<br />');
+                         '<tt>'.$outcome.'</tt>'),1);
         }
     }
-    return $result;
+    return &Apache::loncommon::confirmwrapper($result);
 }
 
 sub store_courseinit_setting {
@@ -2180,34 +2123,33 @@ 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 [_1]user's global preferences[_2].",'<b>','</b>');
+                    $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 = &mt('Page displayed after role selection in this '.$lctype.' set to [_1].'
-                                 ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>');
+                    $result = &Apache::lonhtmlcommon::confirm_success(&mt('Page displayed after role selection in this '.$lctype.' set to [_1].'
+                                 ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'));
                 }
             } else {
                 &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
                                          'setting: '.$outcome.' for '.$uname.
                                          ':'.$udom.' in '.$lctype.' '.$cid);
                 if ($page_control eq 'global preferences') {
-                    $result = &mt('Unable to set control of page display to [_1]'.
+                    $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set control of page display to [_1]'.
                           ' due to [_2].',
                          '<b>'.$page_control.'</b>',
-                         '<tt>'.$outcome.'</tt>.<br />');
+                         '<tt>'.$outcome.'</tt>'),1);
                 } else {
-                    $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].'
+                    $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].'
                                  ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'
-                                 ,'<tt>'.$outcome.'</tt>')
-                             .'<br />';
+                                 ,'<tt>'.$outcome.'</tt>'),1);
                 }
             }
         }
     }
-    return $result;
+    return &Apache::loncommon::confirmwrapper($result);
 }
 
 sub start_box {
-    my ($r,$show,$heading,$caller,$refpage,$action,$custommenu) = @_;
+    my ($r,$show,$heading,$caller,$refpage) = @_;
     my %lt = &Apache::lonlocal::texthash( 
                        chth => 'Change thresholds?',
                        chin => 'Change interval?',
@@ -2232,7 +2174,7 @@ sub start_box {
            <th class="LC_right_item">'.$showhide.'</th>
           </tr>');
      if (($caller eq 'abovethreshold') && ($$show{$caller})) {
-         if ($$show{$caller} && !$custommenu) {
+         if ($$show{$caller}) {
              $r->print('
               <tr>
                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgthreshold&amp;refpage='.$refpage.'">'.$lt{'chth'}.'</a></td>
@@ -2266,14 +2208,14 @@ sub start_box {
                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
               </tr>');
          }
-     } elsif (($caller eq 'crslogin') && ($$show{$caller})) {
-         if ($$show{$caller}) {
-             $r->print('
+    } elsif (($caller eq 'crslogin') && ($$show{$caller})) {
+        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>
               </tr>');
-         }
-     }
+        }
+    }
 
     $r->print('
               <tr>