--- loncom/interface/lonwhatsnew.pm	2017/05/19 19:55:09	1.105.2.14
+++ loncom/interface/lonwhatsnew.pm	2016/10/16 23:19:59	1.119
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.14 2017/05/19 19:55:09 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.119 2016/10/16 23:19:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,32 +62,14 @@ sub handler {
     my $command = $env{'form.command'};
     my $refpage = $env{'form.refpage'};
 
-    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,);
-    }
+    my %checkallowed = ( coursenormalmail => 1,
+			 coursecritmail => 1, );
     foreach my $perm_check (['whn','whatsnew',1],
 			    ['pch','coursediscussion',1],
 			    ['mgr','handgrading',1],
 			    ['vgr','abovethreshold',1],
-			    ['vgr','haserrors',1],
-			    ['whn','versionchanges',1],
+			    ['opa','haserrors',1],
+			    ['mdc','versionchanges',0],
                             ['vcl','newroles',1],
                             ['vcl','oldroles',1],
                             ['whn','crslogin',1],
@@ -175,7 +157,7 @@ sub handler {
             ("What's New?",#'Course_Action_Items_Display'
 	     ));
     }
-    &display_main_box($r,$command,$refpage,\%checkallowed,$cdom,$crs);
+    &display_main_box($r,$command,$refpage,\%checkallowed);
     return OK;
 }
 
@@ -186,7 +168,7 @@ sub handler {
 #------------------------------
                                                                                 
 sub display_main_box {
-    my ($r,$command,$refpage,$checkallowed,$cdom,$crs) = @_;
+    my ($r,$command,$refpage,$checkallowed) = @_;
     my $domain=&Apache::loncommon::determinedomain();
     my $function = &Apache::loncommon::get_users_function();
     my $lctype = lc(&Apache::loncommon::course_type());
@@ -233,10 +215,13 @@ sub display_main_box {
                      userpref => 'your general user preferences',
                      coursespecific => "specific setting for this $lctype",
                    );
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     if (($command eq 'chgthreshold') 
 	&& $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');
@@ -589,18 +574,6 @@ sub display_actions_box {
 	    '<br />',$threshold{'numstudents'});
 
     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin');
-    my %actioncolumn = (
-                         handgrading      => 'left',
-                         haserrors        => 'left',
-                         abovethreshold   => 'left',
-                         versionchanges   => 'left',
-                         coursediscussion => 'right',
-                         coursenormalmail => 'right',
-                         coursecritmail   => 'right',
-                         newroles         => 'right',
-                         oldroles         => 'right',
-                         crslogin         => 'right',
-                       );
 
     foreach my $key (keys(%{$checkallowed})) {
 	if ($key =~ /_section$/) { next; }
@@ -666,13 +639,12 @@ sub display_actions_box {
             $totalboxes ++;
         }
     }
-    my $currcolumn = 'left';
+    my $halfway = 4;
 #    my $halfway = int($totalboxes/2) + $totalboxes%2;
     foreach my $actionitem (@actionorder) {
-        if ($checkallowed->{$actionitem}) {
-            if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) { 
+        if ($$checkallowed{$actionitem}) {
+            if ($displayed == $halfway) {
                 $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
-                $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);
             $displayed ++; 
@@ -1173,8 +1145,8 @@ sub check_thresholds {
                      <td>'.$stats{$part}{attempts}.'</td>
                      <td>'.$stats{$part}{degdiff}.'</td>
                      <td>'.$lastreset{$part}.'</td>';
-                if ($checkallowed->{'resetcounters'}) {
-                    $$triggered{$symb}{text}[$partcount] .=
+                if ($checkallowed->{'resetcounters'}) {   
+                    $$triggered{$symb}{text}[$partcount] .= 
                         '<td><input type="checkbox" name="'.$resetname.'" />'.
                         '<input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
                 }
@@ -1241,8 +1213,8 @@ sub get_current {
 sub process_reset {
     my ($dom,$crs,$checkallowed) = @_;
     if (!$checkallowed->{'resetcounters'}) {
-        return '<b>'.&mt('You do not have the required privileges to reset counters').
-               '</b><br />';
+        return '<b>'.&mt('You do not the required privileges to reset counters').
+               '</b><br />'; 
     }
     my $result = '<b>'.&mt('Counters reset for following problems (and parts):').
                            '</b><br />';
@@ -1332,7 +1304,7 @@ sub getnormalmail {
                 if (defined($sendtime) && $sendtime!~/error/) {
                     if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) {
                         $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-                        $msgcount ++;
+		        $msgcount ++;
                         if ($shortsubj eq '') {
                             $shortsubj = &mt('No subject');
                         }
@@ -1669,13 +1641,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.='&amp;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) {
@@ -1769,7 +1741,7 @@ sub display_abovethreshold {
                 }
             }
         }
-        if ($checkallowed->{'resetcounters'}) {
+        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) {
@@ -2002,7 +1974,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';
             }