--- loncom/interface/lonmenu.pm	2006/08/14 09:11:55	1.203
+++ loncom/interface/lonmenu.pm	2006/09/05 17:35:10	1.205
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.203 2006/08/14 09:11:55 foxr Exp $
+# $Id: lonmenu.pm,v 1.205 2006/09/05 17:35:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -499,7 +499,6 @@ ENDREALRES
 s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
 	}
-        &Apache::lonnet::logthis("Menu items:\n$menuitems\n");
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -509,7 +508,6 @@ ENDMENUITEMS
                 $buttons.=&clear(@rest);
             }
         }
-	&Apache::lonnet::logthis("buttons = $buttons");
 
         if ($textual) {
 	    my $addremote=0;
@@ -531,7 +529,6 @@ ENDMENUITEMS
 ENDINLINE
                 }
 	    }
-	    &Apache::lonnet::logthis("Inline:\n $inlinebuttons \n");
 	    $result =(<<ENDREGTEXT);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -1080,13 +1077,16 @@ sub utilityfunctions {
 					'add_entries' => {
 					    'onload' => 'javascript:document.goannotate.submit();'}});
 
+    my $end_page_annotate = 
+        &Apache::loncommon::end_page({'js_ready' => 1});
+
     my $start_page_bookmark = 
         &Apache::loncommon::start_page('Bookmarks',undef,
 				       {'only_body' => 1,
 					'js_ready'  => 1,
 					'bgcolor'   => '#BBBBBB',});
 
-    my $end_page = 
+    my $end_page_bookmark = 
         &Apache::loncommon::end_page({'js_ready' => 1});
 
 return (<<ENDUTILITY)
@@ -1206,7 +1206,7 @@ function annotate() {
   +"action='/adm/annotations'>"
   +"<input type='hidden' name='urlnew' value='"+currentURL+"' />"
   +"<\\/form>"
-  +'$end_page');
+  +'$end_page_annotate');
    annotator.document.close();
 }
 
@@ -1228,7 +1228,7 @@ function set_bookmark() {
    +"value='Save' /> <input type='button' value='Close (no save)' "
    +"onclick='javascript:window.close();' /><\\/center><\\/td>"
    +"<\\/tr><\\/table><\\/form><\\/center>"
-   +'$end_page' );
+   +'$end_page_bookmark' );
    bmquery.document.close();
 }