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

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-01-19 18:51:01 +0000 (Wed, 19 Jan 2005)
New Revision: 765

Modified:
   plog/trunk/class/template/menu/menurenderer.class.php
   plog/trunk/class/view/admin/admindashboardview.class.php
   plog/trunk/templates/admin/dashboard.template
Log:
completely reverted r653, as the "bread and crumbs" renderer on the top right corner wasn't working very well after this changes. Besides, the dashboard will be completely renewed any time soon and this wasn't needed anymore.

Modified: plog/trunk/class/template/menu/menurenderer.class.php
===================================================================
--- plog/trunk/class/template/menu/menurenderer.class.php	2005-01-19 18:40:55 UTC (rev 764)
+++ plog/trunk/class/template/menu/menurenderer.class.php	2005-01-19 18:51:01 UTC (rev 765)
@@ -156,7 +156,7 @@
 						else
 							$result .= $this->_locale->tr($part);
 						if( $entryId == $part ) $result .= "</b>";						
-						if( $count == 0 && $part != "menu") $result .= " > <a href=\"?op=blogSelect&amp;blogId=".$this->_blogInfo->getId()."\">".$this->_blogInfo->getBlog()."</a>";
+						if( $count == 0 ) $result .= " > <a href=\"?op=blogSelect&amp;blogId=".$this->_blogInfo->getId()."\">".$this->_blogInfo->getBlog()."</a>";
 						if( $count < $totalParts-1 ) $result .= " > ";
 					}
 					$count++;

Modified: plog/trunk/class/view/admin/admindashboardview.class.php
===================================================================
--- plog/trunk/class/view/admin/admindashboardview.class.php	2005-01-19 18:40:55 UTC (rev 764)
+++ plog/trunk/class/view/admin/admindashboardview.class.php	2005-01-19 18:51:01 UTC (rev 765)
@@ -6,7 +6,6 @@
 
 	include_once( PLOG_CLASS_PATH."class/view/view.class.php" );
     include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
-    include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
     include_once( PLOG_CLASS_PATH."class/template/menu/menurenderer.class.php" );
 	include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
 	include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
@@ -93,9 +92,6 @@
             $config =& Config::getConfig();
             $locale =& Locales::getLocale( $config->getValue( "default_locale" ));
             $this->setValue( "locale", $locale );
-            $menu =& Menu::getMenu();
-            $menuRenderer = new MenuRenderer( $menu, null, null );
-            $this->setValue( "menu", $menuRenderer );
             // assign all the values
             $template->assign( $this->_params->getAsArray());
 

Modified: plog/trunk/templates/admin/dashboard.template
===================================================================
--- plog/trunk/templates/admin/dashboard.template	2005-01-19 18:40:55 UTC (rev 764)
+++ plog/trunk/templates/admin/dashboard.template	2005-01-19 18:51:01 UTC (rev 765)
@@ -1,10 +1,4 @@
 {include file="$admintemplatepath/simpleheader.template"}
-<div id="menubar">
-  <div id="menu">
-    &nbsp;
-  </div>
-</div>
-{include file="$admintemplatepath/navigation.template" showOpt=menu title="Dashboard"}
 
   <div id="dashboard">
 	<p>