--- loncom/auth/lonroles.pm	2005/06/19 00:41:32	1.125
+++ loncom/auth/lonroles.pm	2005/07/08 10:39:49	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.125 2005/06/19 00:41:32 www Exp $
+# $Id: lonroles.pm,v 1.126 2005/07/08 10:39:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -343,7 +343,7 @@ ENDHEADER
 # --------------------------------------------------------------- Error Header?
     if ($error) {
 	$r->print("<h1>LON-CAPA Access Control</h1>");
-        $r->print("<hr><pre>Access  : ".
+        $r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
         $r->print("Action  : $msg\n</pre><hr />");
@@ -387,7 +387,7 @@ ENDHEADER
                       ($env{'user.name'},$env{'user.domain'})}.
 		      "<br />\n");
 	    $r->print(&mt(
-      "Author and Co-Author roles may not be available on servers other than your home server."));
+      "Author and Co-Author roles are not available on servers other than their respective home servers."));
         }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
@@ -430,28 +430,34 @@ ENDHEADER
 		$tstatus='selected';
             }
             my $tbg;
+	    my $tbghigh;
             if (($tstatus eq 'is') || ($tstatus eq 'selected') ||
                 ($env{'form.showall'})) {
                 if ($tstatus eq 'is') {
                     $tbg='#77FF77';
+		    $tbghigh='#99CC77';
                     $tfont='#003300';
 		    $possiblerole=$trolecode;
 		    $countactive++;
                 } elsif ($tstatus eq 'future') {
                     $tbg='#FFFF77';
+                    $tbghigh='#DDDD55';
                     $button=0;
                 } elsif ($tstatus eq 'will') {
                     $tbg='#FFAA77';
                     $tremark.=&mt('Active at next login. ');
                 } elsif ($tstatus eq 'expired') {
                     $tbg='#FF7777';
+                    $tbghigh='#EE9955';
                     $tfont='#330000';
                     $button=0;
                 } elsif ($tstatus eq 'will_not') {
                     $tbg='#AAFF77';
+                    $tbghigh='#BBDD55';
                     $tremark.=&mt('Expired after logout. ');
                 } elsif ($tstatus eq 'selected') {
                     $tbg='#11CC55';
+                    $tbghigh='339944';
                     $tfont='#002200';
 		    $inrole=1;
 		    $countactive++;
@@ -460,7 +466,7 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='<br>'.&mt('Defined by ').$rauthor.
+                    $tremark.='<br />'.&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -557,7 +563,7 @@ ENDHEADER
 		    $sortkey=$role.$twhere;
                 }
  
-                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
+                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tbghigh,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
 		$roletext{$envkey}=$roletext;
 		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
 		$sortrole{$sortkey}=$envkey;
@@ -619,8 +625,8 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='6'>".
-		      &mt('Recent Roles')."</td>");
+	    $r->print("<tr><td colspan='6'><font face='arial'>".
+		      &mt('Recent Roles')."</font></td>");
 	    $r->print($output);
 	    $r->print("</tr>");
             $doheaders ++;
@@ -645,8 +651,8 @@ ENDHEADER
 	}
 	if ($output) {
 	    if ($doheaders > 0) {
-		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='6'>".&mt($type)."</td></tr>");
+		$r->print("<tr>".
+			  "<td colspan='6'><font face='arial'>".&mt($type)."</font></td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -766,8 +772,8 @@ 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 ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tbghigh,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
+    my $roletext='<tr bgcolor="'.$tbg.'" onMouseOver="javascript:style.backgroundColor=\''.$tbghigh.'\'" onMouseOut="javascript:style.backgroundColor=\''.$tbg.'\'" >';
     unless ($nochoose) {
         if (!$button) {
             if ($switchserver) {
@@ -932,6 +938,7 @@ sub display_cc_role {
             my $trole = Apache::lonnet::plaintext('cc');
             my $twhere;
             my $tbg='#77FF77';
+	    my $tbghigh='#99CC77';
             my $tfont='#003300';
             my %newhash=&Apache::lonnet::coursedescription($tcourseid);
             if (%newhash) {
@@ -944,7 +951,7 @@ sub display_cc_role {
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
             $twhere.="<br />".&mt('Domain').":".$1;
-            $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');
+            $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tbghigh,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');
         }
     }
     return $roletext;
@@ -954,7 +961,7 @@ sub allcourses_row {
     my $dcdom = shift;
     my $ccrole = Apache::lonnet::plaintext('cc');
     my $selectlink = &courselink($dcdom);
-    my $output = '<tr bgcolor="#77FF77">'.
+    my $output = '<tr bgcolor="#99FF99" onMouseOver="javascript:style.backgroundColor=\'#BBEE99\'"  onMouseOut="javascript:style.backgroundColor=\'#99FF99\'" >'.
               '<td><input type="button" value="'.
               &mt('Select').'" name="ccpick_'.$dcdom.'"'.
               'onClick="verifyCoursePick(this)">'.