8:54 p.m.
Author: dbiatenia
Date: 2007-05-23 14:54:55 -0400 (Wed, 23 May 2007)
New Revision: 857
Modified:
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss
trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
Log:
Modified:
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
===================================================================
---
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-23
17:59:43 UTC (rev 856)
+++
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-23
18:54:55 UTC (rev 857)
@@ -119,7 +119,7 @@
targetString = target.toString();
if (childRendered && parentRendered){
- if (childDisabled==null || !childDisabled.equals("true")){
+ if (childDisabled==null || !childDisabled.toString().equals("true")){
buffer
.append("new PanelMenuItem({myId:'")
.append((String) child.getClientId(context))
Modified:
trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss
===================================================================
---
trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-05-23
17:59:43 UTC (rev 856)
+++
trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-05-23
18:54:55 UTC (rev 857)
@@ -55,6 +55,25 @@
<f:resource
f:key="org.richfaces.renderkit.gradientImages.PanelMenuItemGradient" />
</u:style>
</u:selector>
+
+ <u:selector name=".dr-pmenu-disabled-item">
+ <u:style name="width" value="100%"/>
+ <u:style name="padding" value="0px"/>
+ <u:style name="vertical-align" value="middle"/>
+ <u:style name="cursor" value="default"/>
+ <u:style name="text-align" value="left"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="font-weight" skin="generalWeightFont"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="color" skin="headerBackgroundColor"/>
+ <u:style name="border-style" value="none"/>
+ <u:style name="border-top-style" value="solid"/>
+ <u:style name="border-color" skin="subBorderColor"/>
+ <u:style name="background-image" >
+ <f:resource
f:key="org.richfaces.renderkit.gradientImages.PanelMenuItemGradient" />
+ </u:style>
+ </u:selector>
+
<u:selector name=".dr-pmenu-group-tr">
<u:style name="background-image" >
Modified:
trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
===================================================================
---
trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-05-23
17:59:43 UTC (rev 856)
+++
trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-05-23
18:54:55 UTC (rev 857)
@@ -13,11 +13,25 @@
<f:clientid var="clientId"/>
<tr id="tdhide#{clientId}" style="#{this:getHideStyle(context,
component)}" >
- <td>
+ <td>
+ <jsp:scriptlet>
+ <![CDATA[
+ String itemClass;
+ String onOnClick;
+ if (component.isDisabled()) {
+ itemClass="rich-pmenu-item dr-pmenu-disabled-item ";
+ onOnClick="";
+ } else {
+ itemClass="rich-pmenu-item dr-pmenu-item ";
+ onOnClick = component.getAttributes().get("onclick") +
";" + getOnClick(context, component);
+ }
+ variables.setVariable("itemClass", itemClass);
+ variables.setVariable("onOnClick", onOnClick);
+ ]]>
+ </jsp:scriptlet>
<table cellpadding="0" cellspacing="0" border="0"
width="100%"
- onclick="#{component.attributes['onclick']};#{this:getOnClick( context,
component )}"
- class="rich-pmenu-item dr-pmenu-item #{this:getFullStyleClass( context,
component )}"
- style="#{this:getFullStyle( context, component )}"
+ class="#{itemClass} #{this:getFullStyleClass( context, component )}"
+ style="#{this:getFullStyle( context, component )}"
id="tablehide#{clientId}" >
<f:call name="utils.encodeAttributes">
<f:parameter value="onmousedown,onmouseup,onmousemove" />