--- loncom/interface/lonmenu.pm	2003/05/23 23:58:53	1.70
+++ loncom/interface/lonmenu.pm	2003/07/05 10:07:11	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.70 2003/05/23 23:58:53 www Exp $
+# $Id: lonmenu.pm,v 1.80 2003/07/05 10:07:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -180,27 +180,8 @@ sub registerurl {
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
-        my $loadfunction='';
-        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.noclient=0;';
- 	    $unloadfunction='swmenu='.$reopen.'swmenu.noclient=1;';
-        } 
-	return $result.(<<ENDFUNCTIONS);
-<script type="text/javascript">
-function LONCAPAreg() {
-   $loadfunction
-} 
-
-function LONCAPAstale() {
-   $unloadfunction
-}
-</script>
-$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 ''; }
@@ -248,7 +229,7 @@ sub innerregister {
     }
     if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?
- '<b><a href="/adm/communicate">You have new messages</a></b><br />':
+ '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
     if ($noremote) {
@@ -264,17 +245,23 @@ sub innerregister {
         my $hwkadd='';
         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',
+	    my $crs='/'.$ENV{'request.course.id'};
+	    if ($ENV{'request.course.sec'}) {
+	        $crs.='_'.$ENV{'request.course.sec'};
+	    }
+	    $crs=~s/\_/\//g;
+
+	    if (&Apache::lonnet::allowed('vgr',$crs)) {
+		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
                        "gocmd('/adm/grades','submission')",
 		       'View user submissions for this assessment resource');
             }
-	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+	    if (&Apache::lonnet::allowed('mgr',$crs)) {
 		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
             }
-	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+	    if (&Apache::lonnet::allowed('opa',$crs)) {
 		$hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
                        "gocmd('/adm/parmset','set')",
                        'Modify deadlines, etc, for this assessment resource');
@@ -342,14 +329,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,1)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+ENDREALRES
+	}
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -391,7 +385,6 @@ var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen;
-          swmenu.noclient=0;
           swmenu.clearTimeout(swmenu.menucltim);
           $timesync
           $newmail
@@ -419,7 +412,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);
-          swmenu.noclient=1;
       }
 
 // END LON-CAPA Internal
@@ -443,7 +435,6 @@ var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen
-	  swmenu.noclient=0;
           $timesync
           swmenu.currentStale=1;
           swmenu.clearbut(2,1);
@@ -460,8 +451,6 @@ var swmenu=null;
     }
 
     function LONCAPAstale() {
- 	  swmenu=$reopen
-	  swmenu.noclient=1;  
     }
 
 // END LON-CAPA Internal
@@ -592,6 +581,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>';
 }
@@ -627,7 +617,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);
@@ -635,7 +625,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"':'').