Author: sergeyhalipov Date: 2008-02-28 06:38:27 -0500 (Thu, 28 Feb 2008) New Revision: 6399 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss Log: Rendering of table headers. Some optimization. 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-28 11:37:24 UTC (rev 6398) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 11:38:27 UTC (rev 6399) @@ -495,10 +495,11 @@ filterValueInput.setId(column.getId() + SORT_FILTER_PARAMETER); filterValueInput.setImmediate(true); column.getFacets().put(FILTER_INPUT_FACET_NAME, filterValueInput); + filterValueInput.getAttributes().put(HTML.onclick_ATTRIBUTE, "Event.stop(event);"); } - String onkeydownEvent = inplaceInput ? "oninputkeydown" : "onkeydown"; + String onkeydownEvent = inplaceInput ? "oninputkeydown" : HTML.onkeydown_ATTRIBUTE; - filterValueInput.getAttributes().put("onchange", buffer.toString()); + filterValueInput.getAttributes().put(HTML.onchange_ATTRIBUTE, buffer.toString()); filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);"); filterValueInput.setValue(column.getAttributes().get("filterValue")); @@ -551,14 +552,15 @@ String clientId = col.getClientId(context) + facetName; writer.writeAttribute("id", clientId, null); + if (sortableColumn && col.isSelfSorted()) { + writer.writeAttribute(HTML.onclick_ATTRIBUTE, buildAjaxFunction(context, column, true) + .toString(), null); + writer.writeAttribute(HTML.style_ATTRIBUTE, "cursor: pointer;", null); + } + writer.startElement(HTML.DIV_ELEM, column); if (sortableColumn) { - if (col.isSelfSorted()) { - writer.writeAttribute(HTML.onclick_ATTRIBUTE, buildAjaxFunction(context, column, true) - .toString(), null); - writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-cursor-pointer", null); - } writer.startElement(HTML.SPAN_ELEM, column); String spanClass = ""; if (Ordering.ASCENDING.equals(col.getSortOrder())) { Modified: trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss =================================================================== --- trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2008-02-28 11:37:24 UTC (rev 6398) +++ trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2008-02-28 11:38:27 UTC (rev 6399) @@ -111,6 +111,10 @@ .dr-table-cursor-pointer { cursor: pointer; } + + .rich-inplace-edit, .rich-inplace-view { + cursor: default; + } </f:verbatim> <u:selector name=".dr-table-header-sort-down" >