--- loncom/auth/lonroles.pm	2002/08/31 00:43:12	1.43
+++ loncom/auth/lonroles.pm	2003/02/03 18:03:52	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.43 2002/08/31 00:43:12 www Exp $
+# $Id: lonroles.pm,v 1.50 2003/02/03 18:03:52 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,9 +36,7 @@
 # 12/08,12/28,
 # YEAR=2001
 # 01/15/01 Gerd Kortemeyer
-# 02/27/01 Scott Harrison
 # 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer
-# 12/21 Scott Harrison
 # 12/29 Gerd Kortemeyer
 #
 ###
@@ -139,7 +137,7 @@ ENDREDIR
             } 
         }
     }
-        
+
 
 # =============================================================== No Roles Init
 
@@ -150,12 +148,15 @@ ENDREDIR
 
     my $swinfo=&Apache::lonmenu::rawconfig($r);
     my $bodytag=&Apache::loncommon::bodytag('User Roles');
+    my $helptag=&Apache::loncommon::help_open_topic
+     ("General_Intro","<font size='+1'><b>CLICK HERE FOR HELP</b></font>");
     $r->print(<<ENDHEADER);
 <html>
 <head>
 <title>LON-CAPA User Roles</title>
 </head>
 $bodytag
+$helptag<br />
 <script>
 $swinfo
 window.focus();
@@ -238,8 +239,10 @@ ENDHEADER
 
     foreach $envkey (sort keys %ENV) {
         my $button = 1;
+        my $switchserver='';
         if ($envkey=~/^user\.role\./) {
 	    my (undef,undef,$role,@pwhere)=split(/\./,$envkey);
+            next if (!defined($role) || $role eq '');
             my $where=join('.',@pwhere);
             my $trolecode=$role.'.'.$where;
             my ($tstart,$tend)=split(/\./,$ENV{$envkey});
@@ -247,6 +250,7 @@ ENDHEADER
             my $tstatus='is';
             my $tpstart='&nbsp;';
             my $tpend='&nbsp;';
+            my $tfont='#000000';
             if ($tstart) {
 		if ($tstart>$then) { 
                     $tstatus='future';
@@ -270,18 +274,23 @@ ENDHEADER
                 ($ENV{'form.showall'})) {
                 if ($tstatus eq 'is') {
                     $tbg='#77FF77';
+                    $tfont='#003300';
                 } elsif ($tstatus eq 'future') {
                     $tbg='#FFFF77';
+                    $button=0;
                 } elsif ($tstatus eq 'will') {
                     $tbg='#FFAA77';
                     $tremark.='Active at next login. ';
                 } elsif ($tstatus eq 'expired') {
                     $tbg='#FF7777';
+                    $tfont='#330000';
+                    $button=0;
                 } elsif ($tstatus eq 'will_not') {
                     $tbg='#AAFF77';
                     $tremark.='Expired after logout. ';
                 } elsif ($tstatus eq 'selected') {
                     $tbg='#11CC55';
+                    $tfont='#002200';
                     $tremark.='Currently selected. ';
                 }
                 my $trole;
@@ -299,7 +308,11 @@ ENDHEADER
                 # First, Co-Authorship roles
                 if ($role eq 'ca') {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
-                    $button = 0 if ($home ne $r->dir_config('lonHostID'));
+                    if ($home ne $r->dir_config('lonHostID')) {
+			$button=0;
+                        $switchserver='http://'.
+                         $Apache::lonnet::hostname{$home}.'/priv/'.$trest;
+                    }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
                     $ttype='Construction Space';
@@ -310,7 +323,12 @@ ENDHEADER
                     # Authors
                     my $home = &Apache::lonnet::homeserver
                         ($ENV{'user.name'},$ENV{'user.domain'});
-                    $button = 0 if ($home ne $r->dir_config('lonHostID'));
+                    if ($home ne $r->dir_config('lonHostID')) {
+			$button=0;
+                        $switchserver='http://'.
+                         $Apache::lonnet::hostname{$home}.'/priv/'.
+                         $ENV{'user.name'};
+                    }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
                     $ttype='Construction Space';
@@ -323,15 +341,20 @@ ENDHEADER
 		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
-                        $twhere=
-&Apache::loncommon::syllabuswrapper($ENV{'course.'.$tcourseid.'.description'},
-$trest,$tdom);
+                        $twhere=$ENV{'course.'.$tcourseid.'.description'};
+                        unless ($twhere eq 'Currently not available') {
+                           $twhere.=' <font size="-2">'.
+        &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
+                                    '</font>';
+		       }
                     } else {
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
-                            $twhere=
-&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom);
+                            $twhere=$newhash{'description'}.
+                              ' <font size="-2">'.
+        &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
+                              '</font>';
                         } else {
                             $twhere='Currently not available';
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
@@ -350,7 +373,12 @@ $trest,$tdom);
                 $r->print('<tr bgcolor='.$tbg.'>');
                 unless ($nochoose) {
                     if (!$button) {
-                        $r->print('<td>&nbsp;</td>');
+			if ($switchserver) {
+			    $r->print('<td><a href="/adm/logout?handover='.
+                              $switchserver.'">Switch Server</a></td>');
+                        } else {
+                            $r->print('<td>&nbsp;</td>');
+                        }
                     } elsif ($tstatus eq 'is') {
                         $r->print('<td><input type=submit value=Select name="'.
                                   $trolecode.'"></td>');
@@ -362,17 +390,22 @@ $trest,$tdom);
                         $r->print('<td>&nbsp;</td>');
                     }
                 }
-            $r->print('<td>'.$trole.'</td><td>'.
-		      $ttype.'</td><td>'.$twhere.'</td><td>'.$tpstart.
-                      '</td><td>'.$tpend.
-                      '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
+            $r->print('<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.'">'.$tpstart.
+                      '</font></td><td><font color="'.$tfont.'">'.$tpend.
+                      '</font></td><td><font color="'.$tfont.'">'.$tremark.
+                      '&nbsp;</font></td></tr>'."\n");
 	}
         }
     }
     my $tremark='';
+    my $tfont='#003300';
     if ($ENV{'request.role'} eq 'cm') {
 	$r->print('<tr bgcolor="#11CC55">');
         $tremark='Currently selected.';
+        $tfont='#002200';
     } else {
         $r->print('<tr bgcolor="#77FF77">');
     }
@@ -383,8 +416,9 @@ $trest,$tdom);
           $r->print('<td>&nbsp;</td>');
        }
     }
-    $r->print('<td colspan=5>No role specified'.
-                      '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
+    $r->print('<td colspan=5><font color="'.$tfont.'">No role specified'.
+      '</font></td><td><font color="'.$tfont.'">'.$tremark.
+      '&nbsp;</font></td></tr>'."\n");
 
     $r->print('</table>');
     unless ($nochoose) {
