--- loncom/interface/lonmenu.pm	2003/06/05 00:01:45	1.75
+++ loncom/interface/lonmenu.pm	2003/06/19 03:03:32	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.75 2003/06/05 00:01:45 www Exp $
+# $Id: lonmenu.pm,v 1.78 2003/06/19 03:03:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,13 +158,6 @@ ENDINLINEMENU
     }
 }
 
-# ===== Early call to LONCAPAreg for long-running pages, preferably used right 
-# ===== before $r->rflush()
-
-sub regflush {
-    return '<script type="text/javascript">'.&loadevents.'</script>';
-}
-
 # ====================================== This gets called in the header section
 
 sub registerurl {
@@ -187,30 +180,8 @@ sub registerurl {
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
-        my $loadfunction='';
-        my $inlineloadfunction='';
-        my $unloadfunction='';
-        unless (($ENV{'browser.interface'} eq 'textual') ||
-                ($ENV{'environment.remote'} eq 'off') ||
-                ($ENV{'request.publicaccess'})) {
-	    my $reopen=&Apache::lonmenu::reopenmenu();
- 	    $loadfunction='swmenu='.$reopen.'swmenu.windowloaded(self.name);window.focus();';
-            $inlineloadfunction=&regflush();
- 	    $unloadfunction='swmenu='.$reopen.'swmenu.windowunloaded(self.name);';
-        } 
-	return $result.(<<ENDFUNCTIONS);
-<script type="text/javascript">
-function LONCAPAreg() {
-   $loadfunction
-} 
-
-function LONCAPAstale() {
-   $unloadfunction
-}
-</script>
-$inlineloadfunction
-$force_title
-ENDFUNCTIONS
+ 	return $result.
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
@@ -275,7 +246,7 @@ sub innerregister {
         if 
       ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
-		$hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',
+		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
                        "gocmd('/adm/grades','submission')",
 		       'View user submissions for this assessment resource');
             }
@@ -352,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(/\&/,$_);
@@ -398,12 +376,9 @@ ENDREGTEXT
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
-swmenu=$reopen;
-swmenu.windowloaded(self.name);
 
     function LONCAPAreg() {
 	  swmenu=$reopen;
-          swmenu.windowloaded(self.name);
           swmenu.clearTimeout(swmenu.menucltim);
           $timesync
           $newmail
@@ -431,7 +406,6 @@ swmenu.windowloaded(self.name);
  '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);
-          swmenu.windowunloaded(self.name);
       }
 
 // END LON-CAPA Internal
@@ -455,7 +429,6 @@ var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen
-	  swmenu.windowloaded(self.name);
           $timesync
           swmenu.currentStale=1;
           swmenu.clearbut(2,1);
@@ -472,8 +445,6 @@ var swmenu=null;
     }
 
     function LONCAPAstale() {
- 	  swmenu=$reopen
-	  swmenu.windowunloaded(self.name);  
     }
 
 // END LON-CAPA Internal
@@ -640,7 +611,7 @@ sub switch {
 # Accessibility
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
-       $text=~s/\- //;
+       $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
         '<a href="javascript:'.$act.';">'.$text.'</a> '.
         ($nobreak?'':$desc);
@@ -648,7 +619,7 @@ sub switch {
 # Inline Remote
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
-       $text=~s/\- //;
+       $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".
          ($nobreak==3?'<td width="50%" colspan="2" align="right"':'<tr><td').
          ' bgcolor="'.$tabbg.'"'.($nobreak==1?' width="50%" colspan="2"':'').