[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm

[albertel]

albertel		Thu Aug 31 09:25:18 2006 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - show future roles by default
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.163 loncom/auth/lonroles.pm:1.164
--- loncom/auth/lonroles.pm:1.163	Fri Jul 14 13:05:02 2006
+++ loncom/auth/lonroles.pm	Thu Aug 31 09:25:18 2006
@@ -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.164 2006/08/31 13:25:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -485,8 +485,11 @@
 		$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 +834,7 @@
                 $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="'.