[richfaces-svn-commits] JBoss Rich Faces SVN: r14286 - in branches/community/3.3.X/ui/dataTable/src: main/java/org/richfaces/renderkit/html and 5 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri May 22 12:36:41 EDT 2009
Author: konstantin.mishin
Date: 2009-05-22 12:36:40 -0400 (Fri, 22 May 2009)
New Revision: 14286
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java
Log:
RF-7216 RF-7217
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -46,14 +46,14 @@
if(null != dt){
writer.startElement("dt", dt);
String rowClass = holder.getColumnClass(currentRow);
- encodeStyleClass(writer, null, "dr-definition-term rich-definition-term", null, rowClass);
+ encodeStyleClass(writer, null, "rich-definition-term", null, rowClass);
renderChild(context, dt);
writer.endElement("dt");
}
writer.startElement("dd", table);
getUtils().encodeId(context, table);
String rowClass = holder.getRowClass();
- encodeStyleClass(writer, null, "dr-definition rich-definition", null, rowClass);
+ encodeStyleClass(writer, null, "rich-definition", null, rowClass);
encodeRowEvents(context, table);
renderChildren(context, table);
writer.endElement("dd");
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -44,7 +44,7 @@
if(header != null ){
writer.startElement("thead", table);
String headerClass = (String) table.getAttributes().get("headerClass");
- encodeTableHeaderFacet(context, table.getColumns(), writer, header, "dr-table-header rich-table-header","dr-table-header-continue rich-table-header-continue", "dr-table-headercell rich-table-headercell", headerClass, "th");
+ encodeTableHeaderFacet(context, table.getColumns(), writer, header, "rich-table-header","rich-table-header-continue", "rich-table-headercell", headerClass, "th");
writer.endElement("thead");
}
}
@@ -55,7 +55,7 @@
if(footer != null ){
writer.startElement("tfoot", table);
String footerClass = (String) table.getAttributes().get("footerClass");
- encodeTableHeaderFacet(context, table.getColumns(), writer, footer, "dr-table-footer rich-table-footer","dr-table-footer-continue rich-table-footer-continue", "dr-table-footercell rich-table-footercell", footerClass, "td");
+ encodeTableHeaderFacet(context, table.getColumns(), writer, footer, "rich-table-footer","rich-table-footer-continue", "rich-table-footercell", footerClass, "td");
writer.endElement("tfoot");
}
@@ -85,14 +85,14 @@
writer.startElement(HTML.TR_ELEMENT, table);
String rowClass = holder.getRowClass(gridRowCounter);
- encodeStyleClass(writer, null, "dr-table-row rich-table-row", null, rowClass);
+ encodeStyleClass(writer, null, "rich-table-row", null, rowClass);
encodeRowEvents(context, table);
}
writer.startElement(HTML.td_ELEM, table);
getUtils().encodeId(context, table);
String columnClass = holder.getColumnClass(currentRow-gridRowCounter*cols);
- encodeStyleClass(writer, null, "dr-table-cell rich-table-cell", null, columnClass);
+ encodeStyleClass(writer, null, "rich-table-cell", null, columnClass);
renderChildren(context, table);
writer.endElement(HTML.td_ELEM);
}
@@ -114,7 +114,7 @@
for(int i = rest;i<columns.intValue();i++){
writer.startElement(HTML.td_ELEM, table);
String columnClass = tableHolder.getColumnClass(i);
- encodeStyleClass(writer, null, "dr-table-cell rich-table-cell", null, columnClass);
+ encodeStyleClass(writer, null, "rich-table-cell", null, columnClass);
writer.writeText("\u00A0", null);//
writer.endElement(HTML.td_ELEM);
}
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -44,7 +44,7 @@
writer.startElement("li", table);
getUtils().encodeId(context, table);
String rowClass = holder.getRowClass();
- encodeStyleClass(writer, null, "dr-list-item rich-list-item", null, rowClass);
+ encodeStyleClass(writer, null, "rich-list-item", null, rowClass);
encodeRowEvents(context, table);
renderChildren(context, table);
writer.endElement("li");
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -149,9 +149,9 @@
String captionClass = (String) table.getAttributes().get("captionClass");
if (captionClass != null) {
- captionClass = "dr-table-caption rich-table-caption " + captionClass;
+ captionClass = "rich-table-caption " + captionClass;
} else {
- captionClass = "dr-table-caption rich-table-caption";
+ captionClass = "rich-table-caption";
}
writer.writeAttribute("class", captionClass, "captionClass");
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -173,24 +173,24 @@
ResponseWriter writer = context.getResponseWriter();
writer.startElement("thead", table);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-thead", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-table-thead", null);
String headerClass = (String) table.getAttributes().get("headerClass");
if (header != null) {
encodeTableHeaderFacet(context, numberOfColumns, writer, header,
- "dr-table-header rich-table-header",
- "dr-table-header-continue rich-table-header-continue",
- "dr-table-headercell rich-table-headercell",
+ "rich-table-header",
+ "rich-table-header-continue",
+ "rich-table-headercell",
headerClass, "th");
}
if (columnFacetPresent || isFilterByPresent) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
- "dr-table-subheader rich-table-subheader", null,
+ "rich-table-subheader", null,
headerClass);
encodeHeaderFacets(context, writer, table.columns(),
- "dr-table-subheadercell rich-table-subheadercell",
+ "rich-table-subheadercell",
headerClass, "header", "th", numberOfColumns);
writer.endElement("tr");
@@ -318,20 +318,20 @@
if (columnFacetPresent) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
- "dr-table-subfooter rich-table-subfooter", null,
+ "rich-table-subfooter", null,
footerClass);
encodeHeaderFacets(context, writer, tableColumns,
- "dr-table-subfootercell rich-table-subfootercell",
+ "rich-table-subfootercell",
footerClass, "footer", "td",columns);
writer.endElement("tr");
}
if (footer != null) {
encodeTableHeaderFacet(context, columns, writer, footer,
- "dr-table-footer rich-table-footer",
- "dr-table-footer-continue rich-table-footer-continue",
- "dr-table-footercell rich-table-footercell",
+ "rich-table-footer",
+ "rich-table-footer-continue",
+ "rich-table-footercell",
footerClass, "td");
}
writer.endElement("tfoot");
@@ -425,21 +425,21 @@
* @return
*/
protected String getRowSkinClass() {
- return "dr-table-row rich-table-row";
+ return "rich-table-row";
}
/**
* @return
*/
protected String getFirstRowSkinClass() {
- return "dr-table-firstrow rich-table-firstrow";
+ return "rich-table-firstrow";
}
/**
* @return
*/
protected String getCellSkinClass() {
- return "dr-table-cell rich-table-cell";
+ return "rich-table-cell";
}
protected void encodeRowStart(FacesContext context, String skinClass,
@@ -746,7 +746,7 @@
if (sortableColumn) {
writer.startElement(HTML.SPAN_ELEM, column);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-sortable-header", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-table-sortable-header", null);
}
}
@@ -782,7 +782,7 @@
writer.writeAttribute(HTML.alt_ATTRIBUTE, "", null);
writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null);
writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-header-sort-img rich-sort-icon", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-sort-icon", null);
writer.endElement(HTML.IMG_ELEMENT);
}
writer.endElement(HTML.SPAN_ELEM);
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -46,7 +46,7 @@
if (null != parentPredefined) {
styleClass.append(parentPredefined).append(" ");
} else {
- styleClass.append("dr-table-cell rich-table-cell ");
+ styleClass.append("rich-table-cell ");
}
// Append class from parent component.
Object parent = requestMap.get(AbstractRowsRenderer.CELL_CLASS_KEY);
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -114,7 +114,7 @@
}
encodeStyleClass(context.getResponseWriter(), requestMap
.get(AbstractRowsRenderer.SKIN_CELL_CLASS_KEY),
- "dr-table-cell rich-table-cell", requestMap
+ "rich-table-cell", requestMap
.get(AbstractRowsRenderer.CELL_CLASS_KEY),
styleClass);
// TODO - encode column attributes.
@@ -156,7 +156,7 @@
.get(AbstractRowsRenderer.SKIN_FIRST_ROW_CLASS_KEY)
: requestMap.get(AbstractRowsRenderer.SKIN_ROW_CLASS_KEY);
encodeStyleClass(context.getResponseWriter(), skinRowClass,
- "dr-tablerow rich-tablerow", requestMap
+ "rich-tablerow", requestMap
.get(AbstractRowsRenderer.ROW_CLASS_KEY), styleClass);
encodeStyle(context.getResponseWriter(),null, null, null, style);
getUtils().encodePassThruWithExclusionsArray(context, colspan,EVENT_ATTRS);
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -66,8 +66,8 @@
facetName+"Class");
if (isColumnFacetPresent(dataTable, facetName)) {
writer.startElement(HTML.TR_ELEMENT, dataTable);
- encodeStyleClass(writer, null, "dr-subtable-"+facetName+" rich-subtable-"+facetName, null, headerClass);
- encodeHeaderFacets(context, writer, columns, "dr-subtable-"+facetName+"cell rich-subtable-"+facetName+"cell", headerClass,
+ encodeStyleClass(writer, null, "rich-subtable-"+facetName, null, headerClass);
+ encodeHeaderFacets(context, writer, columns, "rich-subtable-"+facetName+"cell", headerClass,
facetName, "td",colCount);
writer.endElement(HTML.TR_ELEMENT);
}
@@ -88,20 +88,20 @@
* @return
*/
protected String getRowSkinClass() {
- return "dr-subtable-row rich-subtable-row";
+ return "rich-subtable-row";
}
/**
* @return
*/
protected String getFirstRowSkinClass() {
- return "dr-subtable-firstrow rich-subtable-firstrow";
+ return "rich-subtable-firstrow";
}
/* (non-Javadoc)
* @see org.richfaces.renderkit.AbstractTableRenderer#getCellSkinClass()
*/
protected String getCellSkinClass() {
- return "dr-subtable-cell rich-subtable-cell";
+ return "rich-subtable-cell";
}
/*
* (non-Javadoc)
Modified: branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2009-05-22 16:36:40 UTC (rev 14286)
@@ -2,7 +2,7 @@
<f:template xmlns:f='http:/jsf.exadel.com/template'
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml" >
-<u:selector name=".dr-table" >
+<u:selector name=".rich-table" >
<u:style name="border-top" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -17,7 +17,7 @@
<u:style name="border-collapse" value="collapse" />
</u:selector>
-<u:selector name=".dr-table-cell" >
+<u:selector name=".rich-table-cell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -32,7 +32,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-subtable-cell" >
+<u:selector name=".rich-subtable-cell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -47,7 +47,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-header" >
+<u:selector name=".rich-table-header" >
<u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor-->
<u:style name="background-image" > <!--from headerGradientColor to headerBackgroundColor-->
<f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
@@ -56,11 +56,11 @@
<u:style name="background-repeat" value="repeat-x"/>
</u:selector>
-<u:selector name=".dr-table-header-continue" >
+<u:selector name=".rich-table-header-continue" >
<u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-headercell" >
+<u:selector name=".rich-table-headercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -77,18 +77,18 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-subheader" >
+<u:selector name=".rich-table-subheader" >
<u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-thead" >
+<u:selector name=".rich-table-thead" >
<u:style name="border-bottom" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
</u:style>
</u:selector>
-<u:selector name=".dr-table-subheadercell" >
+<u:selector name=".rich-table-subheadercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -102,13 +102,13 @@
</u:selector>
<f:verbatim>
- .dr-table-sortable-header {
+ .rich-table-sortable-header {
background-position: right center;
background-repeat: no-repeat;
white-space : nowrap;
}
- .dr-table-cursor-pointer {
+ .rich-table-cursor-pointer {
cursor: pointer;
}
@@ -116,21 +116,21 @@
cursor: default;
}
- .dr-table-header-sort-img {
+ .rich-sort-icon {
vertical-align: middle;
}
</f:verbatim>
-<u:selector name=".dr-table-footer" >
+<u:selector name=".rich-table-footer" >
<u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-footer-continue" >
+<u:selector name=".rich-table-footer-continue" >
<u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-footercell" >
+<u:selector name=".rich-table-footercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -147,11 +147,11 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-subfooter" >
+<u:selector name=".rich-table-subfooter" >
<u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-subfootercell" >
+<u:selector name=".rich-table-subfootercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -167,21 +167,21 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-firstrow .dr-table-cell" >
+<u:selector name=".rich-table-firstrow .rich-table-cell" >
<!-- <u:style name="border-top" value="2px solid">
<f:verbatim skin="tableBorderColor" />
</u:style> -->
</u:selector>
-<u:selector name=".dr-subtable-firstrow .dr-subtable-cell" >
+<u:selector name=".rich-subtable-firstrow .rich-subtable-cell" >
<!-- <u:style name="border" value="2px solid #c0c0c0"/>-->
</u:selector>
-<u:selector name=".dr-subtable-header" >
+<u:selector name=".rich-subtable-header" >
<u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
</u:selector>
-<u:selector name=".dr-subtable-headercell" >
+<u:selector name=".rich-subtable-headercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -198,11 +198,11 @@
</u:selector>
-<u:selector name=".dr-subtable-footer" >
+<u:selector name=".rich-subtable-footer" >
<u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-subtable-footercell" >
+<u:selector name=".rich-subtable-footercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss 2009-05-22 16:36:40 UTC (rev 14286)
@@ -3,13 +3,13 @@
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
-.dr-table{
+.rich-table{
border-top : 1px solid #c0c0c0; /*panelBorderColor*/
border-left : 1px solid #c0c0c0; /*panelBorderColor*/
background-color : #ffffff; /*tableBackgroundColor*/
}
-.dr-table-cell{
+.rich-table-cell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -18,7 +18,7 @@
font-family : verdana; /*generalFamilyFont*/
}
-.dr-subtable-cell{
+.rich-subtable-cell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -27,14 +27,14 @@
font-family : verdana; /*generalFamilyFont*/
}
-.dr-table-header{
+.rich-table-header{
background-color : #4A75B5; /*headerBackgroundColor*/
background-image : url(dttbl_header_bg.gif); /*from headerGradientColor to headerBackgroundColor*/
background-position : top left;
background-repeat : repeat-x;
}
-.dr-table-headercell{
+.rich-table-headercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -43,22 +43,22 @@
font-weight : bold;
}
-.dr-table-subheader{
+.rich-table-subheader{
background-color : #EAF0F8; /*additionalBackgroundColor*/
}
-.dr-table-subheadercell{
+.rich-table-subheadercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
text-align : center;
}
-.dr-table-footer{
+.rich-table-footer{
background-color : #cccccc; /*tableFooterBackgroundColor*/
}
-.dr-table-footercell{
+.rich-table-footercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -66,27 +66,27 @@
text-align : center;
font-weight : bold;
}
-.dr-table-subfooter{
+.rich-table-subfooter{
background-color : #f1f1f1; /*tableSubfooterBackgroundColor*/
}
-.dr-table-subfootercell{
+.rich-table-subfootercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
text-align : center;
}
-.dr-table-firstrow .dr-table-cell{
+.rich-table-firstrow .rich-table-cell{
border-top : 2px solid #c0c0c0;
}
-.dr-subtable-firstrow .dr-subtable-cell{
+.rich-subtable-firstrow .rich-subtable-cell{
/* border-top : 2px solid #c0c0c0;*/
}
-.dr-subtable-header{
+.rich-subtable-header{
background-color : #EAF0F8; /*additionalBackgroundColor*/
}
-.dr-subtable-headercell{
+.rich-subtable-headercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -94,11 +94,11 @@
}
-.dr-subtable-footer{
+.rich-subtable-footer{
background-color : #f1f1f1; /*tableSubfooterBackgroundColor*/
}
-.dr-subtable-footercell{
+.rich-subtable-footercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -12,7 +12,7 @@
>
<f:clientid var="clientId"/>
<dl id="#{clientId}"
- class="dr-deflist rich-deflist #{component.attributes['styleClass']}"
+ class="rich-deflist #{component.attributes['styleClass']}"
x:passThruWithExclusions="value,id,class"
>
<vcp:body>
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -14,7 +14,7 @@
<h:styles>css/table.xcss</h:styles>
<f:clientid var="clientId"/>
<table id="#{clientId}"
- class="dr-table rich-table #{component.attributes['styleClass']}"
+ class="rich-table #{component.attributes['styleClass']}"
x:passThruWithExclusions="value,name,type,class,id"
>
<f:call name="encodeCaption" />
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -12,7 +12,7 @@
>
<f:clientid var="clientId"/>
<ul id="#{clientId}"
- class="dr-list rich-datalist #{component.attributes['styleClass']}"
+ class="rich-datalist #{component.attributes['styleClass']}"
x:passThruWithExclusions="id,class"
>
<vcp:body>
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -12,7 +12,7 @@
>
<f:clientid var="clientId"/>
<ol id="#{clientId}"
- class="dr-list rich-orderedlist #{component.attributes['styleClass']}"
+ class="rich-orderedlist #{component.attributes['styleClass']}"
x:passThruWithExclusions="id,class"
>
<vcp:body>
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -15,7 +15,7 @@
<h:styles>css/table.xcss</h:styles>
<f:clientid var="clientId"/>
<table id="#{clientId}"
- class="dr-table rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" >
+ class="rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" >
<f:call name="utils.encodePassThruWithExclusions">
<f:parameter value="value,name,type,id,class,rows,style" />
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -154,7 +154,7 @@
assertNotNull(dl);
assertEquals("dl", dl.getNodeName());
String classAttr = dl.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-deflist rich-deflist"));
+ assertTrue(classAttr.contains("rich-deflist"));
List dds = dl.getHtmlElementsByTagName("dd");
assertTrue(dds.size() > 0);
@@ -162,7 +162,7 @@
HtmlElement dd = (HtmlElement) dds.get(0);
assertNotNull(dd);
classAttr = dd.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-definition rich-definition"));
+ assertTrue(classAttr.contains("rich-definition"));
}
/**
@@ -187,7 +187,7 @@
assertNotNull(dl);
assertEquals("dl", dl.getNodeName());
String classAttr = dl.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-deflist rich-deflist"));
+ assertTrue(classAttr.contains("rich-deflist"));
List dts = dl.getHtmlElementsByTagName("dt");
assertTrue(dts.size() > 0);
@@ -196,7 +196,7 @@
assertNotNull(dt);
classAttr = dt.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-definition-term rich-definition-term"));
+ .contains("rich-definition-term"));
List dds = dl.getHtmlElementsByTagName("dd");
assertTrue(dds.size() > 0);
@@ -204,7 +204,7 @@
HtmlElement dd = (HtmlElement) dds.get(0);
assertNotNull(dd);
classAttr = dd.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-definition rich-definition"));
+ assertTrue(classAttr.contains("rich-definition"));
Iterator fixedChildren = dataList.fixedChildren();
assertNotNull(fixedChildren);
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -147,13 +147,13 @@
assertNotNull(table);
assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table rich-table"));
+ assertTrue(classAttr.contains("rich-table"));
List captions = table.getHtmlElementsByTagName("caption");
assertNotNull(captions);
assertEquals(1, captions.size());
classAttr = ((HtmlElement) captions.get(0)).getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-caption rich-table-caption"));
+ assertTrue(classAttr.contains("rich-table-caption"));
List headers = table.getHtmlElementsByTagName("thead");
assertNotNull(headers);
@@ -164,7 +164,7 @@
HtmlElement tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-header rich-table-header"));
+ assertTrue(classAttr.contains("rich-table-header"));
List tds = tr.getHtmlElementsByTagName("th");
assertTrue(tds.size() > 0);
@@ -172,7 +172,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-table-headercell rich-table-headercell"));
+ .contains("rich-table-headercell"));
List footers = table.getHtmlElementsByTagName("tfoot");
assertNotNull(footers);
@@ -182,7 +182,7 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footer rich-table-footer"));
+ assertTrue(classAttr.contains("rich-table-footer"));
tds = tr.getHtmlElementsByTagName("td");
assertTrue(tds.size() > 0);
@@ -190,7 +190,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-table-footercell rich-table-footercell"));
+ .contains("rich-table-footercell"));
List bodies = table.getHtmlElementsByTagName("tbody");
assertEquals(1, bodies.size());
@@ -199,7 +199,7 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-row rich-table-row"));
+ assertTrue(classAttr.contains("rich-table-row"));
assertTrue(classAttr.contains("row1"));
tds = tr.getHtmlElementsByTagName("td");
@@ -207,7 +207,7 @@
td = (HtmlElement) tds.get(0);
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-cell rich-table-cell"));
+ assertTrue(classAttr.contains("rich-table-cell"));
assertTrue(classAttr.contains("A"));
}
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -156,7 +156,7 @@
assertNotNull(ul);
assertEquals("ul", ul.getNodeName());
String classAttr = ul.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list rich-datalist"));
+ assertTrue(classAttr.contains("rich-datalist"));
classAttr = ul.getAttributeValue("type");
@@ -166,7 +166,7 @@
HtmlElement li = (HtmlElement) lis.get(0);
assertNotNull(li);
classAttr = li.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list-item rich-list-item"));
+ assertTrue(classAttr.contains("rich-list-item"));
}
}
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -156,7 +156,7 @@
assertNotNull(ol);
assertEquals("ol", ol.getNodeName());
String classAttr = ol.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list rich-orderedlist"));
+ assertTrue(classAttr.contains("rich-orderedlist"));
classAttr = ol.getAttributeValue("type");
List lis = ol.getHtmlElementsByTagName("li");
@@ -165,7 +165,7 @@
HtmlElement li = (HtmlElement) lis.get(0);
assertNotNull(li);
classAttr = li.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list-item rich-list-item"));
+ assertTrue(classAttr.contains("rich-list-item"));
}
}
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -214,7 +214,7 @@
assertNotNull(table);
assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table rich-table"));
+ assertTrue(classAttr.contains("rich-table"));
List<?> elements = table.getHtmlElementsByTagName("col");
assertEquals(2, elements.size());
@@ -230,7 +230,7 @@
HtmlElement tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-firstrow rich-table-firstrow"));
+ assertTrue(classAttr.contains("rich-table-firstrow"));
classAttr = tr.getAttributeValue("onmouseover");
assertTrue(classAttr.contains("onRowMouseOver"));
for (int i = 1; i < trs.size(); i++) {
@@ -242,8 +242,6 @@
classAttr.contains("onRowMouseOver"));
classAttr = tr.getAttributeValue("class");
- assertFalse("Row i = " + i + " have 'dr-table-firstrow' style",
- classAttr.contains("dr-table-firstrow"));
assertFalse("Row i = " + i + " have 'rich-table-firstrow' style",
classAttr.contains("rich-table-firstrow"));
}
@@ -253,7 +251,7 @@
HtmlElement td = (HtmlElement) tds.next();
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-cell rich-table-cell"));
+ assertTrue(classAttr.contains("rich-table-cell"));
}
/**
@@ -309,7 +307,7 @@
assertEquals(1, captions.size());
String classAttr = ((HtmlElement) captions.get(0))
.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-caption rich-table-caption"));
+ assertTrue(classAttr.contains("rich-table-caption"));
List<?> headers = table.getHtmlElementsByTagName("thead");
assertNotNull(headers);
@@ -319,7 +317,7 @@
HtmlElement tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-header rich-table-header"));
+ assertTrue(classAttr.contains("rich-table-header"));
Iterator<?> tds = tr.getChildIterator();
assertNotNull(tds);
@@ -327,7 +325,7 @@
HtmlElement td = (HtmlElement) tds.next();
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-headercell rich-table-headercell"));
+ assertTrue(classAttr.contains("rich-table-headercell"));
assertTrue(classAttr.contains("cola"));
List<?> footers = table.getHtmlElementsByTagName("tfoot");
@@ -338,14 +336,14 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footer rich-table-footer "));
+ assertTrue(classAttr.contains("rich-table-footer "));
tds = tr.getChildIterator();
assertTrue(tds.hasNext());
td = (HtmlElement) tds.next();
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footercell rich-table-footercell "));
+ assertTrue(classAttr.contains("rich-table-footercell "));
Iterator<?> fixedChildren = dataTable.fixedChildren();
assertNotNull(fixedChildren);
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -178,8 +178,7 @@
String clazz = span.getAttributeValue(HTML.class_ATTRIBUTE);
assertNotNull(clazz);
- //assertTrue(clazz.contains("dr-table-header-sort-up"));
- assertTrue(clazz.contains("dr-table-sortable-header"));
+ assertTrue(clazz.contains("rich-table-sortable-header"));
DomText text = (DomText) span.getFirstDomChild();
assertNotNull(text);
More information about the richfaces-svn-commits
mailing list