--- loncom/auth/lonroles.pm	2005/07/13 19:56:17	1.127
+++ loncom/auth/lonroles.pm	2005/11/08 22:08:12	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.127 2005/07/13 19:56:17 albertel Exp $
+# $Id: lonroles.pm,v 1.133 2005/11/08 22:08:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,8 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavmaps::launch_win('now');
+	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
+						    ($url eq '/adm/whatsnew'));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -243,7 +244,7 @@ ENDENTERKEY
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-				    '<h1><font color=red>'.
+				    '<h1><font color="red">'.
 			 &mt('Could not initialize course at this time.').
 		    '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
@@ -361,7 +362,7 @@ ENDHEADER
     } else {
         if ($env{'user.error.msg'}) {
 	    $r->print(
- '<h3><font color=red>'.
+ '<h3><font color="red">'.
  &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');
 	}
     }
@@ -460,7 +461,8 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='<br />'.&mt('Defined by ').$rauthor.
+		    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -478,11 +480,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                         '/adm/login?domain='.$env{'user.domain'}.
-			  '&username='.$env{'user.name'}.
-                          '&firsturl=/priv/'.$trest.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -592,10 +590,9 @@ ENDHEADER
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
     $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");
+         '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
     my $doheaders=-1;
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Domain','Construction Space','Course','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -612,6 +609,9 @@ ENDHEADER
 	foreach (sort(keys(%recent_roles))) {
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
+                if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
+		    $output .= &allcourses_row($1);
+                }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
                     $output.=&display_cc_role('user.role.'.$_);
@@ -619,7 +619,7 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("<tr><td align='center' colspan='6'><font face='arial'>".
+	    $r->print("<tr><td align='center' colspan='5'><font face='arial'>".
 		      &mt('Recent Roles')."</font></td>");
 	    $r->print($output);
 	    $r->print("</tr>");
@@ -631,7 +631,7 @@ ENDHEADER
         $r->print(&coursepick_jscript());
         $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Construction Space','Domain','Course','System') {
 	my $output;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -646,7 +646,7 @@ ENDHEADER
 	if ($output) {
 	    if ($doheaders > 0) {
 		$r->print("<tr>".
-			  "<td align='center' colspan='6'><font face='arial'>".&mt($type)."</font></td></tr>");
+			  "<td align='center' colspan='5'><font face='arial'>".&mt($type)."</font></td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -668,7 +668,7 @@ ENDHEADER
 	    $r->print('<td>&nbsp;</td>');
 	}
     }
-    $r->print('<td colspan="4"><font color="'.$tfont.'">'.&mt('No role specified').
+    $r->print('<td colspan="3"><font color="'.$tfont.'">'.&mt('No role specified').
       '</font></td><td><font color="'.$tfont.'">'.$tremark.
       '&nbsp;</font></td></tr>'."\n");
 
@@ -768,40 +768,46 @@ sub role_status {
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
     my $roletext='<tr bgcolor="'.$tbg.'">';
+    my $is_dc=($trolecode =~ m/^dc\./);
+    my $rowspan=($is_dc) ? ''
+                         : ' rowspan="2" ';
+
     unless ($nochoose) {
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td><a href="/adm/logout?handover='.
+                $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
                 $roletext.=('<td>&nbsp;</td>');
             }
         } elsif ($tstatus eq 'is') {
-            $roletext.=('<td><input type=submit value="'.
+            $roletext.=('<td'.$rowspan.'><input type=submit value="'.
                         &mt('Select').'" name="'.
                         $trolecode.'"></td>');
         } elsif ($tryagain) {
             $roletext.=
-                '<td><input type=submit value="'.
+                '<td'.$rowspan.'><input type=submit value="'.
                 &mt('Try Selecting Again').'" name="'.$trolecode.'"></td>';
         } elsif ($advanced) {
             $roletext.=
-                '<td><input type=submit value="'.
+                '<td'.$rowspan.'><input type=submit value="'.
                 &mt('Re-Initialize').'" name="'.$trolecode.'"></td>';
         } else {
-            $roletext.='<td>&nbsp;</td>';
+            $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
     $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.
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
-               '</font></td><td><font color="'.$tfont.'">'.$tremark.
-               '&nbsp;</font></td></tr>'."\n";
+               '</font></td></tr>';
+    if (!$is_dc) {
+	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'">'.$tremark.
+	    '&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+    }
     return $roletext;
 }
 
@@ -898,7 +904,7 @@ function process_pick(dom) {
         if (pickedCourse != '') {
             if (numbutton != -1) {
                 var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-                opener.document.rolechoice.elements[numbutton+1].name = courseTarget
+                opener.document.rolechoice.elements[numbutton].name = courseTarget
                 opener.document.rolechoice.submit()
             }
         }
@@ -954,19 +960,14 @@ sub allcourses_row {
     my $dcdom = shift;
     my $ccrole = Apache::lonnet::plaintext('cc');
     my $selectlink = &courselink($dcdom);
-    my $output = '<tr bgcolor="#99FF99">'.
-              '<td><input type="button" value="'.
-              &mt('Select').'" name="ccpick_'.$dcdom.'"'.
-              'onClick="verifyCoursePick(this)">'.
-              '<input type="hidden" name="pick_'.$dcdom.'" value="1"></td>'.
-              '<td><font color="#002200">'.
-              $ccrole.'</font></td>'.
-              '<td><font color="#002200">'.&mt('All courses').':<b>&nbsp;'.
-              $selectlink.'</b>'.
-              '<br />'.&mt('Domain').':'.$dcdom.'</font>'.
-              '<td colspan="3"><font color="#002200">'.
-              &mt('Course Coordinator access to all courses in domain').
-              ': <b>'.$dcdom.'</b></font></td></tr>'."\n";
+    my $output = '<tr bgcolor="#77FF77">'.
+	'<input type="hidden" name="ccpick_'.$dcdom.'" />'.
+	'<input type="hidden" name="pick_'.$dcdom.'" value="1" />'.
+	'<td colspan="5">'.
+	'<font color="#002200">'.$ccrole.'</font>'.
+	' <b>'.$selectlink.'</b>'.
+	' from '.&mt('Domain').' '.$dcdom.
+	'<tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }