Changeset 1818 for plugins/apostrophePlugin/branches/features/css/lib/navigation/aNavigationAccordion.class.php

Timestamp:

07/21/10 16:35:10 (22 months ago)

Author:

johnnyoffline

Message:

merged the latest changes in the trunk into my branch including any new CSS since revision 1717. The new CSS introduced was moved to the new locations in the split files. I am keeping this feature branch alive ladies and gents :)

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• . (modified) (1 prop)
• lib/navigation/aNavigationAccordion.class.php (modified) (3 diffs)

plugins/apostrophePlugin/branches/features/css/lib/navigation/aNavigationAccordion.class.php

@@ -3 +3 @@
 class aNavigationAccordion extends aNavigation
 {
-  protected $cssClass = 'a-nav-item'; 
+  protected $cssClass = 'a-nav-item';
 
   public function buildNavigation()
@@ -10 +10 @@
     if($this->active['slug'] != $this->root['slug'])
     {
-      $this->rootInfo = $this->active->getAccordionInfo(false, null, $this->root['slug']);
+      $this->rootInfo = $this->active->getAccordionInfo($this->livingOnly, null, $this->root['slug']);
     }else
     {
-      $this->rootInfo = $this->root->getTreeInfo(false, 1);
+      $this->rootInfo = $this->root->getTreeInfo($this->livingOnly, 1);
     }
     // This rootInfo is already an array of kids
@@ -23 +23 @@
     $this->traverse($this->nav);
   }
-  
+
   public function getNav()
   {
     return $this->nav;
   }
-  
+
 }