[richfaces-svn-commits] JBoss Rich Faces SVN: r9269 - in trunk/sandbox/ui/extendedDataTable/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Jun 27 06:56:53 EDT 2008
Author: pkawiak
Date: 2008-06-27 06:56:53 -0400 (Fri, 27 Jun 2008)
New Revision: 9269
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss
Log:
Changes in style names and in style classes definitions
Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-06-27 10:52:20 UTC (rev 9268)
+++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-06-27 10:56:53 UTC (rev 9269)
@@ -210,10 +210,10 @@
"captionStyle");
writer.startElement("caption", table);
if (captionClass != null) {
- captionClass = "dr-table-caption rich-table-caption "
+ captionClass = "extdt-caption rich-extdt-caption "
+ captionClass;
} else {
- captionClass = "dr-table-caption rich-table-caption";
+ captionClass = "extdt-caption rich-extdt-caption";
}
writer.writeAttribute("class", captionClass, "captionClass");
if (captionStyle != null) {
Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-06-27 10:52:20 UTC (rev 9268)
+++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-06-27 10:56:53 UTC (rev 9269)
@@ -153,30 +153,30 @@
writer.writeAttribute(HTML.id_ATTRIBUTE, table
.getBaseClientId(context)
+ ":header", null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-thead", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "extdt-thead", null);
String headerClass = (String) table.getAttributes().get(
"headerClass");
// String menuId = (String) table.getAttributes().get(MENU_ID);
if (header != null) {
writer.startElement("tr", header);
encodeStyleClass(writer, null,
- "dr-table-header rich-table-header", headerClass, null);
+ "extdt-header rich-extdt-header", headerClass, null);
writer.writeAttribute(HTML.id_ATTRIBUTE, table
.getBaseClientId(context)
+ ":fakeIeRow", null);
for (int i = 0; i < numberOfColumns; i++) {
writer.startElement("th", header);
encodeStyleClass(writer, null,
- "dr-table-headercell rich-table-headercell",
+ "extdt-headercell rich-extdt-headercell",
headerClass, null);
writer.endElement("th");
}
writer.endElement("tr");
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",
+ header, "extdt-header rich-extdt-header",
+ "extdt-header-continue rich-extdt-header-continue",
+ "extdt-headercell rich-extdt-headercell",
headerClass, "th", "header");
}
@@ -186,26 +186,26 @@
.getBaseClientId(context)
+ ":headerRow", null);
encodeStyleClass(writer, null,
- "dr-table-subheader rich-table-subheader", null,
+ "extdt-subheader rich-extdt-subheader", null,
headerClass);
encodeHeaderFacets(
context,
writer,
table,
colums,
- "extdt-dr-menucell extdt-subheadercell rich-table-subheadercell",
+ "extdt-dr-menucell extdt-subheadercell rich-extdt-subheadercell",
headerClass, "header", "th", numberOfColumns);
/* encoding additional empty column used in resizing columns */
writer.startElement("th", table);
encodeStyleClass(writer, null,
- "extdt-subheadercell rich-table-subheadercell", null,
+ "extdt-subheadercell rich-extdt-subheadercell", null,
null);
writer.endElement("th");
writer.endElement("tr");
encodeFilterRow(context, writer, table, table
.getSortedColumns(),
- "extdt-subheadercell rich-table-subheadercell",
+ "extdt-subheadercell rich-extdt-subheadercell",
headerClass, "header", HTML.th_ELEM);
}
@@ -223,13 +223,13 @@
.getBaseClientId(context)
+ ":filterRow", null);
encodeStyleClass(writer, null,
- "extdt-table-filterrow rich-table-subheader", null,
+ "extdt-table-filterrow rich-extdt-subheader", null,
headerClass);
encodeFilterInputs(context, writer, table, headers, skinCellClass,
headerClass, facetName, element);
writer.startElement(HTML.th_ELEM, table);
encodeStyleClass(writer, null,
- "extdt-subheadercell rich-table-subheadercell", null, null);
+ "extdt-subheadercell rich-extdt-subheadercell", null, null);
writer.endElement(HTML.th_ELEM);
writer.endElement(HTML.TR_ELEMENT);
}
@@ -439,24 +439,24 @@
if (columnFacetPresent) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
- "dr-table-subfooter rich-table-subfooter", null,
+ "extdt-subfooter rich-extdt-subfooter", null,
footerClass);
encodeHeaderFacets(context, writer, table, tableColumns,
- "dr-table-subfootercell rich-table-subfootercell",
+ "extdt-subfootercell rich-extdt-subfootercell",
footerClass, "footer", "td", columns);
writer.startElement("td", table);
encodeStyleClass(writer, null,
- "dr-table-subfootercell rich-table-subfootercell", null,
+ "extdt-subfootercell rich-extdt-subfootercell", null,
null);
writer.endElement("td");
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",
+ "extdt-footer rich-extdt-footer",
+ "extdt-footer-continue rich-extdt-footer-continue",
+ "extdt-footercell rich-extdt-footercell",
footerClass, "td", "footer");
}
writer.endElement("tfoot");
@@ -522,7 +522,7 @@
writer.startElement(HTML.td_ELEM, table);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dr-table-cell extdt-group-cell", null);
+ "extdt-cell extdt-group-cell", null);
writer.writeAttribute("colspan", numberOfColumns, null);
writer.startElement(HTML.SPAN_ELEM, table);
writer.startElement(HTML.IMG_ELEMENT, table);
@@ -648,7 +648,7 @@
encodeStyleClass(writer, null, getCellSkinClass(), null, null);
// TODO - encode column attributes.
writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute("class", "dt-cell-div", null);
+ writer.writeAttribute("class", "extdt-cell-div", null);
// writer.writeAttribute("class", "dt-sdt-bcbody", null); //KAW
// IE
renderChildren(context, column);
@@ -663,7 +663,7 @@
String columnClass = holder.getColumnClass(currentColumn);
encodeStyleClass(writer, null, getCellSkinClass(), null, columnClass);
writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute("class", "dt-cell-div", null);
+ writer.writeAttribute("class", "extdt-cell-div", null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.td_ELEM);
// Close row if then is open.
@@ -683,23 +683,21 @@
* @return
*/
protected String getRowSkinClass() {
- return "dr-table-row rich-table-row";
+ return "extdt-row rich-extdt-row";
}
/**
* @return
*/
protected String getFirstRowSkinClass() {
- return "dr-table-firstrow rich-table-firstrow";
- // return "dt-sdt-rb rich-table-firstrow"; //KAW IE
+ return "extdt-firstrow rich-extdt-firstrow";
}
/**
* @return
*/
protected String getCellSkinClass() {
- return "dr-table-cell rich-table-cell";
- // return "dt-sdt-bc rich-table-cell"; //KAW IE
+ return "extdt-cell rich-extdt-cell";
}
@@ -1390,7 +1388,7 @@
if (sortableColumn) {
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dr-table-sortable-header", null);
+ "extdt-sortable-header", null);
}
}
@@ -1430,7 +1428,7 @@
writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null);
writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dr-table-header-sort-img", null);
+ "extdt-header-sort-img", null);
writer.endElement(HTML.IMG_ELEMENT);
}
writer.endElement(HTML.SPAN_ELEM);
@@ -1490,7 +1488,7 @@
if (sortableColumn) {
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dr-table-sortable-header", null);
+ "extdt-sortable-header", null);
}
}
}
@@ -1541,7 +1539,7 @@
.writeAttribute(HTML.height_ATTRIBUTE, "15",
null);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dr-table-header-sort-img", null);
+ "extdt-header-sort-img", null);
writer.endElement(HTML.IMG_ELEMENT);
}
writer.endElement(HTML.SPAN_ELEM);
Modified: trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-06-27 10:52:20 UTC (rev 9268)
+++ trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-06-27 10:56:53 UTC (rev 9269)
@@ -221,6 +221,9 @@
top: 9px;
}
+ .extdt-caption{
+ }
+
.dt-sdt-hdrop-bottom-left{
background-position: bottom left;
left: -5px;
@@ -231,7 +234,7 @@
right: -4px;
}
- .dt-cell-div {
+ .extdt-cell-div {
cursor: default;
font-weight: normal;
white-space: nowrap;
@@ -383,7 +386,7 @@
</u:style>
</u:selector>
-<u:selector name=".dr-table" >
+<u:selector name=".extdt" >
<u:style name="border-top" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -402,7 +405,7 @@
<u:style name="border-collapse" value="collapse" />
</u:selector>
-<u:selector name=".dr-table-cell" >
+<u:selector name=".extdt-cell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -432,7 +435,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-header" >
+<u:selector name=".extdt-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"/>
@@ -441,11 +444,11 @@
<u:style name="background-repeat" value="repeat-x"/>
</u:selector>
-<u:selector name=".dr-table-header-continue" >
+<u:selector name=".extdt-header-continue" >
<u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-headercell" >
+<u:selector name=".extdt-headercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -462,7 +465,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-subheader" >
+<u:selector name=".extdt-subheader" >
<u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
</u:selector>
@@ -474,7 +477,7 @@
</u:style>
</u:selector>
-<u:selector name=".dr-table-thead" >
+<u:selector name=".extdt-thead" >
<u:style name="border-bottom" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -499,13 +502,13 @@
</u:selector>
<f:verbatim>
- .dr-table-sortable-header {
+ .extdt-sortable-header {
background-position: right center;
background-repeat: no-repeat;
white-space : nowrap;
}
- .dr-table-cursor-pointer {
+ .extdt-cursor-pointer {
cursor: pointer;
}
@@ -513,21 +516,33 @@
cursor: default;
}
- .dr-table-header-sort-img {
+ .extdt-header-sort-img {
vertical-align: middle;
}
</f:verbatim>
-<u:selector name=".dr-table-footer" >
+<u:selector name=".extdt-footer" >
<u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-footer-continue" >
+<u:selector name=".extdt-footer-continue" >
<u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-footercell" >
+<u:selector name=".extdt-caption" >
+ <u:style name="border-bottom" value="solid"> <!--tableBorderColor-->
+ <f:verbatim skin="tableBorderWidth" />
+ <f:verbatim skin="tableBorderColor" />
+ </u:style>
+ <u:style name="color" skin="generalTextColor"/> <!--headerTextColor-->
+ <u:style name="font-weight" skin="headerWeightFont"/>
+ <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont-->
+ <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
+ <u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
+</u:selector>
+
+<u:selector name=".extdt-footercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -544,11 +559,11 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-subfooter" >
+<u:selector name=".extdt-subfooter" >
<u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-subfootercell" >
+<u:selector name=".extdt-subfootercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -564,7 +579,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-firstrow .dr-table-cell" >
+<u:selector name=".extdt-firstrow .extdt-cell" >
<!-- <u:style name="border-top" value="2px solid">
<f:verbatim skin="tableBorderColor" />
</u:style> -->
More information about the richfaces-svn-commits
mailing list