Refs #3184, display tooltips for top bar links.

git-svn-id: http://dev.piwik.org/svn/trunk@6828 59fd770c-687e-43c8-a1e3-f5a4ff64c105

2 files changed, 17 insertions, 8 deletions

diff --git a/core/Menu/Abstract.php b/core/Menu/Abstract.php
index 8b0201367e..31da83fab9 100644
--- a/core/Menu/Abstract.php
+++ b/core/Menu/Abstract.php
@@ -49,8 +49,9 @@ abstract class Piwik_Menu_Abstract
 	 * @param string  $url
 	 * @param bool    $displayedForCurrentUser
 	 * @param int     $order
+	 * @param string  $tooltip Tooltip to display.
 	 */
-	public function add($menuName, $subMenuName, $url, $displayedForCurrentUser, $order = 50)
+	public function add($menuName, $subMenuName, $url, $displayedForCurrentUser, $order = 50, $tooltip = false)
 	{
 		if($displayedForCurrentUser)
 		{
@@ -58,7 +59,8 @@ abstract class Piwik_Menu_Abstract
 				$menuName,
 				$subMenuName,
 				$url,
-				$order
+				$order,
+				$tooltip
 			);
 		}
 	}
@@ -70,8 +72,9 @@ abstract class Piwik_Menu_Abstract
 	 * @param string  $subMenuName
 	 * @param string  $url
 	 * @param int     $order
+	 * @param string  $tooltip Tooltip to display.
 	 */
-	private function buildMenuItem($menuName, $subMenuName, $url, $order = 50)
+	private function buildMenuItem($menuName, $subMenuName, $url, $order = 50, $tooltip = false)
 	{
 		if (!isset($this->menu[$menuName]) || empty($subMenuName))
 		{
@@ -79,6 +82,7 @@ abstract class Piwik_Menu_Abstract
 			$this->menu[$menuName]['_order'] = $order;
 			$this->menu[$menuName]['_name'] = $menuName;
 			$this->menu[$menuName]['_hasSubmenu'] = false;
+			$this->menu[$menuName]['_tooltip'] = $tooltip;
 		}
 		if (!empty($subMenuName))
 		{
@@ -86,6 +90,7 @@ abstract class Piwik_Menu_Abstract
 			$this->menu[$menuName][$subMenuName]['_order'] = $order;
 			$this->menu[$menuName][$subMenuName]['_name'] = $subMenuName;
 			$this->menu[$menuName]['_hasSubmenu'] = true;
+			$this->menu[$menuName]['_tooltip'] = $tooltip;
 		}
 	}
 
@@ -96,7 +101,7 @@ abstract class Piwik_Menu_Abstract
 	{
 		foreach ($this->menuEntries as $menuEntry)
 		{
-			$this->buildMenuItem($menuEntry[0], $menuEntry[1], $menuEntry[2], $menuEntry[3]);
+			$this->buildMenuItem($menuEntry[0], $menuEntry[1], $menuEntry[2], $menuEntry[3], $menuEntry[4]);
 		}
 	}
 
diff --git a/core/Menu/Top.php b/core/Menu/Top.php
index 3d5b37edd1..3a11942d04 100644
--- a/core/Menu/Top.php
+++ b/core/Menu/Top.php
@@ -36,8 +36,9 @@ class Piwik_Menu_Top extends Piwik_Menu_Abstract
 	 * @param string   $data
 	 * @param boolean  $displayedForCurrentUser
 	 * @param int      $order
+	 * @param string   $tooltip Tooltip to display.
 	 */
-	public function addHtml($menuName, $data, $displayedForCurrentUser, $order)
+	public function addHtml($menuName, $data, $displayedForCurrentUser, $order, $tooltip)
 	{
 		if($displayedForCurrentUser)
 		{
@@ -46,6 +47,7 @@ class Piwik_Menu_Top extends Piwik_Menu_Abstract
 				$this->menu[$menuName]['_html'] = $data;
 				$this->menu[$menuName]['_order'] = $order;
 				$this->menu[$menuName]['_hasSubmenu'] = false;
+				$this->menu[$menuName]['_tooltip'] = $tooltip;
 			}
 		}
 	}
@@ -83,16 +85,18 @@ function Piwik_GetTopMenu()
  * @param boolean  $displayedForCurrentUser
  * @param int      $order
  * @param bool     $isHTML
+ * @param string   $tooltip Tooltip to display.
  */
-function Piwik_AddTopMenu( $topMenuName, $data, $displayedForCurrentUser = true, $order = 10, $isHTML = false)
+function Piwik_AddTopMenu( $topMenuName, $data, $displayedForCurrentUser = true, $order = 10, $isHTML = false,
+							$tooltip = false)
 {
 	if($isHTML)
 	{
-		Piwik_Menu_Top::getInstance()->addHtml($topMenuName, $data, $displayedForCurrentUser, $order);
+		Piwik_Menu_Top::getInstance()->addHtml($topMenuName, $data, $displayedForCurrentUser, $order, $tooltip);
 	}
 	else
 	{
-		Piwik_Menu_Top::getInstance()->add($topMenuName, null, $data, $displayedForCurrentUser, $order);
+		Piwik_Menu_Top::getInstance()->add($topMenuName, null, $data, $displayedForCurrentUser, $order, $tooltip);
 	}
 }