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

Wed May 24 08:06:21 GMT 2006

Author: mark
Date: 2006-05-24 08:06:21 +0000 (Wed, 24 May 2006)
New Revision: 3456

Modified:
   plog/trunk/class/template/menu/menurenderer.class.php
   plog/trunk/templates/admin/header.template
Log:
Some refactoring.

Modified: plog/trunk/class/template/menu/menurenderer.class.php
===================================================================

--- plog/trunk/class/template/menu/menurenderer.class.php	2006-05-24 07:00:55 UTC (rev 3455)
+++ plog/trunk/class/template/menu/menurenderer.class.php	2006-05-24 08:06:21 UTC (rev 3456)
@@ -67,10 +67,7 @@
             if ( $renderFunc != "JavaScript" ) {
             	return $this->_render( $node, $depth );
             } else {
-            	$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 = "<script type=\"text/javascript\">\n";
             	$menu .= "<!-- \n";
             	$menu .= "var mainMenu = [\n";
             	$menu .= $this->_renderJS( $node, $depth );
@@ -98,14 +95,8 @@
 			$node = $this->_menu->getEntryAt( $nodePath );
 			$start = 0;
             
-            if ( $renderFunc == "JavaScriptHeader" ) {
-            	$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";
-                return $menu;
-            }
-            else if ( $renderFunc == "JavaScript" ) {
-            	$menu .= "<script type=\"text/javascript\">\n";
+			if ( $renderFunc == "JavaScript" ) {
+            	$menu = "<script type=\"text/javascript\">\n";
             	$menu .= "<!-- \n";
             	$menu .= "var mainMenu = [\n";
             	$menu .= $this->_renderJS( $node, $depth, $start, $activeOpt );

Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template	2006-05-24 07:00:55 UTC (rev 3455)
+++ plog/trunk/templates/admin/header.template	2006-05-24 08:06:21 UTC (rev 3456)
@@ -28,7 +28,9 @@
 <script type="text/javascript" src="js/prototype/prototype.js"></script>
 <script type="text/javascript" src="js/rico/rico.js"></script>
 {if $blogEnablePullDownMenu}
-   {$menu->generateAt("menu","","","JavaScriptHeader")}
+  <script type="text/javascript" src="js/JSCookMenu/JSCookMenu.js"></script>
+  <link rel="stylesheet" href="js/JSCookMenu/ThemeOffice/theme.css" type="text/css" />
+  <script type="text/javascript" src="js/JSCookMenu/ThemeOffice/theme.js"></script>
 {/if}
 </head>
 <body>

