--- loncom/auth/lonroles.pm	2002/08/08 19:29:30	1.40
+++ loncom/auth/lonroles.pm	2002/08/31 00:43:12	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.40 2002/08/08 19:29:30 matthew Exp $
+# $Id: lonroles.pm,v 1.43 2002/08/31 00:43:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,16 +118,17 @@ sub handler {
                          &Apache::loncommon::no_cache($r);
                          $r->send_http_header;
                          my $swinfo=&Apache::lonmenu::rawconfig($r);
+                         my $bodytag=&Apache::loncommon::bodytag('Switching Role');
                          print (<<ENDREDIR);
 <head><title>Entering Course</title>
 <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$furl">
 </head>
 <html>
-<body bgcolor="#FFFFFF">
+$bodytag
 <script>
 $swinfo
 </script>
-$msg
+<h1>$msg</h1>
 </body>
 </html>
 ENDREDIR
@@ -148,11 +149,13 @@ ENDREDIR
     return OK if $r->header_only;
 
     my $swinfo=&Apache::lonmenu::rawconfig($r);
+    my $bodytag=&Apache::loncommon::bodytag('User Roles');
     $r->print(<<ENDHEADER);
 <html>
 <head>
 <title>LON-CAPA User Roles</title>
-</head><body bgcolor="#FFFFFF">
+</head>
+$bodytag
 <script>
 $swinfo
 window.focus();
@@ -186,7 +189,6 @@ ENDHEADER
         $r->print("Resource: $fn\n");
         $r->print("Action  : $msg\n</pre><hr>");
     } else {
-        $r->print("<h1>LON-CAPA User Roles</h1>");
         if ($ENV{'user.error.msg'}) {
 	    $r->print(
  '<h3><font color=red>You need to choose another user role or '.
@@ -209,8 +211,6 @@ ENDHEADER
         } 
     } else {
         if ($advanced) {
-           $r->print
-               ("<h2>$ENV{'user.name'}, Please Select a Role</h2>\n");
            $r->print("Your home server is ".
                      $Apache::lonnet::hostname{&Apache::lonnet::homeserver
                      ($ENV{'user.name'},$ENV{'user.domain'})}.
@@ -323,12 +323,15 @@ ENDHEADER
 		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
-                        $twhere=$ENV{'course.'.$tcourseid.'.description'};
+                        $twhere=
+&Apache::loncommon::syllabuswrapper($ENV{'course.'.$tcourseid.'.description'},
+$trest,$tdom);
                     } else {
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
-                            $twhere=$newhash{'description'};
+                            $twhere=
+&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom);
                         } else {
                             $twhere='Currently not available';
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
@@ -388,7 +391,7 @@ ENDHEADER
 	$r->print("</form>\n");
     }
 # ------------------------------------------------------------ Privileges Info
-  if ($advanced) {
+  if (($advanced) && (($ENV{'user.error.msg'}) || ($error))) {
     $r->print('<hr><h2>Current Privileges</h2>');
 
     foreach $envkey (sort keys %ENV) {
