Author: pgolawski Date: 2008-11-06 03:27:00 -0500 (Thu, 06 Nov 2008) New Revision: 11040 Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java Log: print empty sort image if column is not sortable, sort image width and height attributes moved to extdt-header-sort-img CSS class Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java =================================================================== --- trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-11-06 08:24:11 UTC (rev 11039) +++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-11-06 08:27:00 UTC (rev 11040) @@ -1512,11 +1512,9 @@ AjaxContext.getCurrentInstance().addRenderedArea( clientId + ":sortDiv"); - if (sortableColumn) { - writer.startElement(HTML.SPAN_ELEM, column); - writer.writeAttribute(HTML.class_ATTRIBUTE, + writer.startElement(HTML.SPAN_ELEM, column); + writer.writeAttribute(HTML.class_ATTRIBUTE, "extdt-sortable-header", null); - } } } @@ -1528,8 +1526,8 @@ String clientId = dataColumn.getClientId(context) + facetName; String tableId = dataColumn.getParent().getClientId(context); + String imageUrl = null; if (sortableColumn) { - String imageUrl = null; if (Ordering.ASCENDING.equals(dataColumn.getSortOrder())) { if (null != dataColumn.getSortIconAscending()) { imageUrl = dataColumn.getSortIconAscending(); @@ -1556,21 +1554,20 @@ .getUri(context, null); } } - - if (imageUrl != null) { - writer.startElement(HTML.IMG_ELEMENT, column); - writer.writeAttribute(HTML.src_ATTRIBUTE, imageUrl, - null); - writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); - writer - .writeAttribute(HTML.height_ATTRIBUTE, "15", - null); - writer.writeAttribute(HTML.class_ATTRIBUTE, - "extdt-header-sort-img", null); - writer.endElement(HTML.IMG_ELEMENT); - } - writer.endElement(HTML.SPAN_ELEM); } + else{ + //set empty image + imageUrl = getResource("/org/richfaces/renderkit/html/images/s.gif").getUri(context, null); + } + if (imageUrl != null) { + writer.startElement(HTML.IMG_ELEMENT, column); + writer.writeAttribute(HTML.src_ATTRIBUTE, imageUrl, + null); + writer.writeAttribute(HTML.class_ATTRIBUTE, + "extdt-header-sort-img", null); + writer.endElement(HTML.IMG_ELEMENT); + } + writer.endElement(HTML.SPAN_ELEM); writer.endElement(HTML.DIV_ELEM);