From 661c6e721941402135f2f52c655502559f81c31f Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Mon, 17 Dec 2012 13:21:43 -0800
Subject: [PATCH] Fix for menu-manager issue

---
 e107_admin/header.php               | 15 +++++--------
 e107_admin/menus.php                | 34 ++++++++++++++++-------------
 e107_handlers/menumanager_class.php | 12 ++++++----
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/e107_admin/header.php b/e107_admin/header.php
index 3459b710c..a170f685e 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -35,16 +35,15 @@ else
 	require_once (e_BASE.$e107->getFolder('themes').'templates/admin_template.php');
 }
 
-
-e107::js('core', 	'colorbox/jquery.colorbox-min.js', 'jquery', 2);
-e107::css('core', 	'colorbox/colorbox.css', 'jquery');
+if(e_PAGE != 'menus.php') // Quick fix for Menu Manager inactive drop-down problem. 
+{
+	e107::js('core', 	'colorbox/jquery.colorbox-min.js', 'jquery', 2);
+	e107::css('core', 	'colorbox/colorbox.css', 'jquery');
+}
 
 e107::js('core', 	'jquery.elastic.js', 'jquery', 2);
 e107::js('core', 	'jquery-ui-timepicker-addon.js', 'jquery', 2);
 
-//e107::js('core', 	'plupload/plupload.full.js', 'jquery', 2);
-//e107::css('core', 	'plupload/jquery.plupload.queue/css/jquery.plupload.queue.css', 'jquery');
-//e107::js('core', 	'plupload/jquery.plupload.queue/jquery.plupload.queue.js', 'jquery', 2);
 
 e107::css('core', 	'chosen/chosen.css', 'jquery');
 e107::js('core', 	'chosen/chosen.jquery.min.js', 'jquery', 2);
@@ -52,10 +51,6 @@ e107::js('core', 	'chosen/chosen.jquery.min.js', 'jquery', 2);
 e107::js('core', 	'password/jquery.pwdMeter.js', 'jquery', 2);
 
 
-// e107::js("core",	"core/mediaManager.js","jquery",3);
-//e107::js("core",	"tooltip/jquery.tipsy.js","jquery",3);
-//e107::css('core', 	'tooltip/tipsy.css', 'jquery');
-
 e107::js("core",	"tags/jquery.tagit.js","jquery",3);
 e107::css('core', 	'tags/jquery.tagit.css', 'jquery');
 
diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index c4055324d..f829d985b 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -32,35 +32,39 @@ e107::coreLan('menus', true);
 e107::coreLan('admin', true);
 
 // FIXME - quick temporarry fix for missing icons on menu administration. We need different core style to be included (forced) here - e.g. e107_web/css/admin/sprite.css
-if(e_IFRAME)
+if(e_IFRAME) //<-- Check config and delete buttons if modifying
 {
+
+//e107::js('core','bootstrap/js/bootstrap.min.js');
+//e107::css('core','bootstrap/css/bootstrap.min.css');
 	e107::css('url','{e_THEME}/bootstrap/admin_style.css');
+
 }
 
 if(strpos(e_QUERY, 'configure') !== FALSE )
 {
 	
-	e107::js('core', 	'colorbox/jquery.colorbox-min.js', 'jquery', 2);
-	e107::css('core', 	'colorbox/colorbox.css', 'jquery');
+	//e107::js('core', 	'colorbox/jquery.colorbox-min.js', 'jquery', 2);
+	//e107::css('core', 	'colorbox/colorbox.css', 'jquery');
 	
-	e107::js('core', 	'core/jquery.elastic.source.js', 'jquery', 2);
+	//e107::js('core', 	'core/jquery.elastic.source.js', 'jquery', 2);
 	
-	e107::js('core', 	'plupload/plupload.full.js', 'jquery', 2);
-	e107::css('core', 	'plupload/jquery.plupload.queue/css/jquery.plupload.queue.css', 'jquery');
-	e107::js('core', 	'plupload/jquery.plupload.queue/jquery.plupload.queue.js', 'jquery', 2);
+	//e107::js('core', 	'plupload/plupload.full.js', 'jquery', 2);
+	//e107::css('core', 	'plupload/jquery.plupload.queue/css/jquery.plupload.queue.css', 'jquery');
+	//e107::js('core', 	'plupload/jquery.plupload.queue/jquery.plupload.queue.js', 'jquery', 2);
 	
-	e107::css('core', 	'chosen/chosen.css', 'jquery');
-	e107::js('core', 	'chosen/chosen.jquery.min.js', 'jquery', 2);
+	//e107::css('core', 	'chosen/chosen.css', 'jquery');
+	//e107::js('core', 	'chosen/chosen.jquery.min.js', 'jquery', 2);
 	
-	e107::css('core', 	'password/style.css', 'jquery');
-	e107::js('core', 	'password/jquery.pwdMeter.js', 'jquery', 2);
+	//e107::css('core', 	'password/style.css', 'jquery');
+	//e107::js('core', 	'password/jquery.pwdMeter.js', 'jquery', 2);
 	// 
-	e107::js("core",	"plupload/customUpload.js","jquery",3);
+	//e107::js("core",	"plupload/customUpload.js","jquery",3);
 	
-	e107::js("core",	"core/mediaManager.js","jquery",3);
+	//e107::js("core",	"core/mediaManager.js","jquery",3);
+
 	
-	
-	e107::css('core', 	'core/admin.css', 'jquery');
+	// e107::css('core', 	'core/admin.css', 'jquery');
 	e107::js('core', 	'core/admin.jquery.js', 'jquery', 4);
 	
 	
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 88654238c..a2adc883a 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -1144,7 +1144,7 @@ class e_menuManager {
 		//FIXME extract
 		extract($row);
 		if(!$menu_id){ return; }
-		include_once(e_HANDLER.'admin_handler.php');
+	//	include_once(e_HANDLER.'admin_handler.php');
 		$menu_name = preg_replace("#_menu#i", "", $menu_name);
 		//TODO we need a CSS class for this
 		$vis = ($menu_class || strlen($menu_pages) > 1) ? " <span class='required'>*</span> " : "";
@@ -1243,10 +1243,14 @@ class e_menuManager {
 		
 		if(!$this->dragDrop)
 		{
-			
-			ob_start();
+				
+		
+	
 
-			$ns->tablerender($caption, $text);
+			return $ns->tablerender($caption, $text,'', true);
+			
+					ob_start();
+			
 			$THEX = ob_get_contents();
 			ob_end_clean();