Author: sergeyhalipov Date: 2008-02-20 12:21:47 -0500 (Wed, 20 Feb 2008) New Revision: 6224 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: Triangle images added to sortable headers. Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-20 17:19:15 UTC (rev 6223) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-20 17:21:47 UTC (rev 6224) @@ -161,6 +161,8 @@ String columnHeaderClass = (String) column.getAttributes().get( classAttribute); writer.startElement(element, column); + encodeStyleClass(writer, null, skinCellClass, headerClass, + columnHeaderClass); writer.writeAttribute("scope", "col", null); getUtils().encodeAttribute(context, column, "colspan"); @@ -189,16 +191,17 @@ writer.writeAttribute(HTML.onclick_ATTRIBUTE, buffer .toString(), null); } - columnHeaderClass = "dr-table-sortable-header " + columnHeaderClass; + writer.startElement(HTML.SPAN_ELEM, column); + String spanClass = ""; if (Ordering.ASCENDING.equals(col.getSortOrder())) { - columnHeaderClass = "dr-table-header-sort-up " + columnHeaderClass; + spanClass = "dr-table-header-sort-up dr-table-sortable-header"; } else if (Ordering.DESCENDING.equals(col.getSortOrder())) { - columnHeaderClass = "dr-table-header-sort-down " + columnHeaderClass; + spanClass = "dr-table-header-sort-down dr-table-sortable-header"; } + writer.writeAttribute(HTML.class_ATTRIBUTE, spanClass, null); } } - encodeStyleClass(writer, null, skinCellClass, headerClass, - columnHeaderClass); + UIComponent facet = column.getFacet(facetName); if (facet != null) { renderChild(context, facet); @@ -215,6 +218,7 @@ writer.writeAttribute(HTML.width_ATTRIBUTE, "16", null); writer.endElement(HTML.IMG_ELEMENT); } + writer.endElement(HTML.SPAN_ELEM); } if (((org.richfaces.component.UIColumn)column).getFilterMethod() == null && column.getValueExpression("filterExpression") == null