Author: nbelaevski Date: 2010-07-27 09:07:48 -0400 (Tue, 27 Jul 2010) New Revision: 18246 Modified: root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java Log: https://jira.jboss.org/browse/RF-8969 Modified: root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java =================================================================== --- root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-07-27 13:01:36 UTC (rev 18245) +++ root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-07-27 13:07:48 UTC (rev 18246) @@ -134,7 +134,7 @@ } rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-lst-t rf-dlst-t")); + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-t")); termFacet.encodeAll(context); writer.endElement(HTML.DT_ELEMENT); } @@ -146,7 +146,7 @@ } rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-lst-i rf-dlst-d")); + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-d")); renderHandlers(context, sequence); rendererUtils.encodeChildren(context, sequence); writer.endElement(HTML.DD_ELEMENT); @@ -192,20 +192,20 @@ } - private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-lst-i rf-ulst-i"); + private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-i"); - private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-lst-i rf-olst-i"); + private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-i"); private ItemsEncoder definitionItemsEncoder = new DefinitionItemsEncoder(); protected String getListClass(ListType type) { switch (type) { case ordered: - return "rf-lst rf-olst"; + return "rf-olst"; case unordered: - return "rf-lst rf-ulst"; + return "rf-ulst"; case definitions: - return "rf-lst rf-dlst"; + return "rf-dlst"; default: throw new IllegalArgumentException(type.toString()); Modified: root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss =================================================================== --- root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-07-27 13:01:36 UTC (rev 18245) +++ root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-07-27 13:07:48 UTC (rev 18246) @@ -1,4 +1,4 @@ -.rf-lst-i, .rf-dlst-t, .rf-dlst-d { +.rf-ulst-i, .rf-olst-i, .rf-dlst-t, .rf-dlst-d { font-size: '#{richSkin.generalSizeFont}'; font-family: '#{richSkin.generalFamilyFont}'; color: '#{richSkin.generalTextColor}'; Modified: root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java =================================================================== --- root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-07-27 13:01:36 UTC (rev 18245) +++ root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-07-27 13:07:48 UTC (rev 18246) @@ -73,8 +73,8 @@ assertEquals(1, nodes.size()); HtmlElement list = (HtmlElement) nodes.get(0); assertEquals("ol", list.getNodeName()); - assertEquals("rf-lst rf-olst", list.getAttribute(HTML.CLASS_ATTRIBUTE)); - verifySimpleListItems(list, "rf-lst-i rf-olst-i"); + assertEquals("rf-olst", list.getAttribute(HTML.CLASS_ATTRIBUTE)); + verifySimpleListItems(list, "rf-olst-i"); } @Test @@ -86,8 +86,8 @@ HtmlElement list = (HtmlElement) nodes.get(0); assertEquals("ul", list.getNodeName()); - assertEquals("rf-lst rf-ulst", list.getAttribute(HTML.CLASS_ATTRIBUTE)); - verifySimpleListItems((HtmlElement) list, "rf-lst-i rf-ulst-i"); + assertEquals("rf-ulst", list.getAttribute(HTML.CLASS_ATTRIBUTE)); + verifySimpleListItems((HtmlElement) list, "rf-ulst-i"); } @Test @@ -141,7 +141,7 @@ HtmlElement item = (HtmlElement) termItems.get(i); assertEquals("dt", item.getNodeName()); - assertEquals("rf-lst-t rf-dlst-t", item.getAttribute("class")); + assertEquals("rf-dlst-t", item.getAttribute("class")); assertEquals(data.getTerm(), item.asText()); } @@ -150,7 +150,7 @@ HtmlElement item = (HtmlElement) definitionItems.get(i); assertEquals("dd", item.getNodeName()); - assertEquals("rf-lst-i rf-dlst-d", item.getAttribute("class")); + assertEquals("rf-dlst-d", item.getAttribute("class")); assertEquals(data.getDefinition(), item.asText()); } }