[LON-CAPA-cvs] cvs: loncom(version_2_2_X) /interface lonmenu.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 05 Sep 2006 17:36:09 -0000
albertel Tue Sep 5 13:36:09 2006 EDT
Modified files: (Branch: version_2_2_X)
/loncom/interface lonmenu.pm
Log:
- backport 1.205
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.202 loncom/interface/lonmenu.pm:1.202.2.1
--- loncom/interface/lonmenu.pm:1.202 Fri Aug 4 14:56:19 2006
+++ loncom/interface/lonmenu.pm Tue Sep 5 13:36:09 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.202 2006/08/04 18:56:19 albertel Exp $
+# $Id: lonmenu.pm,v 1.202.2.1 2006/09/05 17:36:09 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1070,13 +1070,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)
@@ -1196,7 +1199,7 @@
+"action='/adm/annotations'>"
+"<input type='hidden' name='urlnew' value='"+currentURL+"' />"
+"<\\/form>"
- +'$end_page');
+ +'$end_page_annotate');
annotator.document.close();
}
@@ -1218,7 +1221,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();
}