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

Sat May 20 13:21:53 GMT 2006

Author: jondaley
Date: 2006-05-20 13:21:53 +0000 (Sat, 20 May 2006)
New Revision: 3446

Modified:
   plog/trunk/class/template/menu/menurenderer.class.php
   plog/trunk/templates/admin/header.template
Log:
more validation errors.  Had to split up the javascript menu to put the <link> (and <script>, though not necessary) in the <head> tag.  Javascript menu now validates

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

--- plog/trunk/class/template/menu/menurenderer.class.php	2006-05-20 13:19:00 UTC (rev 3445)
+++ plog/trunk/class/template/menu/menurenderer.class.php	2006-05-20 13:21:53 UTC (rev 3446)
@@ -98,12 +98,13 @@
 			$node = $this->_menu->getEntryAt( $nodePath );
 			$start = 0;
             
-            if ( $renderFunc != "JavaScript" ) {
-            	return $this->_render( $node, $depth, $activeOpt );
-            } else {
+            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";
             	$menu .= "<!-- \n";
             	$menu .= "var mainMenu = [\n";
@@ -112,8 +113,9 @@
 				$menu .= "cmDraw ('menu', mainMenu, 'hbr', cmThemeOffice, 'ThemeOffice');\n";
 				$menu .= "-->\n";
 				$menu .= "</script>\n";
-            	
             	return $menu;
+            } else {
+            	return $this->_render( $node, $depth, $activeOpt );
         	}
 		}
 

Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template	2006-05-20 13:19:00 UTC (rev 3445)
+++ plog/trunk/templates/admin/header.template	2006-05-20 13:21:53 UTC (rev 3446)
@@ -1,3 +1,4 @@
+{assign var=blogEnablePullDownMenu value=$blogsettings->getValue("pull_down_menu_enabled")}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" >
@@ -26,6 +27,9 @@
 <script type="text/javascript" src="js/cookie/cookie.js"></script>
 <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")}
+{/if}
 </head>
 <body>
 
@@ -46,20 +50,18 @@
     </div>
     <hr class="hide" />
 
-    {assign var=blogEnablePullDownMenu value=$blogsettings->getValue("pull_down_menu_enabled")}
     <div id="menubar">
         <div id="menu">
         {if !$blogEnablePullDownMenu}
-            {$menu->generateAt("menu",1)}
+          {$menu->generateAt("menu",1)}
+        {else}
+          {$menu->generateAt("menu","3","","JavaScript")}
         {/if}
         </div>
     </div>
-    {if $blogEnablePullDownMenu}
-        {$menu->generateAt("menu","3","","JavaScript")}
-    {/if}
 
    	<div style="text-align: right; padding-right: 5px;">
-   		<select name="userBlog" id="userBlog" onChange="MM_jumpMenu('parent',this,0)">
+   		<select name="userBlog" id="userBlog" onchange="MM_jumpMenu('parent',this,0)">
      	{foreach from=$userBlogs item=userBlog}
      		<option value="admin.php?op=blogSelect&amp;blogId={$userBlog->getId()}" {if $userBlog->getId() == $blog->getId()}selected="selected"{/if}>{$userBlog->getBlog()}</option>
        	{/foreach}

