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

[albertel]

albertel		Tue Apr 11 11:46:55 2006 EDT

  Modified files:              
    /loncom/html/res/adm/pages/bookmarkmenu	admbookmarks.pm 
  Log:
  - xhtmlize
  
  
Index: loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm
diff -u loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm:1.33 loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm:1.34
--- loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm:1.33	Tue Apr 11 11:39:31 2006
+++ loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm	Tue Apr 11 11:46:54 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The bookmarks handler
 #
-# $Id: admbookmarks.pm,v 1.33 2006/04/11 15:39:31 albertel Exp $
+# $Id: admbookmarks.pm,v 1.34 2006/04/11 15:46:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,18 +61,18 @@
 sub construct_editor {
     my ($bookmarks) = @_;
     my $js = <<ENDJS;
-<script src="/res/adm/pages/bookmarkmenu/bookmarklib.js" language="JavaScript"></script>
+<script src="/res/adm/pages/bookmarkmenu/bookmarklib.js" type="text/javascript"></script>
 
-<script LANGUAGE="JavaScript">
+<script type="text/javascript">
 function initialize() {
 window.tree = new newTree();
-//-------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 //                         The FOLLOWING data is supplied by the Perl Module
-//-------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 $bookmarks
-//-------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 //                         The PRECEDING data is supplied by the Perl Module
-//-------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 window.tree.redraw();
 }
 </script>
@@ -84,29 +84,33 @@
     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();">
- <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:''">
- </FRAMESET>
- <FRAMESET cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
-  <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:''">
- </FRAMESET>
- <FRAMESET cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
-  <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:''">
- </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:''">
- </FRAMESET>
-<frame name=closechildren src="/res/adm/pages/bookmarkmenu/closechildren.html" noresize noscroll>
-</FRAMESET>
+<frameset rows="25, *, 40, 25, 1" topmargin="0" leftmargin="0" marginheight="0"
+          marginwidth="0" frameborder="0" border="0" framespacing="0"
+          onload="javascript:buildBookmarkMenu();initialize();">
+ <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:''">
+ </frameset>
+ <frameset cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
+  <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:''">
+ </frameset>
+ <frameset cols="25, *, 25" frameborder="0" borders="0" framespacing="0">
+  <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:''">
+ </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:''">
+ </frameset>
+<frame name="closechildren" src="/res/adm/pages/bookmarkmenu/closechildren.html" noresize noscroll>
+</frameset>
 </html>
 END_HTML
 }
@@ -133,7 +137,7 @@
   </table>
   <center>
    <form>
-    <input type=button name="close" value="close window" onClick="javascript:window.close();">
+    <input type="button" name="close" value="close window" onClick="javascript:window.close();" />
    </form>
   </center>
 $end_page
@@ -176,7 +180,7 @@
     $bookmarks .= "window.tree.bookmarks.addLink(\"$title\",\"$location\");\n";
 #	$marks{'bookmarks'} += qq/\nwindow.tree.bookmarks.addlink("$title","$location");\n/;
     &write_bookmarks($bookmarks);
-    my $page="$start_page $bookmarks<p>Bookmarks successfully saved<script language=\"JavaScript\">window.close()</script> $end_page";
+    my $page="$start_page $bookmarks<p>Bookmarks successfully saved</p><script type=\"text/javascript\">window.close()</script> $end_page";
     return($page);
 }