--- loncom/auth/lonroles.pm	2006/07/14 17:05:02	1.163
+++ loncom/auth/lonroles.pm	2006/10/20 19:59:57	1.168
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.163 2006/07/14 17:05:02 www Exp $
+# $Id: lonroles.pm,v 1.168 2006/10/20 19:59:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::lonhtmlcommon;
 use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
+use Apache::lonnavdisplay();
 use GDBM_File;
 use LONCAPA;
  
@@ -53,8 +54,8 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
-						  ($url =~ m-^/adm/whatsnew-));
+	$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
+						       ($url =~ m-^/adm/whatsnew-));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -485,8 +486,11 @@ ENDHEADER
 		$tstatus='selected';
             }
             my $tbg;
-            if (($tstatus eq 'is') || ($tstatus eq 'selected') ||
-                ($env{'form.showall'})) {
+            if (($tstatus eq 'is') 
+		|| ($tstatus eq 'selected') 
+		|| ($tstatus eq 'will') 
+		|| ($tstatus eq 'future') 
+                || ($env{'form.showall'})) {
                 if ($tstatus eq 'is') {
                     $tbg='#77FF77';
                     $tfont='#003300';
@@ -831,7 +835,7 @@ sub build_roletext {
                 $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
-                $roletext.=('<td>&nbsp;</td>');
+                $roletext.=('<td'.$rowspan.'>&nbsp;</td>');
             }
         } elsif ($tstatus eq 'is') {
             $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
@@ -851,9 +855,10 @@ sub build_roletext {
             $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
-    $tremark.=&Apache::lonannounce::showday(time,1,
-                 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
-
+    if ($trolecode !~ m/^(dc|ca|au|aa)\./) {
+	$tremark.=&Apache::lonannounce::showday(time,1,
+			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
+    }
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
 	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
@@ -1033,7 +1038,9 @@ sub set_privileges {
     my $area = '/'.$dcdom.'/'.$pickedcourse;
     my $role = 'cc';
     my $spec = $role.'.'.$area;
-    my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$env{'user.name'});
+    my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',
+						  $env{'user.domain'},
+						  $env{'user.name'});
     my %ccrole = ();
     &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
     my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);