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

Author: A.Skokov Date: 2007-06-07 07:13:40 -0400 (Thu, 07 Jun 2007) New Revision: 1069 Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx Log: http://jira.jboss.com/jira/browse/RF-93 Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss =================================================================== --- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-06-07 10:38:23 UTC (rev 1068) +++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-06-07 11:13:40 UTC (rev 1069) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' + xmlns:u='http:/jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml" > <f:verbatim><![CDATA[ @@ -16,9 +16,12 @@ padding : 1px } -.dr-tree-h-ic-img{ +.dr-tree-h-ic-img-md{ margin: 0px; display: block; +} + +.dr-tree-h-ic-img{ width : 16px; height : 16px; } Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx =================================================================== --- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-06-07 10:38:23 UTC (rev 1068) +++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-06-07 11:13:40 UTC (rev 1069) @@ -33,66 +33,66 @@ <tr id="#{clientId}:mainRow" onclick="#{this:getToggleScript(context, component, 'mainRow')} return false;" > <f:call name="encodeAttributeParameters" /> - <td class="dr-tree-h-ic #{line}"> + <td class="dr-tree-h-ic #{line}"> <div> <jsp:scriptlet> <![CDATA[ if (org.richfaces.component.UITree.SWITCH_CLIENT.equals(component.getUITree().getSwitchType())) { ]]> - </jsp:scriptlet> + </jsp:scriptlet> <input class="dr-tree-h-input" type="hidden" id="#{clientId}NodeExpanded" name="#{clientId}NodeExpanded" value="#{this:getExpandedValue(context,component)}" /> <jsp:scriptlet> <![CDATA[ } ]]> - </jsp:scriptlet> + </jsp:scriptlet> <jsp:scriptlet> <![CDATA[ if (component.getUITree().isLeaf()) { ]]> - </jsp:scriptlet> - <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img" /> + </jsp:scriptlet> + <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ } else { ]]> - </jsp:scriptlet> + </jsp:scriptlet> <a href="#" id="#{clientId}:handle" - onclick="#{this:getToggleScript(context, component, 'handle')} return false;"> + onclick="#{this:getToggleScript(context, component, 'handle')} return false;"> <jsp:scriptlet> <![CDATA[ UIComponent iconCollapsedFacet = component.getIconCollapsedFacet(); if (iconCollapsedFacet != null && iconCollapsedFacet.isRendered()) { ]]> - </jsp:scriptlet> + </jsp:scriptlet> <span id="#{clientId}:handle:img:collapsed" - class="dr-tree-pointer-cursor 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" style="#{this:getHandleCollapsedDisplayStyle(context, component)}"> - + <jsp:scriptlet> <![CDATA[ renderChild(context, iconCollapsedFacet); ]]> - </jsp:scriptlet> - </span> + </jsp:scriptlet> + </span> <jsp:scriptlet> <![CDATA[ } else { ]]> - </jsp:scriptlet> + </jsp:scriptlet> <img border="0" id="#{clientId}:handle:img:collapsed" - src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img" + src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img" style="#{this:getHandleCollapsedDisplayStyle(context, component)}" alt="" /> <jsp:scriptlet> <![CDATA[ } ]]> - </jsp:scriptlet> + </jsp:scriptlet> <jsp:scriptlet> @@ -100,36 +100,36 @@ UIComponent iconExpandedFacet = component.getIconExpandedFacet(); if (iconExpandedFacet != null && iconExpandedFacet.isRendered()) { ]]> - </jsp:scriptlet> + </jsp:scriptlet> <span id="#{clientId}:handle:img:expanded" style="#{this:getHandleExpandedDisplayStyle(context, component)}" - class="dr-tree-pointer-cursor 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"> + <jsp:scriptlet> <![CDATA[ renderChild(context, iconExpandedFacet); ]]> - </jsp:scriptlet> - </span> + </jsp:scriptlet> + </span> <jsp:scriptlet> <![CDATA[ } else { ]]> - </jsp:scriptlet> + </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" alt="" /> + class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img" alt="" /> <jsp:scriptlet> <![CDATA[ } ]]> - </jsp:scriptlet> - </a> + </jsp:scriptlet> + </a> <jsp:scriptlet> <![CDATA[ } ]]> - </jsp:scriptlet> + </jsp:scriptlet> </div> </td> <td @@ -149,19 +149,19 @@ ]]> </jsp:scriptlet> - <span class="dr-tree-h-ic-img dr-tree-h-ic-facets"> + <span class="dr-tree-h-ic-img-md dr-tree-h-ic-img dr-tree-h-ic-facets"> <jsp:scriptlet> <![CDATA[ renderChild(context, leafFacet); ]]> - </jsp:scriptlet> + </jsp:scriptlet> </span> <jsp:scriptlet> <![CDATA[ } else { ]]> </jsp:scriptlet> - <img src="#{leaf}" alt="" class="dr-tree-h-ic-img" /> + <img src="#{leaf}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ } @@ -174,19 +174,19 @@ if (iconFacet != null && iconFacet.isRendered()) { ]]> </jsp:scriptlet> - <span class="dr-tree-h-ic-img dr-tree-h-ic-facets"> + <span class="dr-tree-h-ic-img-md dr-tree-h-ic-img dr-tree-h-ic-facets"> <jsp:scriptlet> <![CDATA[ renderChild(context, iconFacet); ]]> - </jsp:scriptlet> + </jsp:scriptlet> </span> <jsp:scriptlet> <![CDATA[ } else { ]]> </jsp:scriptlet> - <img src="#{folder}" alt="" class="dr-tree-h-ic-img" /> + <img src="#{folder}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ }