--- loncom/interface/lonmenu.pm	2005/02/18 21:23:12	1.148
+++ loncom/interface/lonmenu.pm	2005/02/26 06:14:01	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.148 2005/02/18 21:23:12 albertel Exp $
+# $Id: lonmenu.pm,v 1.150 2005/02/26 06:14:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,9 @@ sub initlittle {
     return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
 				       'nav' => 'Navigate Contents',
 				       'main' => 'Main Menu',
+                                       'roles' => ($ENV{'user.adv'}?
+                                                    'Roles':'Courses'),
+                                       'exit' => 'Exit',
 				       'launch' => 'Launch Remote Control');
 }
 
@@ -72,7 +75,8 @@ sub menubuttons {
     my $titletable=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['inhibitmenu']);
-    if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
+    if (($ENV{'form.inhibitmenu'} eq 'yes') ||
+        ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
 
     my $navmaps='';
     my $reloadlink='';
@@ -103,17 +107,19 @@ ENDNAV
 <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
 ENDRELOAD
             }
-        }
+	}
         my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
 <script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
 $utility
--->
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
-$reloadlink $navmaps<br />
+$reloadlink $navmaps
+<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
+<a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+<br />
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -181,9 +187,10 @@ ENDRELOAD
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
+// <![CDATA[
 $utility
--->
+// ]]>
 </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
@@ -196,6 +203,12 @@ $navmaps
 <a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
 <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
+<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
+</td>
+<td bgcolor="$tabbg">
+<a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+</td>
+<td bgcolor="$tabbg">
 <img align="right" src="$logo" />
 <b>LON-CAPA</b></td>
 $form
@@ -296,9 +309,10 @@ sub innerregister {
     }
     if ($ENV{'request.state'} eq 'construct') {
         $newmail = $titletable;
-    }
-    if ($noremote) {
-	$newmail.='</td></tr></table></font>';
+    } else {
+	if ($noremote) {
+	    $newmail.='</td></tr></table></font>';
+	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
     my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
@@ -490,7 +504,7 @@ ENDREGTEXT
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
-// <!-- BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
 var swmenu=null;
 
     function LONCAPAreg() {
@@ -525,7 +539,7 @@ var swmenu=null;
 			  2000);
       }
 
-// END LON-CAPA Internal -->
+// END LON-CAPA Internal 
 </script>
 ENDREGTHIS
         }