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

[albertel]

albertel		Sun Jun  5 03:57:30 2005 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - bug #3193, column 3 is a bit spurious
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.120 loncom/auth/lonroles.pm:1.121
--- loncom/auth/lonroles.pm:1.120	Sun Jun  5 03:10:32 2005
+++ loncom/auth/lonroles.pm	Sun Jun  5 03:57:28 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.120 2005/06/05 07:10:32 albertel Exp $
+# $Id: lonroles.pm,v 1.121 2005/06/05 07:57:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -511,9 +511,6 @@
 		    $sortkey=$role;
                 } elsif ($trest) {
                     $ttype='Course';
-                    if ($tsection) {
-                        $ttype.='<br>'.&mt('Section/Group').': '.$tsection;
-		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
@@ -538,6 +535,10 @@
 			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
+                    if ($tsection) {
+                        $twhere.='<br />'.&mt('Section/Group').': '.$tsection;
+		    }
+
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
@@ -583,7 +584,7 @@
     }
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
-    $r->print('<th>'.&mt('User Role').'</th><th colspan=2>'.&mt('Extent').
+    $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
 	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
     my $doheaders=-1;
@@ -611,7 +612,7 @@
             } 
 	}
 	if ($output) {
-	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='7'>".
+	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='6'>".
 		      &mt('Recent Roles')."</td>");
 	    $r->print($output);
 	    $r->print("</tr>");
@@ -638,7 +639,7 @@
 	if ($output) {
 	    if ($doheaders > 0) {
 		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='7'>".&mt($type)."</td></tr>");
+			  "<td align='center' colspan='6'>".&mt($type)."</td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -660,7 +661,7 @@
 	    $r->print('<td>&nbsp;</td>');
 	}
     }
-    $r->print('<td colspan=5><font color="'.$tfont.'">'.&mt('No role specified').
+    $r->print('<td colspan="4"><font color="'.$tfont.'">'.&mt('No role specified').
       '</font></td><td><font color="'.$tfont.'">'.$tremark.
       '&nbsp;</font></td></tr>'."\n");
 
@@ -789,8 +790,7 @@
 
 
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
-               '</font></td><td><font color="'.$tfont.'">'.$ttype.
-               '</font></td><td><font color="'.$tfont.'">'.$twhere.
+	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
                '</font></td><td><font color="'.$tfont.'">'.$tremark.
@@ -953,11 +953,11 @@
               'onClick="verifyCoursePick(this)">'.
               '<input type="hidden" name="pick_'.$dcdom.'" value="1"></td>'.
               '<td><font color="#002200">'.
-              $ccrole.'</font></td><td>'.&mt('Course').'</td>'.
+              $ccrole.'</font></td>'.
               '<td><font color="#002200">'.&mt('All courses').':<b>&nbsp;'.
               $selectlink.'</b>'.
               '<br />'.&mt('Domain').':'.$dcdom.'</font>'.
-              '<td colspan="4"><font color="#002200">'.
+              '<td colspan="3"><font color="#002200">'.
               &mt('Course Coordinator access to all courses in domain').
               ': <b>'.$dcdom.'</b></font></td></tr>'."\n";
     return $output;