[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 05 Sep 2006 17:35:10 -0000


albertel		Tue Sep  5 13:35:10 2006 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - need to have a end_page for each start_page
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.204 loncom/interface/lonmenu.pm:1.205
--- loncom/interface/lonmenu.pm:1.204	Mon Aug 14 05:28:56 2006
+++ loncom/interface/lonmenu.pm	Tue Sep  5 13:35:10 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.204 2006/08/14 09:28:56 foxr Exp $
+# $Id: lonmenu.pm,v 1.205 2006/09/05 17:35:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1077,13 +1077,16 @@
 					'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)
@@ -1203,7 +1206,7 @@
   +"action='/adm/annotations'>"
   +"<input type='hidden' name='urlnew' value='"+currentURL+"' />"
   +"<\\/form>"
-  +'$end_page');
+  +'$end_page_annotate');
    annotator.document.close();
 }
 
@@ -1225,7 +1228,7 @@
    +"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();
 }