From 45bb8b747737818c7cb008808b450ff63b9df281 Mon Sep 17 00:00:00 2001
From: Semias <caspar.veenings@semias.nl>
Date: Tue, 31 Jan 2012 16:48:58 +0100
Subject: [PATCH] Fixed dropdown spt expressions, menu structure when include
 in navigation is off with section index on

---
 inc/app/sitellite/html/nav/dropdown/menu.spt | 14 +++++++-------
 inc/app/sitellite/lib/nav/Dropdown.php       |  6 ++++--
 saf/lib/GUI/Menu.php                         | 19 ++++++++++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/inc/app/sitellite/html/nav/dropdown/menu.spt b/inc/app/sitellite/html/nav/dropdown/menu.spt
index c49e4c2a..488caa2a 100644
--- a/inc/app/sitellite/html/nav/dropdown/menu.spt
+++ b/inc/app/sitellite/html/nav/dropdown/menu.spt
@@ -20,18 +20,18 @@
 <div id="menu">
 <ul class="dropdown menu">
 {loop obj[list]}
-	<li class="leaf{if not empty (loop.last)} last{end if}{if not empty (loop.active)} current{end if}">
+	<li class="leaf{if not empty (loop[last])} last{end if}{if not empty (loop[active])} current{end if}">
         <a class="parent" href="{site/prefix}/index/{loop.id}" ><span>{loop.title}</span></a>
-        {if not empty (loop.submenu)}
+        {if not empty (loop[submenu])}
         <ul>
             {loop loop[submenu]}
-                <li class="{if not empty (loop.last)}last{end if}{if not empty (loop.active)} current{end if}">
-                    <a {if not empty (loop.submenu)}class="parent"{end if} href="{site/prefix}/index/{loop.id}"{active|none}><span>{loop.title}</span></a>
-                    {if not empty (loop.submenu)}
+                <li class="{if not empty (loop[last])}last{end if}{if not empty (loop[active])}current{end if}">
+                    <a {if not empty (loop[submenu])}class="parent"{end if} href="{site/prefix}/index/{loop.id}"{active|none}><span>{loop.title}</span></a>
+                    {if not empty (loop[submenu])}
                     <ul>
                         {loop loop[submenu]}
-                            <li class="{if not empty (loop.last)}last{end if}{if not empty (loop.active)} current{end if}">
-                                <a {if not empty (loop.submenu)}class="parent"{end if} href="{site/prefix}/index/{loop.id}"{active|none}><span>{loop.title}</span></a>
+                            <li class="{if not empty (loop[last])}last{end if}{if not empty (loop[active])}current{end if}">
+                                <a {if not empty (loop[submenu])}class="parent"{end if} href="{site/prefix}/index/{loop.id}"{active|none}><span>{loop.title}</span></a>
                             </li>
                         {end loop}
                     </ul>
diff --git a/inc/app/sitellite/lib/nav/Dropdown.php b/inc/app/sitellite/lib/nav/Dropdown.php
index 6c5ed3ed..8d01f4dd 100644
--- a/inc/app/sitellite/lib/nav/Dropdown.php
+++ b/inc/app/sitellite/lib/nav/Dropdown.php
@@ -12,11 +12,13 @@ function create_menu($list, $page, $submenu_disabled) {
     // Check if the submenu is enabled
    	if (!$submenu_disabled) {
 	    foreach ($list as $item) {
-	        $menu[] = create_menu_item($item, $page);
+			if($item->include != 'no')
+				$menu[] = create_menu_item($item, $page);
     	}
     } else {
 	    foreach ($list as $item) {
-	        $menu[] = create_menu_item_nosubitems($item, $page);
+			if($item->include != 'no')
+				$menu[] = create_menu_item_nosubitems($item, $page);
     	}
     }
 
diff --git a/saf/lib/GUI/Menu.php b/saf/lib/GUI/Menu.php
index e97dd05f..f2f923f7 100644
--- a/saf/lib/GUI/Menu.php
+++ b/saf/lib/GUI/Menu.php
@@ -403,7 +403,7 @@ function initTree ($tree) {
 		foreach ($tree as $k => $v) {
 			if ($v->{$this->listcolumn} == 'no') {
 			
-				// Set menu parent
+				/* Set menu parent */
 				$this->addParent (
 					$v->{$this->idcolumn},
 					$v->{$this->showcolumn},
@@ -492,12 +492,13 @@ function &addParent ($id, $title, $ref = '', $sect = '', $template = '') {
 		if (empty ($ref)) {
 			$this->tree[] =& $this->{'items_' . $id};
 		} else {
-			//$this->{'items_' . $ref}->children[] =& $this->{'items_' . $id};
+			$this->{'items_' . $ref}->children[] =& $this->{'items_' . $id};
 			$this->{'items_' . $id}->parent =& $this->{'items_' . $ref};
 		}
 
+		$this->{'items_' . $id}->include = 'no';
 		$this->{'items_' . $id}->colours = $this->colours;
-		//$this->{'items_' . $id}->is_section = ($sect == 'yes') ? true : false;
+		$this->{'items_' . $id}->is_section = ($sect == 'yes') ? true : false;
 		if (! empty ($template)) {
 			$this->{'items_' . $id}->template = $template;
 		}
@@ -879,12 +880,20 @@ function getSections ($item = false) {
 		$sections = array ();
 		foreach ($this->getChildren ($item) as $child) {
 			if ($child->is_section == 'yes') {
-				$sections[$child->id] = $child->title;
+				if($child->title != '') {
+					$sections[$child->id] = $child->title;
+				} else {
+					$sections[$child->id] = $child->id;
+				}
 			}
 			$add = $this->getSections ($child->id);
 			if (count ($add) > 0) {
 				foreach ($add as $id => $title) {
-					$sections[$id] = $title;
+					if($title != '') {
+						$sections[$id] = $title;
+					} else {
+						$sections[$id] = $id;
+					}
 				}
 			}
 		}