--- loncom/interface/lonmenu.pm	2007/04/17 15:45:03	1.215
+++ loncom/interface/lonmenu.pm	2007/04/24 23:26:02	1.217
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.215 2007/04/17 15:45:03 www Exp $
+# $Id: lonmenu.pm,v 1.217 2007/04/24 23:26:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -486,9 +486,14 @@ s&8&3&prt.gif&prepare[_1]&printout[_1]&g
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&&1
 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&&1
 ENDMENUITEMS
+
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
-	        $menuitems.=(<<ENDREALRES);
+		if (!$env{'request.enc'}) {
+		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+ENDREALRES
+                }
+	        $menuitems.=(<<ENDREALRES);
 s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
@@ -1233,7 +1238,7 @@ function annotate() {
    '$start_page_annotate'
   +"<form name='goannotate' target='Annotator' method='post' "
   +"action='/adm/annotations'>"
-  +"<input type='hidden' name='urlnew' value='"+currentURL+"' />"
+  +"<input type='hidden' name='symbnew' value='"+currentSymb+"' />"
   +"<\\/form>"
   +'$end_page_annotate');
    annotator.document.close();