[richfaces-svn-commits] JBoss Rich Faces SVN: r441 - in trunk/richfaces/menu-components: skins and 8 other directories.

Author: a.izobov Date: 2007-04-18 10:49:11 -0400 (Wed, 18 Apr 2007) New Revision: 441 Added: trunk/richfaces/menu-components/skins/ trunk/richfaces/menu-components/skins/images/ trunk/richfaces/menu-components/skins/images/menu_item_bg.gif trunk/richfaces/menu-components/skins/images/menu_list_bg.gif trunk/richfaces/menu-components/skins/images/node.gif trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java Removed: trunk/richfaces/menu-components/skins/images/menu_item_bg.gif trunk/richfaces/menu-components/skins/images/menu_list_bg.gif trunk/richfaces/menu-components/skins/images/node.gif trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/ Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java Log: skinning Copied: trunk/richfaces/menu-components/skins/images (from rev 418, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images) Deleted: trunk/richfaces/menu-components/skins/images/menu_item_bg.gif =================================================================== (Binary files differ) Copied: trunk/richfaces/menu-components/skins/images/menu_item_bg.gif (from rev 437, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_item_bg.gif) =================================================================== (Binary files differ) Deleted: trunk/richfaces/menu-components/skins/images/menu_list_bg.gif =================================================================== (Binary files differ) Copied: trunk/richfaces/menu-components/skins/images/menu_list_bg.gif (from rev 437, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_list_bg.gif) =================================================================== (Binary files differ) Deleted: trunk/richfaces/menu-components/skins/images/node.gif =================================================================== (Binary files differ) Copied: trunk/richfaces/menu-components/skins/images/node.gif (from rev 437, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/node.gif) =================================================================== (Binary files differ) Added: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java =================================================================== --- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java (rev 0) +++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-04-18 14:49:11 UTC (rev 441) @@ -0,0 +1,96 @@ +package org.richfaces.renderkit.html.images; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.io.Serializable; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.resource.GifRenderer; +import org.ajax4jsf.framework.resource.InternetResourceBuilder; +import org.ajax4jsf.framework.resource.Java2Dresource; +import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.framework.skin.Skin; +import org.ajax4jsf.framework.skin.SkinFactory; +import org.ajax4jsf.framework.util.HtmlColor; + +public class MenuNodeImage extends Java2Dresource { + + private static final Dimension dimensions = new Dimension(7, 14); + + protected Dimension getDimensions(ResourceContext resourceContext) { + return dimensions; + } + public Dimension getDimensions(FacesContext facesContext, Object data) { + return dimensions; + } + + public MenuNodeImage() { + setRenderer(new GifRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); + } + + protected Object getDataToStore(FacesContext context, Object data) { + + MenuNodeImageData mnd = new MenuNodeImageData(); + Skin skin = SkinFactory.getInstance().getSkin(context); + + String tmp; + int intValue; + + tmp = (String) skin.getParameter(context,"headerBackgroundColor"); + if (tmp != null) { + intValue = HtmlColor.decode(tmp).getRGB(); + mnd.setGeneralColor(new Integer(intValue)); + } else mnd.setGeneralColor(null); + + tmp = (String) skin.getParameter(context,"tabDisabledTextColor"); + if (tmp != null) { + intValue = HtmlColor.decode(tmp).getRGB(); + mnd.setDisabledColor(new Integer(intValue)); + } else mnd.setDisabledColor(null); + + return mnd; + } + + protected void paint(ResourceContext context, Graphics2D g2d) { + MenuNodeImageData mnd = (MenuNodeImageData) restoreData(context); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + + g2d.setColor(new Color(mnd.getGeneralColor().intValue())); + g2d.drawLine(2,0,2,6); + g2d.drawLine(3,1,3,5); + g2d.drawLine(4,2,4,4); + g2d.drawLine(5,3,5,3); + + g2d.setColor(new Color(mnd.getDisabledColor().intValue())); + g2d.drawLine(2,7,2,13); + g2d.drawLine(3,8,3,12); + g2d.drawLine(4,9,4,11); + g2d.drawLine(5,10,5,10); + } + + + protected static class MenuNodeImageData implements Serializable{ + private static final long serialVersionUID = 1732700513743861251L; + + private Integer disabledColor; + private Integer generalColor; + + public Integer getDisabledColor() { + return disabledColor; + } + public void setDisabledColor(Integer disabledColor) { + this.disabledColor = disabledColor; + } + public Integer getGeneralColor() { + return generalColor; + } + public void setGeneralColor(Integer generalColor) { + this.generalColor = generalColor; + } + } +} Added: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java =================================================================== --- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java (rev 0) +++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java 2007-04-18 14:49:11 UTC (rev 441) @@ -0,0 +1,32 @@ +/** + * License Agreement. + * + * JBoss RichFaces 3.0 - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images.background; + +import org.richfaces.renderkit.html.BaseGradient; + +public class MenuItemBackground extends BaseGradient { + + public MenuItemBackground() { + super(3, 16, "additionalBackgroundColor", "tabBackgroundColor"); + } + +} Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss =================================================================== --- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-04-18 14:46:37 UTC (rev 440) +++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-04-18 14:49:11 UTC (rev 441) @@ -15,16 +15,6 @@ white-space : nowrap; position : relative; } -.dr-menu-item-disabled { - border : 1px solid transparent; - cursor : default; - color : #839eca; -} -.dr-menu-label { - font-family : arial; - font-size : 11px; - text-decoration : none; -} .dr-menu-item-enabled { border : 0px solid transparent; padding : 2px 36px 2px 2px; @@ -32,16 +22,12 @@ .dr-menu-item-hover { border : 1px solid #4a70ab; cursor : pointer; - background : url(menu_item_bg.gif) repeat-x top #a9c5e7; } .dr-menu-item-disabled { - border : 1px solid transparent; + border : 0px solid transparent; cursor : default; color : #839eca; } -.dr-menu-label-disabled { - color : #839eca; -} .dr-menu-icon { margin-right : 10px; } @@ -64,59 +50,41 @@ .dr-menu-item-disabled .dr-menu-node { background-position : bottom; } +]]> -.dr-menu-list-position { - top : 17; - left: -1 -} -.dr-menu-list-border { - border : 1px solid #bfbfc0; - background-color : #e7f2fb; - float : left; - position : absolute; -} -.dr-menu-sublist { - top : -8; - left:13; -} -.dr-menu-list-bg { - border-top : 1px solid #e7f2fb; - border-left : 1px solid #e7f2fb; - border-right : 1px solid #e7f2fb; - background : url(menu_list_bg.gif) repeat-y left; -} +</f:verbatim> -.underneath_iframe{ - position: absolute; - z-index: 90; - visibility:hidden; - left:0px; - top:0px; - height:1px; - width:1px; - /*display:none;*/ -} +<u:selector name=".dr-menu-separator"> + <u:style name="border-top-color" skin="panelBorderColor" /> +</u:selector> +<u:selector name=".dr-menu-item"> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="font-size" skin="generalSizeFont" /> +</u:selector> -]]> - -</f:verbatim> -<u:selector name=".dr-menu-node"> - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/node.gif"/> - </u:style> +<u:selector name=".dr-menu-item-disabled"> + <u:style name="color" skin="tabDisabledTextColor" /> </u:selector> <u:selector name=".dr-menu-item-hover"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/menu_item_bg.gif"/> + <f:resource f:key="org.richfaces.renderkit.html.images.background.MenuItemBackground"/> </u:style> + <u:style name="background-position" value="top left"/> + <u:style name="background-repeat" value="repeat-x"/> + <u:style name="border-color" skin="headerBackgroundColor" /> + <u:style name="background-color" skin="tabBackgroundColor" /> </u:selector> -<u:selector name=".dr-menu-list-bg"> +<u:selector name=".dr-menu-node"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/menu_list_bg.gif"/> + <f:resource f:key="org.richfaces.renderkit.html.images.MenuNodeImage"/> </u:style> </u:selector> +<u:selector name=".dr-menu-item a"> + <u:style name="color" skin="generalTextColor" /> +</u:selector> + </f:template> Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx =================================================================== --- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-04-18 14:46:37 UTC (rev 440) +++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-04-18 14:49:11 UTC (rev 441) @@ -29,10 +29,10 @@ style="#{component.attributes['style']}" onmouseout="this.className='dr-menu-item dr-menu-item-enabled rich-menu-group'; $('ref#{clientId}:icon').className='dr-menu-icon rich-menu-item-icon #{component.attributes['iconClass']}'; - $('ref#{clientId}:anchor').className='dr-menu-label rich-menu-item-label';" + $('ref#{clientId}:anchor').className='rich-menu-item-label';" onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-group rich-menu-group-hover'; #{component.attributes['selectClass']} $('ref#{clientId}:icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected #{component.attributes['iconClass']}'; - $('ref#{clientId}:anchor').className='dr-menu-label dr-menu-label-selected rich-menu-item-label rich-menu-item-label-selected';" + $('ref#{clientId}:anchor').className='rich-menu-item-label rich-menu-item-label-selected';" onmousemove="#{component.attributes['onmousemove']}"> <span id="ref#{clientId}:icon" @@ -56,7 +56,7 @@ <jsp:scriptlet><![CDATA[}]]></jsp:scriptlet> </span> - <a id="ref#{clientId}:anchor" class="dr-menu-label rich-menu-item-label" href="#">#{component.attributes['value']}</a> + <a id="ref#{clientId}:anchor" class="rich-menu-item-label" href="#">#{component.attributes['value']}</a> <div id="ref#{clientId}:folder" class="dr-menu-node rich-menu-item-folder"/> </div> @@ -87,8 +87,7 @@ <jsp:scriptlet><![CDATA[}]]></jsp:scriptlet> </span> - <span class="dr-menu-label dr-menu-label-disabled rich-menu-item-label-disabled">#{component.attributes['value']}</span> - + <span class="rich-menu-item-label-disabled">#{component.attributes['value']}</span> <div id="ref#{clientId}:folder" class="dr-menu-node rich-menu-item-folder-disabled"/> </div> Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-04-18 14:46:37 UTC (rev 440) +++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-04-18 14:49:11 UTC (rev 441) @@ -40,11 +40,11 @@ onmouseout="this.className='dr-menu-item dr-menu-item-enabled rich-menu-item rich-menu-item-enabled #{component.attributes['styleClass']}'; #{onmouseoutInlineStyles} $('#{clientId}:icon').className='dr-menu-icon rich-menu-item-icon #{component.attributes['iconClass']}'; - $('#{clientId}:anchor').className='dr-menu-label rich-menu-item-label';" + $('#{clientId}:anchor').className='rich-menu-item-label';" onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-item rich-menu-item-hover #{component.attributes['styleClass']} #{component.attributes['selectClass']}'; #{onmouseoverInlineStyles} $('#{clientId}:icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected #{component.attributes['iconClass']}'; - $('#{clientId}:anchor').className='dr-menu-label dr-menu-label-selected rich-menu-item-label rich-menu-item-label-selected';" + $('#{clientId}:anchor').className='rich-menu-item-label rich-menu-item-label-selected';" style="#{component.attributes['style']}" onclick="this.className='dr-menu-item dr-menu-item-enabled rich-menu-item rich-menu-item-enabled #{component.attributes['styleClass']}'; #{component.attributes['onselect']}; #{onclick}"> <f:call name="utils.encodeAttributes"> @@ -82,7 +82,7 @@ ]]></jsp:scriptlet> <span id="#{clientId}:disabled" - class="dr-menu-label dr-menu-label-disabled rich-menu-item-label rich-menu-item-label-disabled" + class="rich-menu-item-label rich-menu-item-label-disabled" #{component.attributes['value']} <f:call name="renderChildren" /> @@ -94,7 +94,7 @@ <a id="#{clientId}:anchor" href="#" - class="dr-menu-label rich-menu-item-label"> + class="rich-menu-item-label"> #{component.attributes['value']} <f:call name="renderChildren" /> </a> Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java =================================================================== --- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 14:46:37 UTC (rev 440) +++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 14:49:11 UTC (rev 441) @@ -201,7 +201,7 @@ assertNotNull(anchor); assertEquals("a", anchor.getNodeName()); String classAttr = anchor.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-menu-label rich-menu-item-label")); + assertTrue(classAttr.contains("rich-menu-item-label")); HtmlElement span = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext) + ":icon"); Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java =================================================================== --- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 14:46:37 UTC (rev 440) +++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 14:49:11 UTC (rev 441) @@ -161,7 +161,7 @@ assertEquals("span", span.getNodeName()); String classAttr = span.getAttributeValue("class"); assertTrue(classAttr - .contains("dr-menu-label dr-menu-label-disabled rich-menu-item-label rich-menu-item-label-disabled")); + .contains("rich-menu-item-label rich-menu-item-label-disabled")); span = page.getHtmlElementById(menuItem.getClientId(facesContext) + ":icon"); @@ -202,7 +202,7 @@ assertNotNull(anchor); assertEquals("a", anchor.getNodeName()); String classAttr = anchor.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-menu-label rich-menu-item-label")); + assertTrue(classAttr.contains("rich-menu-item-label")); HtmlElement span = page.getHtmlElementById(menuItem .getClientId(facesContext)