You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/03/22 21:58:27 UTC

svn commit: r926329 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp

Author: reto
Date: Mon Mar 22 20:58:27 2010
New Revision: 926329

URL: http://svn.apache.org/viewvc?rev=926329&view=rev
Log:
CLEREZZA-168: do not create empty menu, use ifx, deactive links to self

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=926329&r1=926328&r2=926329&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp Mon Mar 22 20:58:27 2010
@@ -32,20 +32,24 @@ resultDocModifier.addScriptReference("/s
 	<div id="tx-menu">
 	<ol>
 	{for (menuItem <- res/menu("globalMenu")!!) yield
-		<li><a href=
+		<li>
 			{
-					if ((menuItem/menu("path")).length > 0) {
-						menuItem/menu("path")*
-					} else {""}
-			}>{(menuItem/rdfs("label")*)}</a>
-			<ol>
-				 {
-					if ((menuItem/menu("children")).length > 0) {
-					for (childMenuItem <- menuItem/menu("children")!!) yield
-					<li><a href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a></li>
-					} else {}
-				 }
-			</ol>
+				if ((menuItem/menu("path")).length > 0) {
+					<a href={menuItem/menu("path")*}>{(menuItem/rdfs("label")*)}</a>
+				} else {
+					<a href="#" onclick="return false">{(menuItem/rdfs("label")*)}</a>
+				}
+			}
+			{
+				ifx ((menuItem/menu("children")).length > 0) {
+				<ol>
+					 {
+						for (childMenuItem <- menuItem/menu("children")!!) yield
+						<li><a href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a></li>
+					 }
+				</ol>
+				} 
+			}
 		</li>
 	}
 	</ol>