From 43fd29e874de1fb76340903d6615e4dfa281e51b Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sun, 3 Mar 2013 04:46:57 -0800
Subject: [PATCH] Html Fix in Menu-Manager.

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

diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 32342c6ce..32fdf7245 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -72,7 +72,7 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc']))
 			$('.e-menumanager-option').on('click', function(){
     			
     			var link = $(this).attr('href');
-				var caption = $(this).attr('title');
+				var caption = $(this).attr('data-modal-caption');
 				window.parent.$('#uiModal .modal-caption').text(caption);	
 				window.parent.$('#uiModal .modal-body').load(link, function(){
 				 					   
@@ -213,13 +213,15 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc']))
     padding-top: 7px;
     padding-right: 5px;
     text-align: left;
-    white-space: nowrap;
+   
 	}
+	.menu-options-buttons	{ white-space: nowrap }
+	#menu-manage-actions		{ width:50%; vertical-align:top; text-align:center; padding:15px }
 	
 	select.menu-btn { text-align:left }
 	
 	label { font-size: 12px;  line-height:14px }
-	label.input							{margin-right:10px }
+	label.input									{margin-right:10px;  }
 	
 	#core-menumanager-main 						{ width:100%; margin-left:auto; margin-right:auto }
 	
@@ -230,7 +232,7 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc']))
 	
 	table.table tbody > tr >td 					{  }
 	table.table tbody > tr >td label 			{ padding:15px; display:block; cursor: pointer; font-size:14px ;  }
-	table.table tbody > tr >td label > input	{ margin-right: 10px; }
+	table.table tbody > tr >td label > input	{ margin-right: 10px; float: left; }
 	
 	
 	.table-striped tbody > tr:nth-child(2n+1) > td, .table-striped tbody > tr:nth-child(2n+1) > th {
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 2016fd7e8..df7a4e691 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -875,7 +875,7 @@ class e_menuManager {
 
 		$text .= "<tr><td style='width:65%;text-align:center;padding-bottom:4px'>".MENLAN_36."...</td>
 		<td style='width:50%;padding-bottom:4px;text-align:center'>...".MENLAN_37."</td></tr>";
-		$text .= "<tr><td style='width:35%;vertical-align:top;text-align:center'>";
+		$text .= "<tr><td  style='width:35%;vertical-align:top;text-align:center'>";
 
 	 	$sql->select("menus", "menu_name, menu_id, menu_pages, menu_path", "1 GROUP BY menu_name ORDER BY menu_name ASC");
 
@@ -938,7 +938,7 @@ class e_menuManager {
 		$text .= (!$this->dragDrop) ? "</tbody></table>" : "";
 		$text .= "</div>";
 
-		$text .= "</td><td style='width:50%;vertical-align:top;text-align:center'><br />";
+		$text .= "</td><td id='menu-manage-actions' ><br />";
 		foreach ($this->menu_areas as $menu_act)
 		{
 			$text .= "<input type='submit' class='menu-btn button' id='menuActivate_".trim($menu_act)."' name='menuActivate[".trim($menu_act)."]' value='".MENLAN_13." ".trim($menu_act)."' /><br /><br />\n";
@@ -1320,8 +1320,8 @@ class e_menuManager {
 		
 		$visibilityLink = e_SELF."?enc=".base64_encode('lay='.$this->curLayout.'&vis='.$menu_id.'&iframe=1');
 		
-		$text .= '
-		<a class="e-menumanager-option menu-btn" target="_top" href="'.$visibilityLink.'" title="'.MENLAN_20.'">'.ADMIN_VIEW_ICON.'</a>';
+		$text .= '<span class="menu-options-buttons">
+		<a class="e-menumanager-option menu-btn" data-modal-caption="'.MENLAN_20.'" href="'.$visibilityLink.'" title="'.MENLAN_20.'">'.ADMIN_VIEW_ICON.'</a>';
 
 		if($conf)
 		{
@@ -1330,16 +1330,16 @@ class e_menuManager {
 		}
 		
 		$editLink = e_SELF."?enc=".base64_encode('lay='.$this->curLayout.'&parmsId='.$menu_id.'&iframe=1');
-		$text .= '<a class="e-menumanager-option menu-btn e-tip" target="_top" href="'.$editLink.'" title="Configure parameters">'.ADMIN_EDIT_ICON.'</a>';
+		$text .= '<a data-modal-caption="Configure parameters" class="e-menumanager-option menu-btn e-tip" target="_top" href="'.$editLink.'" title="Configure parameters">'.ADMIN_EDIT_ICON.'</a>';
 
 		$text .= '<a title="'.LAN_DELETE.'" id="remove-'.$menu_id.'-'.$menu_location.'" class="e-tip delete e-menumanager-delete menu-btn" href="'.e_SELF.'?configure='.$this->curLayout.'&amp;mode=deac&amp;id='.$menu_id.'">'.ADMIN_DELETE_ICON.'</a>
 		
 		<span id="status-'.$menu_id.'" style="display:none">'.($rep == true ? "" : "insert").'</span>
-		</div>';
+		<span></div>';
 
 		$text .= ($rep == true) ? "</div>" : "";
 
-		$text .= "</div>";
+	//	$text .= "</div>";
 		
 		if(!$this->dragDrop)
 		{