[evolvis-commits] r18389: theme-evolvis pending merges:↵ Thorsten Glaser 2012-05-07 of *course*, nerville had to implement tooltips incompatibly

mirabilos at evolvis.org mirabilos at evolvis.org
Mon May 7 21:09:37 CEST 2012


Author: mirabilos
Date: 2012-05-07 21:09:37 +0200 (Mon, 07 May 2012)
New Revision: 18389

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
Log:
theme-evolvis pending merges:
  Thorsten Glaser 2012-05-07 of *course*, nerville had to implement tooltips incompatibly

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-03 14:15:50 UTC (rev 18388)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-07 19:09:37 UTC (rev 18389)
@@ -1,3 +1,11 @@
+fusionforge (1:5.1.1+evolvis58) xunstable; urgency=low
+
+  * Evolvis Theme: add support for nerville’s method of making
+    tooltips in the submenu, which is kinda pointless, but for
+    the sake of compatibility, oh my…
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 07 May 2012 09:56:48 +0200
+
 fusionforge (1:5.1.1+evolvis57) unstable; urgency=low
 
   [ Roland Mas ]

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2012-05-03 14:15:50 UTC (rev 18388)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2012-05-07 19:09:37 UTC (rev 18389)
@@ -658,9 +658,20 @@
 		$rv = "";
 
 		for ($i = 0; $i < count($links_arr); ++$i) {
+			/*
+			 * workaround for nerville’s… unique way of
+			 * handling tooltips
+			 */
+			$tooltip = util_ifsetor($tooltip_arr[$i]);
+			if (is_array($tooltip)) {
+				$tooltip = util_ifsetor($tooltip['title']);
+			}
+			if (!$tooltip || !is_string($tooltip)) {
+				$tooltip = "";
+			}
+
 			$rv .= $this->ev_style->make_headlink('b',
-			    util_ifsetor($tooltip_arr[$i], ""),
-			    $links_arr[$i],
+			    $tooltip, $links_arr[$i],
 			    util_ifsetor($title_arr[$i], "Link ".$i));
 		}
 		return $rv;



More information about the evolvis-commits mailing list