--- loncom/interface/lonmenu.pm	2003/04/18 17:51:32	1.65
+++ loncom/interface/lonmenu.pm	2003/06/15 23:06:32	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.65 2003/04/18 17:51:32 www Exp $
+# $Id: lonmenu.pm,v 1.77 2003/06/15 23:06:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,7 +164,11 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+    my $force_title='';
+    if ($ENV{'request.state'} eq 'construct') {
+	$force_title=&Apache::lonxml::display_title();
+    }
     if ($target eq 'edit') {
         $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
@@ -176,13 +180,13 @@ sub registerurl {
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
-	return $result.
-         '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
+ 	return $result.
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $result.=&innerregister($forcereg,$target);
-    return $result;
+    return $result.$force_title;
 }
 
 # =========== This gets called in order to register a URL, both with the Remote
@@ -192,6 +196,7 @@ sub innerregister {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
 
@@ -318,14 +323,21 @@ sub innerregister {
 c&3&1
 s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
 s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
-s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
-s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
-s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
+c&6&3
+c&8&1
+c&8&2
 s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
 s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
 s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2
 s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
+        unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+	    $menuitems.=(<<ENDREALRES);
+s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
+s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
+ENDREALRES
+	}
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -394,7 +406,6 @@ var swmenu=null;
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
 			  2000);
-
       }
 
 // END LON-CAPA Internal
@@ -446,10 +457,12 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -562,6 +575,7 @@ ENDRESIZE
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
+self.name='loncapaclient';
 ENDOPEN
     return '<script>'.$returnval.'</script>';
 }