Author: dbiatenia Date: 2007-05-25 07:18:26 -0400 (Fri, 25 May 2007) New Revision: 879 Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx Log: disable state correction 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-24 18:36:21 UTC (rev 878) +++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-05-25 11:18:26 UTC (rev 879) @@ -37,26 +37,6 @@ <f:resource f:key="org.richfaces.renderkit.gradientImages.PanelMenuGroupGradient" /> </u:style> </u:selector> - <u:selector name=".dr-pmenu-disabled-group"> - <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-weight" skin="headerWeightFont"/> - <u:style name="font-family" skin="headerFamilyFont"/> - <u:style name="font-size" skin="headerSizeFont"/> - <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="panelBorderColor"/> - <u:style name="background-color" skin="headerBackgroundColor"/> - <u:style name="background-image" > - <f:resource f:key="org.richfaces.renderkit.gradientImages.PanelMenuGroupGradient" /> - </u:style> - </u:selector> - - <u:selector name=".dr-pmenu-item"> <u:style name="width" value="100%"/> @@ -76,25 +56,6 @@ </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" > <f:resource f:key="org.richfaces.renderkit.gradientImages.PanelMenuGroupGradient" /> @@ -106,4 +67,12 @@ <f:resource f:key="org.richfaces.renderkit.gradientImages.PanelMenuItemGradient" /> </u:style> </u:selector> + + <f:verbatim> + .rich-pmenu-disabled-element { + cursor: default; + color: #c0c0c0; + } + </f:verbatim> + </f:template> \ No newline at end of file Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-05-24 18:36:21 UTC (rev 878) +++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-05-25 11:18:26 UTC (rev 879) @@ -16,22 +16,16 @@ <td> <jsp:scriptlet> <![CDATA[ - String itemClass; - String onClick; + String itemClass = ""; if (component.isDisabled()) { - itemClass="rich-pmenu-item dr-pmenu-disabled-group "; - //onClick=""; - } else { - itemClass="rich-pmenu-group dr-pmenu-group "; - //onClick = component.getAttributes().get("onclick") + ";" + getOnClick(context, component); + itemClass = " rich-pmenu-disabled-element"; } variables.setVariable("itemClass", itemClass); - //variables.setVariable("onClick", onClick); ]]> </jsp:scriptlet> <table cellpadding="0" cellspacing="0" border="0" width="100%" id="tablehide#{clientId}" - class="#{itemClass} #{this:getFullStyleClass( context, component )}" + class="rich-pmenu-group dr-pmenu-group #{this:getFullStyleClass( context, component )} #{itemClass}" style="#{this:getFullStyle( context, component )}" > <f:call name="utils.encodeAttributes"> Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx =================================================================== --- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-05-24 18:36:21 UTC (rev 878) +++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-05-25 11:18:26 UTC (rev 879) @@ -16,21 +16,19 @@ <td> <jsp:scriptlet> <![CDATA[ - String itemClass; + String itemClass = " rich-pmenu-disabled-element"; String onClick; if (component.isDisabled()) { - itemClass="rich-pmenu-item dr-pmenu-disabled-item "; - onClick=""; + variables.setVariable("itemClass", itemClass); } else { - itemClass="rich-pmenu-item dr-pmenu-item "; onClick = component.getAttributes().get("onclick") + ";" + getOnClick(context, component); + variables.setVariable("onClick", onClick); } - variables.setVariable("itemClass", itemClass); - variables.setVariable("onClick", onClick); + ]]> </jsp:scriptlet> <table cellpadding="0" cellspacing="0" border="0" width="100%" - class="#{itemClass} #{this:getFullStyleClass( context, component )}" + class="rich-pmenu-item dr-pmenu-item #{this:getFullStyleClass( context, component )} #{itemClass}" style="#{this:getFullStyle( context, component )}" id="tablehide#{clientId}" > <f:call name="utils.encodeAttributes">