From kde-commits  Mon Jul 26 08:51:09 2010
From: Matthias Messmer <matthias () familie-messmer ! de>
Date: Mon, 26 Jul 2010 08:51:09 +0000
To: kde-commits
Subject: www/media/includes/classes
Message-Id: <20100726085109.9931FAC867 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128013424107794

SVN commit 1154780 by messmer:

added option to have non active plasmaMenu entries for structural purpose

 M  +8 -7      class_menu.inc  


--- trunk/www/media/includes/classes/class_menu.inc #1154779:1154780
@@ -586,7 +586,7 @@
 		$html .= "<div class=\"menubox_body\">\n";
 		$html .= "<div class=\"mainmenu_{$safeName}_animation\"></div>\n";
 		$html .= "<div class=\"mainmenu_{$safeName}_content\">\n";
-		$html .= "<ul><li class=\"index\"><b><a href=\"{$link}\">" . ($shortName ? $shortName : $name) . "</a></b></li></ul>\n";
+		$html .= "<ul><li class=\"index\"><b><a " . ($link ? "href=\"{$link}\"" : null ) . ">" . ($shortName ? $shortName : $name) . "</a></b></li></ul>\n";
 		$html .= "<img class=\"menubox_sep\" src=\"{$imagePath}menubox_hr.png\" alt=\"\" />\n";
 		$html .= "<ul>\n";
 		
@@ -601,7 +601,7 @@
 			{
 				$html .= "<li class=\"index mainmenu_{$safeName}_{$safeEntryName} menubox_subhover\">\n";
 				$html .= $entryIcon ? "<img class=\"menubox_icon\" src=\"{$iconPath}{$entryIcon}\" alt=\"\" />" : null;
-				$html .= "<h3><a " . ($entryIcon ? "class=\"menubox_space\" " : null) . "href=\"{$entryLink}\">{$entryName}</a></h3>\n";
+				$html .= "<h3><a " . ($entryIcon ? "class=\"menubox_space\" " : null) . ($entryLink ? "href=\"$entryLink\"" : null) . "\">{$entryName}</a></h3>\n";
 				$html .= "<img class=\"menubox_subarr\" src=\"{$imagePath}menubox_arrow.png\" alt=\"\" />";
 				$html .= "<div class=\"mainmenu_{$safeName}_{$safeEntryName}_sub menubox_subparent\">\n";
 				$html .= "<div class=\"menubox_top\"></div>\n";
@@ -755,6 +755,7 @@
 	//
 	function breadCrumb()
 	{
+      global $site_title;
 		// Get the current request URL
 		$url = $_SERVER["REQUEST_URI"];
 		
@@ -765,7 +766,7 @@
 		$url = preg_replace("/mainsite\//", "", $url);
 		
 		// Init the breadcrumb
-		$nav = $this->buildLink("Home", "/");
+		$nav = $this->buildLink($site_title, "/");
 		
 		// If the user is on the root
 		if ($url == "/")
@@ -795,7 +796,7 @@
 						$subEntryName = $this->menuEntries[$entryName]['name'][$subIdx];
 						$subEntryLink = $this->menuEntries[$entryName]['link'][$subIdx];
 						
-						if (strpos($url, $subEntryLink) !== false)
+						if ($url && $subEntryLink && strpos($url, $subEntryLink) !== false && !$set)
 						{
 							$nav .= $sep . $this->buildLink($name, $link);
 							$nav .= $sep . $this->buildLink($entryName, $entryLink);
@@ -805,7 +806,7 @@
 					}
 				}
 				
-				if (strpos($url, $entryLink) !== false && !$set)
+				if ($url && $entryLink && strpos($url, $entryLink) !== false && !$set)
 				{
 					$nav .= $sep . $this->buildLink($name, $link);
 					$nav .= $sep . $entryName;
@@ -813,7 +814,7 @@
 				}					
 			}
 			
-			if (strpos($url, $link) !== false && !$set)
+			if ($url && $link && strpos($url, $link) !== false && !$set)
 			{
 				$nav .= $sep . $name;
 			}			
@@ -828,7 +829,7 @@
 	function buildLink($name, $url)
 	{
 		// Return the link
-		return "<a href=\"{$url}\">{$name}</a>";
+		return ($url ? "<a href=\"{$url}\">{$name}</a>" : $name);
 	}	
 }