From 9f3bcbfca66ea6d0b9fb60669d1937ccd1157870 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sat, 16 Apr 2016 08:16:42 -0700
Subject: [PATCH] Menu Manager work

---
 e107_admin/menus.php                |  8 ++++----
 e107_handlers/menumanager_class.php | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 468721da6..b948e2a43 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -425,7 +425,7 @@ TEMPL;
 	",'jquery');
 	
 	
-	e107::js('url',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js");
+	e107::js('footer',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js");
 	e107::js('url',	"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css");
 
 			e107::js('footer-inline','
@@ -477,14 +477,14 @@ TEMPL;
 					});*/
 
 				// http://jsfiddle.net/DT764/2/
-/*
+
 
 					$(".draggable", window.top.document).draggable({
 					//	connectToSortable: ".sortable",
 						helper: "clone",
 					//	appendTo: $(this), // ".sortable", // "#area-1", //FIXME Needs to be a specific area.
 					//	revert: "invalid",
-						containment: "parent",
+						containment: "document",
 					//	delay: 0,
 					//	revertDuration: 100,
 						cursor: "move",
@@ -497,7 +497,7 @@ TEMPL;
                        	alert(what);
                     	}
 
-					});*/
+					});
 
 				//	$( "ul, li", window.top.document ).disableSelection();
 
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 5fe3cc34b..2e786443b 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -1325,7 +1325,6 @@ class e_menuManager {
 	//	}
 		if(strstr($str, "SETSTYLE"))
 		{
-			$tmp = explode("=", $str);
 			$style = preg_replace("/\{SETSTYLE=(.*?)\}/si", "\\1", $str);
 
 			$this->style = $style;
@@ -1346,7 +1345,9 @@ class e_menuManager {
 	//	}
 		elseif(strstr($str, "NAVIGATION"))
 		{
-			echo "<span class='label label-info'>Navigation Area</span>";
+			$cust = preg_replace("/\W*\{NAVIGATION(.*?)(\+.*)?\}\W*/si", "\\1", $str);
+			$tp->parseTemplate("{NAVIGATION".$cust."}",true);
+		//	echo "<span class='label label-info'>Navigation Area</span>";
 		}
 		elseif(strstr($str, "ALERT"))
 		{
@@ -1374,12 +1375,12 @@ class e_menuManager {
 			echo $tp->parseTemplate("{SETIMAGE".$cust."}",true);
 		//	echo $this->renderPanel('Embedded Custom Menu',$cust);
 		}
-		elseif(strstr($str, "{WMESSAGE"))
+		/*elseif(strstr($str, "{WMESSAGE"))
 		{
 			echo "<div class=text style='padding: 30px; text-align: center'>[Welcome Message Area]</div>";
 		//	echo $this->renderPanel('Embedded Custom Menu',$cust);
-		}
-			elseif(strstr($str, "{FEATUREBOX"))
+		}*/
+		elseif(strstr($str, "{FEATUREBOX"))
 		{
 			echo "<div class=text style='padding: 80px; text-align: center'>[Featurebox Area]</div>";
 		//	echo $this->renderPanel('Embedded Custom Menu',$cust);