From f1c0a0b5fdb3cd4be5a0a43d837981c7888452b9 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sun, 14 Apr 2013 19:28:15 -0700
Subject: [PATCH] More Menu-Manager GUI tweaks

---
 e107_admin/menus.php                          | 31 ++++++++++++++++---
 .../shortcodes/batch/admin_shortcodes.php     |  2 +-
 e107_handlers/menumanager_class.php           |  4 +--
 e107_languages/English/admin/help/menus.php   | 18 +++++------
 e107_themes/bootstrap/admin_style.css         |  2 +-
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 67f8e2107..b819c43eb 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -151,8 +151,21 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc']))
 	.ui-sortable-placeholder { border: 1px dotted black; visibility: visible !important; height: 50px !important; }
 	.ui-sortable-placeholder * { visibility: hidden; }
 	
+	[class^='icon-'], [class*=' icon-'] {
+	    display: inline-block;
+	    width: 14px;
+	    height: 14px;
+	    margin-top: 1px;
+	    line-height: 14px;
+	    vertical-align: text-top;
+	    background-image: url('".e_JS."bootstrap/img/glyphicons-halflings.png');
+	    background-position: 14px 14px;
+	    background-repeat: no-repeat;
+	}
 	
-	
+	.icon-search {
+	  background-position: -48px 0;
+	}
 	
 	
 	
@@ -212,11 +225,21 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc']))
 	.tbox { text-align:left }
 	
 	.menuOptions {
-    padding-top: 7px;
-    padding-right: 5px;
-    text-align: left;
+    	padding-top: 7px;
+    	padding-right: 5px;
+    	text-align: left;
+		opacity: 0;
+		transition: opacity .25s ease-in-out;
+   		-moz-transition: opacity .25s ease-in-out;
+   		-webkit-transition: opacity .25s ease-in-out;
    
 	}
+	
+	.menuOptions:hover {
+		opacity: 1;
+		
+	}
+	
 	.menu-options-buttons	{ white-space: nowrap }
 	#menu-manage-actions		{ width:50%; vertical-align:top; text-align:center; padding:15px }
 	
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 1d729f0a4..89ca2936d 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -1844,7 +1844,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
    //		$keys = array_keys($var);
 	//	$action = (in_array($this->action,$keys)) ? $this->action : "installed";
 
-		e107::getNav()->admin(ADLAN_6,$action, $var);
+		e107::getNav()->admin("Menu Manager",$action, $var);
 	 //  e_admin/_menu(ADLAN_6,$action, $var);
 
 	}
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index a721d7d1c..98761cf48 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -1040,7 +1040,7 @@ class e_menuManager {
 // onchange=\"urljump(this.options[selectedIndex].value);\"
 
 		$text = "<form class='form-inline' method='post' action='".e_SELF."?configure=".$this->curLayout."'>";
-		$text .= "<div class='buttons-bar'>Layout: ";
+		$text .= "<div class='buttons-bar'>Theme Layout: ";
         $text .= "<select name='custom_select' style='width:auto' id='menuManagerSelect'  >\n"; //tbox class will break links.  // window.frames['menu_iframe'].location=this.options[selectedIndex].value ???
 
 
@@ -1297,7 +1297,7 @@ class e_menuManager {
 
 		$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> " : "";
+		$vis = ($menu_class || strlen($menu_pages) > 1) ? " <span class='required'><i class='icon-search'></i></span> " : "";
 		//DEBUG div not allowed in final tags 	$caption = "<div style='text-align:center'>{$menu_name}{$vis}</div>";
 		// use theme render style instead
 		
diff --git a/e107_languages/English/admin/help/menus.php b/e107_languages/English/admin/help/menus.php
index 3c96d9e07..45faec94f 100644
--- a/e107_languages/English/admin/help/menus.php
+++ b/e107_languages/English/admin/help/menus.php
@@ -21,6 +21,7 @@ if (!getperms("2")) {
 }
 
 $sql = e107::getDb();
+$tp = e107::getParser();
 
 if(isset($_POST['reset']))
 {
@@ -44,19 +45,18 @@ else
 
 $frm = e107::getForm();
 
-$text = "
-You can arrange where and in which order your menu items are from here. 
-Use the dropdown menu to move the menus up and down until you are satisfied with their positioning.
-<br />
-<br />
-If you find the menus are not updating properly click on the refresh button.
-<br />
+$text = "The Menu-Manager allows you to place and arrange your menus within your theme template. 
+[u]Hover[/u] over the sub-areas to modify existing menu items. 
+
+If you find the menus are not updating correctly, clicking the refresh button below may help. 
+[html]
 <form method='post' id='menurefresh' action='".$_SERVER['PHP_SELF']."'>
 <div>
 ".$frm->admin_button('reset','Refresh','cancel')."</div>
 </form>
-<br />
-<div class='indent'><span class='required'>*</span> indicates menu visibility has been modified</div>
+<div class='indent'><span class='required'><i class='icon-search icon-white'></i></span> indicates that the menu's visibility has been modified.</div>
+[/html]
 ";
 
+$text = $tp->toHtml($text,true);
 $ns -> tablerender("Menus Help", $text);
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css
index d28465b4c..ef7d04312 100644
--- a/e107_themes/bootstrap/admin_style.css
+++ b/e107_themes/bootstrap/admin_style.css
@@ -51,7 +51,7 @@ td.center, th.center 		{ text-align:center }
 
 .col-label 					{ width:25%; }
 
-.sidebar-nav 				{ padding: 9px 0; font-size:11px; min-width:150px; }
+/* .sidebar-nav 				{ padding: 9px 0; font-size:11px; min-width:150px; } */
 
 #cboxTitle					{ font-weight:bold; color: black }
 .chzn-container				{ border: 1px solid #ddd; }