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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 11 Nov 2003 00:54:57 -0000


albertel		Mon Nov 10 19:54:57 2003 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - sort classes by domains then description
  - lighten then divider bar more
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.76 loncom/auth/lonroles.pm:1.77
--- loncom/auth/lonroles.pm:1.76	Sat Nov  8 16:51:44 2003
+++ loncom/auth/lonroles.pm	Mon Nov 10 19:54:57 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.76 2003/11/08 21:51:44 albertel Exp $
+# $Id: lonroles.pm,v 1.77 2003/11/11 00:54:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -445,7 +445,7 @@
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
                         $twhere=$ENV{'course.'.$tcourseid.'.description'};
-			$sortkey=$twhere."\0".$envkey;
+			$sortkey=$tdom."\0".$twhere."\0".$envkey;
                         unless ($twhere eq &mt('Currently not available')) {
 			    $twhere.=' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -455,7 +455,8 @@
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
-			    $sortkey=$newhash{'description'}."\0".$envkey;
+			    $sortkey=$tdom."\0".$newhash{'description'}.
+				"\0".$envkey;
                             $twhere=$newhash{'description'}.
                               ' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -463,7 +464,7 @@
                         } else {
                             $twhere=&mt('Currently not available');
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
-			    $sortkey=$twhere."\0".$envkey;
+			    $sortkey=$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
@@ -540,7 +541,7 @@
 	}
 	if ($output) {
 	    if ($doheaders > 0) {
-		$r->print("<tr bgcolor='#99ff99'>".
+		$r->print("<tr bgcolor='#BBffBB'>".
 			  "<td align='center' colspan='7'>$type</td>");
 	    }
 	    $r->print($output);