From 4ccd6c16a79abc77027fa1fe8287ef278c86b0e5 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sat, 8 Apr 2017 10:23:46 -0700
Subject: [PATCH] Menu-manager 'activate' button placement.

---
 e107_admin/menus.php                            | 5 ++---
 e107_core/shortcodes/batch/admin_shortcodes.php | 6 +++++-
 e107_themes/bootstrap3/admin_style.css          | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 32aee2589..c64ec4c07 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -956,9 +956,10 @@ class e_menu_layout
 
 	//	$text .= print_a($layouts['menus'],true);
 
+
 		$text .= '
 
-		    <div class="dropdown pull-right">
+		    <div class="dropdown pull-right e-mm-selector-container">
 
 		        <a class="btn btn-default btn-sm e-mm-selector " title="'.LAN_ACTIVATE.'">'.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').'</a>';
 
@@ -997,9 +998,7 @@ class e_menu_layout
 
 		;
 
-		$diz = MENLAN_58;
 
-		$caption .= "<span class='pull-right'><a class='e-tip' title=\"".$tp->toAttribute($diz)."\">".ADMIN_INFO_ICON."</a></span>";
 
 
 		return array('caption'=>$caption,'text'=>$text);
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 68bba5a3f..1f24d4b50 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -757,7 +757,7 @@ class admin_shortcodes
        $text = '<ul class="nav nav-admin navbar-nav navbar-right">
         <li class="dropdown">
             <a class="dropdown-toggle" title="'.LAN_PM.'" role="button" data-toggle="dropdown" href="#" >
-                '.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b>
+                '.$tp->toGlyph('fa-envelope').$countDisp.'
             </a> 
             <ul class="dropdown-menu" role="menu" >
                 <li class="nav-header navbar-header dropdown-header">'.LAN_PM.'</li>
@@ -2286,6 +2286,10 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 		$icon  = e107::getParser()->toIcon('e-menus-24');
 		$caption = $icon."<span>".ADLAN_6."</span>";
 
+				$diz = MENLAN_58;
+
+		$caption .= "<span class='pull-right'><a data-placement=\"bottom\" class='e-tip' title=\"".e107::getParser()->toAttribute($diz)."\">".ADMIN_INFO_ICON."</a></span>";
+
 	   return e107::getNav()->admin($caption,$action, $var);
 
 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 3955fe119..e25a93405 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -82,9 +82,11 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 
 */
 
+div.e-mm-selector-container { position: absolute;
+top: 4px;
+right: 5px; }
 
-
-
+body#admin-menus #sc-admin-help { position: relative }