[richfaces-svn-commits] JBoss Rich Faces SVN: r2295 - in trunk/ui/tree/src/main: templates and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: pyaschenko
Date: 2007-08-16 10:58:45 -0400 (Thu, 16 Aug 2007)
New Revision: 2295

Modified:
   trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
   trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
Log:
custom user classes added

Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-08-16 14:01:25 UTC (rev 2294)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-08-16 14:58:45 UTC (rev 2295)
@@ -151,7 +151,7 @@
 			
 			String styleClasses = "";
 			if (context.getRowKey() != null) {
-				styleClasses = "dr-tree-layout-on dr-tree-h-ic-div";
+				styleClasses = "dr-tree-layout-on dr-tree-h-ic-div rich-tree-node-cildren";
 				if (!context.isLast() && showLines) styleClasses += " dr-tree-h-ic-line";
 			}
 			if (styleClasses!="") getUtils().writeAttribute(writer, "class", styleClasses);

Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx	2007-08-16 14:01:25 UTC (rev 2294)
+++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx	2007-08-16 14:58:45 UTC (rev 2295)
@@ -31,7 +31,7 @@
 	<f:call name="initializeLines" />
 	<f:call name="initializeResources" />
 
-	<table border="0" cellpadding="0" cellspacing="0" id="#{clientId}" class="dr-tree-full-width">
+	<table border="0" cellpadding="0" cellspacing="0" id="#{clientId}" class="dr-tree-full-width rich-tree-node">
 	<tbody>
 
 	<tr id="#{clientId}:mainRow" onclick="#{component.attributes['onclick']} #{this:getToggleScript(context, component, 'mainRow')}" >
@@ -40,7 +40,7 @@
 		<f:call name="utils.encodePassThruWithExclusions">
 	        <f:parameter value="id,onclick"/>
 	    </f:call>
-		<td class="dr-tree-h-ic #{line}">
+		<td class="dr-tree-h-ic rich-tree-node-handleicon #{line}">
 			<div>
 				<jsp:scriptlet>
 					<![CDATA[
@@ -76,7 +76,7 @@
 						 ]]>
 				</jsp:scriptlet>
 									<span id="#{clientId}:handle:img:collapsed"
-										 class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img dr-tree-h-ic-facets"
+										 class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img dr-tree-h-ic-facets rich-tree-node-handleicon-collapsed"
 										 style="#{this:getHandleCollapsedDisplayStyle(context, component)}">
 
 				<jsp:scriptlet>
@@ -92,7 +92,7 @@
 				</jsp:scriptlet>
 
 									<img border="0" id="#{clientId}:handle:img:collapsed"
-										 src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img"
+										 src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-collapsed"
 										 style="#{this:getHandleCollapsedDisplayStyle(context, component)}" alt="" />
 
 				<jsp:scriptlet>
@@ -110,7 +110,7 @@
 				</jsp:scriptlet>
 									<span id="#{clientId}:handle:img:expanded"
 										 style="#{this:getHandleExpandedDisplayStyle(context, component)}"
-										 class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img dr-tree-h-ic-facets">
+										 class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img dr-tree-h-ic-facets rich-tree-node-handleicon-expanded">
 
 				<jsp:scriptlet>
 					<![CDATA[
@@ -125,7 +125,7 @@
 				</jsp:scriptlet>
 									<img border="0" id="#{clientId}:handle:img:expanded" src="#{expanded}"
 										 style="#{this:getHandleExpandedDisplayStyle(context, component)}"
-										 class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img" alt="" />
+										 class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-expanded" alt="" />
 				<jsp:scriptlet>
 						<![CDATA[
 								}
@@ -139,6 +139,16 @@
 				</jsp:scriptlet>
 			</div>
 		</td>
+
+			<jsp:scriptlet>
+				<![CDATA[
+				String iconClass = "rich-tree-node-icon";				         
+				if (component.getUITree().isLeaf()) {
+					iconClass += "-leaf";
+				}
+				variables.setVariable("iconClass",iconClass);
+				]]>
+			</jsp:scriptlet>		
 		<td
 			rich:ajaxselectedlistener="#{this:getAjaxSelectedListenerFlag(context, component)}"
 			rich:draggableoptions="#{this:getDraggableScriptOptions(context, component)}"
@@ -147,7 +157,7 @@
 			rich:onselected="#{component.attributes['onselected']}"
 			rich:onexpand="#{component.attributes['onexpand']}"
 			rich:oncollapse="#{component.attributes['oncollapse']}"
-			class="dr-tree-h-ic #{lineFirst}" id="#{clientId}:icon">
+			class="dr-tree-h-ic #{iconClass} #{lineFirst}" id="#{clientId}:icon">
 			<jsp:scriptlet>
 				<![CDATA[
 				if (component.getUITree().isLeaf()) {
@@ -201,7 +211,7 @@
 				]]>
 			</jsp:scriptlet>
 		</td>
-		<td class="dr-tree-h-text rich-tree-node #{component.attributes['nodeClass']}"
+		<td class="dr-tree-h-text rich-tree-node-text #{component.attributes['nodeClass']}"
             rich:selectedclass="#{selectedClass}" rich:highlightedclass="#{highlightedClass}"
             id="#{clientId}:text">
             <vcp:body />