[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages/bookmarkmenu admbookmarks.pm

[albertel]

albertel		Tue Apr 11 14:50:11 2006 EDT

  Modified files:              
    /loncom/html/res/adm/pages/bookmarkmenu	admbookmarks.pm 
  Log:
  - use new start_page -> frameset
  - some xhtml work
  
  
Index: loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm
diff -u loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm:1.35 loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm:1.36
--- loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm:1.35	Tue Apr 11 11:51:25 2006
+++ loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm	Tue Apr 11 14:50:10 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The bookmarks handler
 #
-# $Id: admbookmarks.pm,v 1.35 2006/04/11 15:51:25 albertel Exp $
+# $Id: admbookmarks.pm,v 1.36 2006/04/11 18:50:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,40 +79,49 @@
 </script>
 ENDJS
 
-    my $html = &Apache::lonxml::xmlbegin();
-    my $head = &Apache::loncommon::head('Bookmark Tree Viewer/Editor',$js);
-    
+    my $start_page =
+        &Apache::loncommon::start_page('Bookmark Tree Viewer/Editor',$js,
+				       {'frameset'    => 1,
+					'add_entries' => {
+					    'rows'         => "25,*,40,25,1",
+					    'topmargin'    => "0",
+					    'leftmargin'   => "0",
+					    'marginheight' => "0",
+					    'marginwidth'  => "0",
+					    'frameborder'  => "0",
+					    'border'       => "0",
+					    'framespacing' => "0",
+					    'onload'       => "javascript:buildBookmarkMenu();initialize();">}});
+    my $end_page =
+	&Apache::loncommon::end_page({'frameset'    => 1,});
+
     return(<<END_HTML) 
-$html
-$head
-<frameset rows="25, *, 40, 25, 1" topmargin="0" leftmargin="0" marginheight="0"
-          marginwidth="0" frameborder="0" border="0" framespacing="0"
-          onload="javascript:buildBookmarkMenu();initialize();">
+$start_page
  <frameset cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
  </frameset>
  <frameset cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
   <frame src="/res/adm/pages/bookmarkmenu/blank.html" marginwidth="0"
-         marginheight="0" scrolling="yes">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
+         marginheight="0" scrolling="yes" />
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
  </frameset>
  <frameset cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
   <frame src="/res/adm/pages/bookmarkmenu/bookmarkmenu_toolbar.html"
-         marginwidth="0" marginheight="0" scrolling="no">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
+         marginwidth="0" marginheight="0" scrolling="no" />
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
  </frameset>
  <frameset cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
-  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''">
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
+  <frame marginwidth="0" marginheight="0" scrolling="no" src="javascript:''" />
  </frameset>
-<frame name="closechildren" src="/res/adm/pages/bookmarkmenu/closechildren.html" noresize noscroll>
-</frameset>
-</html>
+<frame name="closechildren" noresize="noresize" noscroll="noscroll"
+       src="/res/adm/pages/bookmarkmenu/closechildren.html" />
+$end_page
 END_HTML
 }
 
@@ -127,7 +136,7 @@
 
     my $end_page =  &Apache::loncommon::end_page();
     
-    my $close = $mt('Close Window');
+    my $close = &mt('Close Window');
 
     return(<<END_ERROR)
 $start_page