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

[ork at devel.plogworld.net]

Author: ork
Date: 2005-01-03 12:05:20 +0000 (Mon, 03 Jan 2005)
New Revision: 653

Modified:
   plog/trunk/class/template/menu/menurenderer.class.php
   plog/trunk/class/view/admin/admindashboardview.class.php
   plog/trunk/styles/admin.css
   plog/trunk/templates/admin/dashboard.template
Log:
changed dashboard to look more like all other admin pages.
added empty top level navigation bar and navigation.template 
added some padding to the content section for the dashboard


Modified: plog/trunk/class/template/menu/menurenderer.class.php
===================================================================
--- plog/trunk/class/template/menu/menurenderer.class.php	2005-01-03 01:42:16 UTC (rev 652)
+++ plog/trunk/class/template/menu/menurenderer.class.php	2005-01-03 12:05:20 UTC (rev 653)
@@ -156,7 +156,7 @@
 						else
 							$result .= $this->_locale->tr($part);
 						if( $entryId == $part ) $result .= "</b>";						
-						if( $count == 0 ) $result .= " > <a href=\"?op=blogSelect&amp;blogId=".$this->_blogInfo->getId()."\">".$this->_blogInfo->getBlog()."</a>";
+						if( $count == 0 && $part != "menu") $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-03 01:42:16 UTC (rev 652)
+++ plog/trunk/class/view/admin/admindashboardview.class.php	2005-01-03 12:05:20 UTC (rev 653)
@@ -6,6 +6,7 @@
 
 	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/dao/articles.class.php" );
 	include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
 	include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
@@ -91,6 +92,9 @@
             $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/styles/admin.css
===================================================================
--- plog/trunk/styles/admin.css	2005-01-03 01:42:16 UTC (rev 652)
+++ plog/trunk/styles/admin.css	2005-01-03 12:05:20 UTC (rev 653)
@@ -47,6 +47,12 @@
     padding          : 0;
 }
 
+#dashboard 
+{
+    padding-left     : 1em;
+    padding-right    : 1em;
+}
+
 .clr
 {
     clear            : both;
@@ -666,4 +672,4 @@
 
 .welcomeMessage {
   margin-bottom: 10px;
-}
\ No newline at end of file
+}

Modified: plog/trunk/templates/admin/dashboard.template
===================================================================
--- plog/trunk/templates/admin/dashboard.template	2005-01-03 01:42:16 UTC (rev 652)
+++ plog/trunk/templates/admin/dashboard.template	2005-01-03 12:05:20 UTC (rev 653)
@@ -1,5 +1,12 @@
 {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>
 	 <b>this is the dashboard/summary. Please click a blog title to proceed to administrate
 	 the blog. Click the "Dashboard" link at any moment to come back here and select another blog</b>
@@ -47,5 +54,6 @@
 	 <br/>
 	 <hr />
 	{/foreach}
+  </div>
 	
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}