[pLog-svn] r2804 - in plog/trunk: class/template/menu templates/admin

[mark at devel.lifetype.net]

Author: mark
Date: 2006-01-17 19:08:59 +0000 (Tue, 17 Jan 2006)
New Revision: 2804

Modified:
   plog/trunk/class/template/menu/menurenderer.class.php
   plog/trunk/templates/admin/header.template
Log:
1. change the tag in menurenderer.class.php to lower case, it will make the html source code look more consitent.

2. Change some setting of header.template for DropDownMenu

* If you would like to test drop down menu, you can add {assign var=useDropDownMenuEnabled value=1} in front of header.template 
* I will add this option to blogsetting soon.

Modified: plog/trunk/class/template/menu/menurenderer.class.php
===================================================================
--- plog/trunk/class/template/menu/menurenderer.class.php	2006-01-17 18:15:30 UTC (rev 2803)
+++ plog/trunk/class/template/menu/menurenderer.class.php	2006-01-17 19:08:59 UTC (rev 2804)
@@ -67,22 +67,17 @@
             if ( $renderFunc != "JavaScript" ) {
             	return $this->_render( $node, $depth );
             } else {
-            	$menu = "<SCRIPT LANGUAGE=\"JavaScript\" SRC=\"js/JSCookMenu/JSCookMenu.js\"></SCRIPT>\n";
-            	$menu .= "<LINK REL=\"stylesheet\" HREF=\"js/JSCookMenu/ThemeOffice/theme.css\" TYPE=\"text/css\">";
-				$menu .= "<SCRIPT LANGUAGE=\"JavaScript\" SRC=\"js/JSCookMenu/ThemeOffice/theme.js\"></SCRIPT>";
-            	$menu .= "<SCRIPT LANGUAGE=\"JavaScript\">\n";
+            	$menu = "<script type=\"text/javascript\" src=\"js/JSCookMenu/JSCookMenu.js\"></script>\n";
+            	$menu .= "<link rel=\"stylesheet\" href=\"js/JSCookMenu/ThemeOffice/theme.css\" type=\"text/css\" />\n";
+				$menu .= "<script type=\"text/javascript\" src=\"js/JSCookMenu/ThemeOffice/theme.js\"></script>\n";
+            	$menu .= "<script type=\"text/javascript\">\n";
             	$menu .= "<!-- \n";
             	$menu .= "var mainMenu = [\n";
             	$menu .= $this->_renderJS( $node, $depth );
             	$menu .= "];\n";
-            	$menu .= " -->\n";
-            	$menu .= "</SCRIPT>\n";
-            	
-            	$menu .= "<SCRIPT LANGUAGE=\"JavaScript\">\n";
-            	$menu .= "<!--\n";
 				$menu .= "cmDraw ('menu', mainMenu, 'hbr', cmThemeOffice, 'ThemeOffice');\n";
 				$menu .= "-->\n";
-				$menu .= "</SCRIPT>\n";
+				$menu .= "</script>\n";
             	
             	return $menu;
         	}
@@ -106,22 +101,17 @@
             if ( $renderFunc != "JavaScript" ) {
             	return $this->_render( $node, $depth, $activeOpt );
             } else {
-            	$menu = "<SCRIPT LANGUAGE=\"JavaScript\" SRC=\"js/JSCookMenu/JSCookMenu.js\"></SCRIPT>\n";
-            	$menu .= "<LINK REL=\"stylesheet\" HREF=\"js/JSCookMenu/ThemeOffice/theme.css\" TYPE=\"text/css\">";
-				$menu .= "<SCRIPT LANGUAGE=\"JavaScript\" SRC=\"js/JSCookMenu/ThemeOffice/theme.js\"></SCRIPT>";
-            	$menu .= "<SCRIPT LANGUAGE=\"JavaScript\">\n";
+            	$menu = "<script type=\"text/javascript\" src=\"js/JSCookMenu/JSCookMenu.js\"></script>\n";
+            	$menu .= "<link rel=\"stylesheet\" href=\"js/JSCookMenu/ThemeOffice/theme.css\" type=\"text/css\" />\n";
+				$menu .= "<script type=\"text/javascript\" src=\"js/JSCookMenu/ThemeOffice/theme.js\"></script>\n";
+            	$menu .= "<script type=\"text/javascript\">\n";
             	$menu .= "<!-- \n";
             	$menu .= "var mainMenu = [\n";
             	$menu .= $this->_renderJS( $node, $depth, $start, $activeOpt );
             	$menu .= "];\n";
-            	$menu .= " -->\n";
-            	$menu .= "</SCRIPT>\n";
-            	
-            	$menu .= "<SCRIPT LANGUAGE=\"JavaScript\">\n";
-            	$menu .= "<!--\n";
 				$menu .= "cmDraw ('menu', mainMenu, 'hbr', cmThemeOffice, 'ThemeOffice');\n";
 				$menu .= "-->\n";
-				$menu .= "</SCRIPT>\n";
+				$menu .= "</script>\n";
             	
             	return $menu;
         	}

Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template	2006-01-17 18:15:30 UTC (rev 2803)
+++ plog/trunk/templates/admin/header.template	2006-01-17 19:08:59 UTC (rev 2804)
@@ -55,10 +55,12 @@
 
     <div id="menubar">
         <div id="menu">
+        {if !$useDropDownMenuEnabled}
             {$menu->generateAt("menu",1)}
+        {/if}    
         </div>
     </div>
-    {if $useDownMenuEnabled}
+    {if $useDropDownMenuEnabled}
         {$menu->generateAt("menu","3","","JavaScript")}
     {/if}