Author: abelevich Date: 2010-12-03 05:14:01 -0500 (Fri, 03 Dec 2010) New Revision: 20330 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBar.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBarGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolBar.ecss Log: https://jira.jboss.org/browse/RF-9886, https://jira.jboss.org/browse/RF-9885 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBar.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBar.java 2010-12-03 10:02:10 UTC (rev 20329) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBar.java 2010-12-03 10:14:01 UTC (rev 20330) @@ -32,7 +32,7 @@ import org.richfaces.renderkit.html.ToolBarRendererBase; @JsfComponent(family = AbstractToolBar.COMPONENT_FAMILY, type = AbstractToolBar.COMPONENT_TYPE, - renderer=@JsfRenderer(type = ToolBarRendererBase.RENDERER_TYPE), tag = @Tag(name="toolBar") + renderer=@JsfRenderer(type = ToolBarRendererBase.RENDERER_TYPE), tag = @Tag(name="toolbar") ) public abstract class AbstractToolBar extends UIComponentBase { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBarGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBarGroup.java 2010-12-03 10:02:10 UTC (rev 20329) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolBarGroup.java 2010-12-03 10:14:01 UTC (rev 20330) @@ -37,7 +37,7 @@ import org.richfaces.renderkit.html.ToolBarGroupRenderer; @JsfComponent(family = AbstractToolBar.COMPONENT_FAMILY, type = AbstractToolBarGroup.COMPONENT_TYPE, - renderer=@JsfRenderer(type = ToolBarGroupRenderer.RENDERER_TYPE), tag = @Tag(name="toolBarGroup")) + renderer=@JsfRenderer(type = ToolBarGroupRenderer.RENDERER_TYPE), tag = @Tag(name="toolbarGroup")) public abstract class AbstractToolBarGroup extends UIComponentBase { public static final String COMPONENT_TYPE = "org.richfaces.ToolBarGroup"; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2010-12-03 10:02:10 UTC (rev 20329) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2010-12-03 10:14:01 UTC (rev 20330) @@ -236,11 +236,15 @@ writer.startElement(HtmlConstants.TD_ELEM, component); String separatorClass = "rf-tb-sep"; - + concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass")); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, separatorClass, null); + if (separator != null) { String itemSeparatorClass = "rf-tb-sep-" + separator.toString().toLowerCase(); - separatorClass = concatClasses(separatorClass, itemSeparatorClass, (String) component.getAttributes().get("separatorClass")); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, separatorClass, null); + writer.startElement(HtmlConstants.DIV_ELEM, component); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, itemSeparatorClass, null); + writer.write("&nbsp;"); + writer.endElement(HtmlConstants.DIV_ELEM); } else { concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass")); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, separatorClass, null); Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-03 10:02:10 UTC (rev 20329) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-03 10:14:01 UTC (rev 20330) @@ -7,7 +7,7 @@ <namespace>http://richfaces.org/output</namespace> <tag> - <tag-name>toolBar</tag-name> + <tag-name>toolbar</tag-name> <component> <component-type>org.richfaces.ToolBar</component-type> <renderer-type>org.richfaces.ToolBarRenderer</renderer-type> @@ -86,7 +86,7 @@ </attribute> </tag> <tag> - <tag-name>toolBarGroup</tag-name> + <tag-name>toolbarGroup</tag-name> <component> <component-type>org.richfaces.ToolBarGroup</component-type> <renderer-type>org.richfaces.ToolBarGroupRenderer</renderer-type> Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolBar.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolBar.ecss 2010-12-03 10:02:10 UTC (rev 20329) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolBar.ecss 2010-12-03 10:14:01 UTC (rev 20330) @@ -24,24 +24,39 @@ text-align:center; background-repeat:no-repeat; background-position:center center; + height: 100%; } .rf-tb-cntr{ vertical-align:middle; } +.rf-tb-sep-grid, .rf-tb-sep-line, .rf-tb-sep-disc, .rf-tb-sep-square { + padding: 0px 0px 0px 0px; + background-position:center center; + height: 80%; +} + .rf-tb-sep-grid { background-image:url("#{resource['org.richfaces.renderkit.html.images.GridSeparatorImage']}"); + width: 9px; + background-repeat: repeat-y; } .rf-tb-sep-line { + width: 2px; background-image:url("#{resource['org.richfaces.renderkit.html.images.LineSeparatorImage']}"); + background-repeat: repeat-y; } .rf-tb-sep-disc { + width: 9px; background-image:url("#{resource['org.richfaces.renderkit.html.images.DotSeparatorImage']}"); + background-repeat: no-repeat; } .rf-tb-sep-square { + width: 9px; background-image:url("#{resource['org.richfaces.renderkit.html.images.SquareSeparatorImage']}"); + background-repeat: no-repeat; } \ No newline at end of file