[richfaces-svn-commits] JBoss Rich Faces SVN: r14378 - in branches/community/3.3.X/ui/scrollableDataTable/src: main/javascript/ClientUI/controls/grid and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed May 27 11:41:03 EDT 2009
Author: konstantin.mishin
Date: 2009-05-27 11:41:03 -0400 (Wed, 27 May 2009)
New Revision: 14378
Modified:
branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java
branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java
Log:
RF-7218
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -202,7 +202,7 @@
widthPx = getFormattedWidth(widthPx);
int width = Integer.parseInt(widthPx);
- writer.writeText("#" + getNormalizedId(context, state.getGrid())+ " .dr-sdt-c-" + cell_index + " {", "width");
+ writer.writeText("#" + getNormalizedId(context, state.getGrid())+ " .rich-sdt-c-" + cell_index + " {", "width");
writer.writeText("width: " + width + "px;", "width");
writer.writeText("}", "width");
return 0;
@@ -345,7 +345,7 @@
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid));
getUtils().writeAttribute(writer, "id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","rich-sdt-row " + state.getRowClass());
addRowJavascriptEvents(writer, grid);
if (log.isDebugEnabled()) {
log.debug("rowIndex : " + index);
@@ -354,9 +354,9 @@
ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state);
if(!state.isFrozenPart()){
writer.startElement("td", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-bc dr-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
+ getUtils().writeAttribute(writer, "class","rich-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
writer.startElement(HTML.DIV_ELEM, grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-cbody");
+ getUtils().writeAttribute(writer, "class","rich-sdt-column-cell-body");
writer.endElement(HTML.DIV_ELEM);
writer.endElement("td");
}
@@ -407,7 +407,7 @@
row_id = baseClientId + ":f:" + state.getRowIndex();
writer.startElement("tr", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","rich-sdt-row " + state.getRowClass());
getUtils().writeAttribute(writer,"id",row_id);
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
@@ -438,9 +438,9 @@
writer, baseClientId);
}
writer.startElement("td", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-bc dr-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
+ getUtils().writeAttribute(writer, "class","rich-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
writer.startElement(HTML.DIV_ELEM, grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-cbody");
+ getUtils().writeAttribute(writer, "class","rich-sdt-column-cell-body");
writer.endElement(HTML.DIV_ELEM);
writer.endElement("td");
writer.endElement("tr");
@@ -462,7 +462,7 @@
writer.startElement("tr", grid);
getUtils().writeAttribute(writer,"id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","rich-sdt-row " + state.getRowClass());
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
}
@@ -588,7 +588,7 @@
ScrollableDataTableRendererState state = ScrollableDataTableRendererState.getRendererState(context);
ColumnWalker.iterateOverColumns(context, grid, styleRenderer, context.getResponseWriter(), state);
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("#" + getNormalizedId(context, state.getGrid()) + " .dr-sdt-c-f {", "width");
+ writer.writeText("#" + getNormalizedId(context, state.getGrid()) + " .rich-sdt-c-f {", "width");
writer.writeText("width: 0px;", "width");
writer.writeText("}", "width");
}
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -422,7 +422,7 @@
}
public String getRowClass() {
- return getRowClass(getRowIndex()) + (isFake() ? " dr-sdt-fake-r rich-sdt-fake-r " : "");
+ return getRowClass(getRowIndex()) + (isFake() ? " rich-sdt-fake-r " : "");
}
private String getRowClass(int index) {
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -37,11 +37,11 @@
public void renderAscIcon(FacesContext context, UIComponent component) throws IOException{
- renderFacetOrIcon(context, component, "ascIcon", "dr-sdt-sort-asc");
+ renderFacetOrIcon(context, component, "ascIcon", "rich-sdt-sort-asc");
}
public void renderDescIcon(FacesContext context, UIComponent component) throws IOException{
- renderFacetOrIcon(context, component, "descIcon", "dr-sdt-sort-desc");
+ renderFacetOrIcon(context, component, "descIcon", "rich-sdt-sort-desc");
}
private void renderFacetOrIcon(FacesContext context, UIComponent component, String facetName, String clazz) throws IOException{
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2009-05-27 15:41:03 UTC (rev 14378)
@@ -128,7 +128,7 @@
fixedWidth: Validators.getBoolean(cell.getAttribute("fixedWidth"), false),
sortable: Validators.getBoolean(cell.getAttribute("sortable"), false),
sorted: Validators.getBoolean(cell.getAttribute("sorted"), "desc"),
- style : Utils.getRule("#"+ this.normalizedId + " .dr-sdt-c-" + j).style
+ style : Utils.getRule("#"+ this.normalizedId + " .rich-sdt-c-" + j).style
};
if(columns[j].sortable)
Event.observe(cell, 'click', eventCellMouseDown);
@@ -168,7 +168,7 @@
fixedWidth: Validators.getBoolean(cell.getAttribute("fixedWidth"), false),
sortable: Validators.getBoolean(cell.getAttribute("sortable"), false),
sorted: null,
- style : Utils.getRule("#"+ this.normalizedId + " .dr-sdt-c-" + (( i < count - 1 ) ? j : "f")).style
+ style : Utils.getRule("#"+ this.normalizedId + " .rich-sdt-c-" + (( i < count - 1 ) ? j : "f")).style
};
if(columns[j].sortable)
@@ -330,7 +330,7 @@
},
OnCellMouseDown: function(event) {
var el = Event.element(event);
- while(el && !Element.hasClassName(el, "dr-sdt-hc")) {
+ while(el && !Element.hasClassName(el, "rich-sdt-header-cell")) {
el = el.parentNode;
}
@@ -433,7 +433,7 @@
});
Object.extend(ClientUI.controls.grid.GridHeader.prototype, {
- sepStyleClass: "dr-sdt-hsep",
+ sepStyleClass: "rich-sdt-hsep",
// internal variables
_columns: []
});
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2009-05-27 15:41:03 UTC (rev 14378)
@@ -263,8 +263,6 @@
while(j <= this.selection.ranges[i].indexes[1]) {
var fElement = $(this.prefix + ":f:" + j);
var nElement = $(this.prefix + ":n:" + j);
- Element.addClassName(fElement, "dr-sdt-row-selected");
- Element.addClassName(nElement, "dr-sdt-row-selected");
Element.addClassName(fElement, "rich-sdt-row-selected");
Element.addClassName(nElement, "rich-sdt-row-selected");
Element.addClassName(fElement, this.selectedClass);
@@ -485,8 +483,6 @@
this.selection.addId(rowIndex);
var fElement = $(this.prefix + ":f:" + rowIndex);
var nElement = $(this.prefix + ":n:" + rowIndex);
- Element.addClassName(fElement, "dr-sdt-row-selected");
- Element.addClassName(nElement, "dr-sdt-row-selected");
Element.addClassName(fElement, "rich-sdt-row-selected");
Element.addClassName(nElement, "rich-sdt-row-selected");
Element.addClassName(fElement, this.selectedClass);
@@ -497,8 +493,6 @@
this.selection.removeId(rowIndex);
var fElement = $(this.prefix + ":f:" + rowIndex);
var nElement = $(this.prefix + ":n:" + rowIndex);
- Element.removeClassName(fElement, "dr-sdt-row-selected");
- Element.removeClassName(nElement, "dr-sdt-row-selected");
Element.removeClassName(fElement, "rich-sdt-row-selected");
Element.removeClassName(nElement, "rich-sdt-row-selected");
Element.removeClassName(fElement, this.selectedClass);
@@ -510,8 +504,6 @@
if(this.activeRow != null) {
fElement = $(this.prefix + ":f:" + this.activeRow);
nElement = $(this.prefix + ":n:" + this.activeRow);
- Element.removeClassName(fElement, "dr-sdt-row-active");
- Element.removeClassName(nElement, "dr-sdt-row-active");
Element.removeClassName(fElement, "rich-sdt-row-active");
Element.removeClassName(nElement, "rich-sdt-row-active");
Element.removeClassName(fElement, this.activeClass);
@@ -519,8 +511,6 @@
}
fElement = $(this.prefix + ":f:" + rowIndex);
nElement = $(this.prefix + ":n:" + rowIndex);
- Element.addClassName(fElement, "dr-sdt-row-active");
- Element.addClassName(nElement, "dr-sdt-row-active");
Element.addClassName(fElement, "rich-sdt-row-active");
Element.addClassName(nElement, "rich-sdt-row-active");
Element.addClassName(fElement, this.activeClass);
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2009-05-27 15:41:03 UTC (rev 14378)
@@ -6,19 +6,19 @@
<f:verbatim>
- .dr-sdt-sort-asc, .dr-sdt-sort-desc {
+ .rich-sdt-sort-asc, .rich-sdt-sort-desc {
width: 16px;
height: 6px;
background-position: 50% 50%;
background-repeat: no-repeat;
}
- .dr-sdt-sort-icon {
+ .rich-sdt-sort-icon {
position:absolute;
visibility: hidden;
}
- .dr-sdt {
+ .rich-sdt {
padding: 0px 0px;
margin: 0px;
z-index:0;
@@ -32,15 +32,9 @@
*/
/**
- * Header row
- */
- .dr-sdt-hr {
- }
-
- /**
* Header cell
*/
- .dr-sdt-hc {
+ .rich-sdt-header-cell {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
font-weight: normal;
@@ -51,7 +45,7 @@
border-right-style: solid;
}
- .dr-sdt-hc .sort-asc, .dr-sdt-hc .sort-desc {
+ .rich-sdt-header-cell .sort-asc, .rich-sdt-header-cell .sort-desc {
background-position: right;
background-repeat: no-repeat;
width: 16px !important;;
@@ -62,7 +56,7 @@
/**
* Header cells separator
*/
- .dr-sdt-hsep {
+ .rich-sdt-hsep {
/* background-image: url(grid-split.gif);*/
background-position: center;
background-repeat: repeat-y;
@@ -75,17 +69,17 @@
display: block;
z-index: 60;
}
- .dr-sdt-hsplit {
+ .rich-sdt-hsplit {
width:1px;
border-right: 1px dashed;
cursor: col-resize;
z-index: 100;
}
- .dr-sdt-fb{
+ .rich-sdt-fb{
z-index: 50;
}
- .dr-sdt-nb {
+ .rich-sdt-nb {
z-index: 20;
}
@@ -98,14 +92,14 @@
/**
* Footer row
*/
- .dr-sdt-fr {
+ .rich-std-footer-row {
border-top: 1px solid #cbc7b8; /* //TODO Which skin parameter must be here? */
}
/**
* Footer cell
*/
- .dr-sdt-fc {
+ .rich-sdt-footer-cell {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
font-weight: normal;
@@ -122,12 +116,7 @@
* ---------------------------------------------
*/
- /**
- * Body cell declaration
- * dr-sdt-bc - reqired
- * dr-sdt-bcDef - default, used if no custom styles defined in body template
- */
- .dr-sdt-bc {
+ .rich-sdt-column-cell {
box-sizing: border-box;
-moz-box-sizing: border-box;
-moz-outline: none;
@@ -139,24 +128,19 @@
/**
* Body row style
*/
- .dr-sdt-ho {
+ .rich-sdt-ho {
position: absolute;
height: 10px;
width: 10px;
}
- .dr-sdt-rb {
+ .rich-sdt-row {
font-weight: normal;
white-space: nowrap;
box-sizing: border-box;
-moz-box-sizing: border-box;
}
- /*
- .dr-sdt-row-active {
- font-weight:bold; //TODO Which skin parameter must be here?
- }
- */
- .dr-sdt-cbody {
+ .rich-sdt-header-cell-body, .rich-sdt-column-cell-body, .rich-sdt-footer-cell-body {
white-space: nowrap;
overflow: hidden;
-o-text-overflow: ellipsis;
@@ -169,7 +153,7 @@
/**
* Helper classes for grid template
*/
- .dr-sdt-substrate {
+ .rich-sdt-substrate {
z-index: 48;
filter:Alpha(opacity=0);
position:absolute;
@@ -178,13 +162,13 @@
display:block;
}
- .dr-sdt-tmplbox {
+ .rich-sdt-fb, .rich-sdt-nb{
display: block;
float:left;
position: absolute;
}
- .dr-sdt-inlinebox {
+ .rich-sdt-inlinebox {
position: relative;
display: block;
overflow: hidden;
@@ -193,15 +177,15 @@
</f:verbatim>
- <u:selector name=".dr-sdt">
+ <u:selector name=".rich-sdt">
<u:style name="background-color" skin="tableBackgroundColor" />
<u:style name="border-color" skin="tableBorderColor" />
<u:style name="border-width" skin="tableBorderWidth" />
</u:selector>
- <u:selector name=".dr-sdt-hr">
+ <u:selector name=".rich-std-header-row">
<u:style name="background-color" skin="headerBackgroundColor" />
</u:selector>
- <u:selector name=".dr-sdt-hc">
+ <u:selector name=".rich-sdt-header-cell">
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
@@ -210,40 +194,40 @@
<u:style name="border-right-width" skin="tableBorderWidth" />
<u:style name="border-right-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-hsplit">
+ <u:selector name=".rich-sdt-hsplit">
<u:style name="border-right-color" skin="tipBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-fr">
+ <u:selector name=".rich-std-footer-row">
<u:style name="background-color" skin="tableSubfooterBackgroundColor" />
</u:selector>
- <u:selector name=".dr-sdt-fc">
+ <u:selector name=".rich-sdt-footer-cell">
<u:style name="border-right-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-bc">
+ <u:selector name=".rich-sdt-column-cell">
<u:style name="border-right-color" skin="tableBorderColor" />
<u:style name="border-bottom-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-row-selected">
+ <u:selector name=".rich-sdt-row-selected">
<u:style name="background-color" skin="additionalBackgroundColor" />
</u:selector>
- <u:selector name=".dr-sdt-row-active">
+ <u:selector name=".rich-sdt-row-active">
<u:style name="color" skin="tabDisabledTextColor" />
</u:selector>
- <u:selector name=".dr-sdt-cbody">
+ <u:selector name=".rich-sdt-header-cell-body, .rich-sdt-column-cell-body, .rich-sdt-footer-cell-body">
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
- <u:selector name=".dr-sdt-sort-asc">
+ <u:selector name=".rich-sdt-sort-asc">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc"/>
</u:style>
</u:selector>
- <u:selector name=".dr-sdt-sort-desc">
+ <u:selector name=".rich-sdt-sort-desc">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortDesc"/>
</u:style>
</u:selector>
- <u:selector name=".dr-sdt-hsep">
+ <u:selector name=".rich-sdt-hsep">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSplit"/>
</u:style>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -11,8 +11,8 @@
component="javax.faces.component.UIComponent"
>
- <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass} #{columnSortClass} #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}">
- <div id="#{client_id}:bc_#{cell_id}" class="dr-sdt-cbody dr-sdt-c-#{cell_index} #{component.attributes['cellClass']}" style="#{component.attributes['cellStyle']}">
+ <td class="rich-sdt-column-cell #{columnClass} #{columnSortClass} #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}">
+ <div id="#{client_id}:bc_#{cell_id}" class="rich-sdt-column-cell-body rich-sdt-c-#{cell_index} #{component.attributes['cellClass']}" style="#{component.attributes['cellStyle']}">
<vcp:body/>
</div>
</td>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -11,8 +11,8 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass} #{footerColumnSortClass} #{component.attributes['footerClass']}">
- <div id="#{client_id}:fc_#{cell_index}" class="dr-sdt-cbody dr-sdt-c-#{cell_index}">
+ <th class="rich-sdt-footer-cell #{footerColumnClass} #{footerColumnSortClass} #{component.attributes['footerClass']}">
+ <div id="#{client_id}:fc_#{cell_index}" class="rich-sdt-footer-cell-body rich-sdt-c-#{cell_index}">
<vcp:body/>
</div>
</th>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -12,7 +12,7 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnid="#{component.attributes['id']}" sortable="#{component.attributes['sortable']}">
+ <th class="rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnid="#{component.attributes['id']}" sortable="#{component.attributes['sortable']}">
<jsp:scriptlet>
if(org.richfaces.component.util.ColumnUtil.isSortable(component)) {
@@ -32,7 +32,7 @@
}
</jsp:scriptlet>
- <span column="#{cell_index}" id="#{client_id}:hsep_#{cell_index}" style="left: #{offset}px;" class="dr-sdt-hsep rich-sdt-hsep" />
+ <span column="#{cell_index}" id="#{client_id}:hsep_#{cell_index}" style="left: #{offset}px;" class="rich-sdt-hsep" />
</th>
</f:root>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -12,10 +12,10 @@
component="javax.faces.component.UIComponent"
>
-<div id="#{client_id}:hcb_#{cell_index}" class="dr-sdt-cbody dr-sdt-c-#{cell_index} #{component.attributes['headerClass']}">
+<div id="#{client_id}:hcb_#{cell_index}" class="rich-sdt-header-cell-body rich-sdt-c-#{cell_index} #{component.attributes['headerClass']}">
<vcp:body/>
- <div align="right" id="#{client_id}:hs_#{cell_index}" class="dr-sdt-sort-icon">
+ <div align="right" id="#{client_id}:hs_#{cell_index}" class="rich-sdt-sort-icon">
<c:if test="#{sortAscending}">
<f:call name="renderAscIcon"/>
</c:if>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -67,7 +67,7 @@
]]>
</jsp:scriptlet>
- <table id="#{clientId}" cellpadding="0" cellspacing="0" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="dr-sdt rich-sdt #{component.attributes['styleClass']}" >
+ <table id="#{clientId}" cellpadding="0" cellspacing="0" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="rich-sdt #{component.attributes['styleClass']}" >
<tbody>
<jsp:scriptlet>
<![CDATA[
@@ -88,17 +88,17 @@
<tr>
<td id="#{normalizedId}" style="height: 100%;">
<div id="#{clientId}:c" style="height: 100%; position: relative;">
- <div id="#{clientId}:cs" class="dr-sdt-hsplit" style="display: none;"/>
- <div id="#{clientId}_GridHeaderTemplate" class="dr-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};">
- <iframe id="#{clientId}:hs" class="dr-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/> </iframe>
+ <div id="#{clientId}:cs" class="rich-sdt-hsplit" style="display: none;"/>
+ <div id="#{clientId}_GridHeaderTemplate" class="rich-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};">
+ <iframe id="#{clientId}:hs" class="rich-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/> </iframe>
<div style="display: block; left: 0px; top: 0px; width: #{sumWidth}px;">
<style>
<f:call name="renderStyle" />
</style>
- <span class="dr-sdt-tmplbox dr-sdt-fb" id="#{clientId}:header:FrozenBox">
+ <span class="rich-sdt-fb" id="#{clientId}:header:FrozenBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<thead>
- <tr class="dr-sdt-hr rich-std-header-row #{component.attributes['headerClass']}">
+ <tr class="rich-std-header-row #{component.attributes['headerClass']}">
<jsp:scriptlet>
<![CDATA[
renderHeaders(context, component, true);
@@ -109,17 +109,17 @@
</table>
</span>
- <span class="dr-sdt-tmplbox dr-sdt-nb" id="#{clientId}:header:NormalBox">
+ <span class="rich-sdt-nb" id="#{clientId}:header:NormalBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<thead>
- <tr class="dr-sdt-hr rich-std-header-row #{component.attributes['headerClass']}">
+ <tr class="rich-std-header-row #{component.attributes['headerClass']}">
<jsp:scriptlet>
<![CDATA[
renderHeaders(context, component, false);
]]>
</jsp:scriptlet>
- <th class="dr-sdt-hc dr-sdt-c-f rich-sdt-header-cell">
- <div class="dr-sdt-cbody" />
+ <th class="rich-sdt-c-f rich-sdt-header-cell">
+ <div class="rich-sdt-header-cell-body" />
</th>
</tr>
</thead>
@@ -130,12 +130,12 @@
- <div id="#{clientId}_GridBodyTemplate" class="dr-sdt-inlinebox" style="overflow: auto; width: #{component.attributes['width']}; height: #{component.attributes['height']};">
+ <div id="#{clientId}_GridBodyTemplate" class="rich-sdt-inlinebox" style="overflow: auto; width: #{component.attributes['width']}; height: #{component.attributes['height']};">
<div id="#{clientId}:scb" style="position: absolute; z-index: 0;">
<div id="#{clientId}:sb" style="position: absolute;" ><br/> </div>
</div>
<div id="#{clientId}:bc" style="display: block; width: #{sumWidth}px;">
- <span class="dr-sdt-tmplbox dr-sdt-fb" id="#{clientId}:body:FrozenBox">
+ <span class="rich-sdt-fb" id="#{clientId}:body:FrozenBox">
<table id="#{clientId}:f" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tbody>
<jsp:scriptlet>
@@ -145,9 +145,9 @@
</jsp:scriptlet>
</tbody>
</table>
- <span class="dr-sdt-ho" id="#{clientId}:fho" ><br/></span>
+ <span class="rich-sdt-ho" id="#{clientId}:fho" ><br/></span>
</span>
- <span class="dr-sdt-tmplbox dr-sdt-nb" id="#{clientId}:body:NormalBox">
+ <span class="rich-sdt-nb" id="#{clientId}:body:NormalBox">
<table id="#{clientId}:n" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tbody>
<jsp:scriptlet>
@@ -157,18 +157,18 @@
</jsp:scriptlet>
</tbody>
</table>
- <span class="dr-sdt-ho" id="#{clientId}:nho" ><br/></span>
+ <span class="rich-sdt-ho" id="#{clientId}:nho" ><br/></span>
</span>
</div>
</div>
- <div id="#{clientId}_GridFooterTemplate" class="dr-sdt-inlinebox" style="#{fStyle}; width: #{component.attributes['width']};">
- <iframe id="#{clientId}:fs" class="dr-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/></iframe>
+ <div id="#{clientId}_GridFooterTemplate" class="rich-sdt-inlinebox" style="#{fStyle}; width: #{component.attributes['width']};">
+ <iframe id="#{clientId}:fs" class="rich-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/></iframe>
<div style="display: block; width: width: #{sumWidth}px;">
- <span class="dr-sdt-tmplbox dr-sdt-fb" id="#{clientId}:footer:FrozenBox">
+ <span class="rich-sdt-fb" id="#{clientId}:footer:FrozenBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tfoot>
- <tr class="dr-sdt-fr rich-std-footer-row #{component.attributes['footerClass']}">
+ <tr class="rich-std-footer-row #{component.attributes['footerClass']}">
<jsp:scriptlet>
<![CDATA[
renderFooters(context, component,true);
@@ -179,17 +179,17 @@
</table>
</span>
- <span class="dr-sdt-tmplbox dr-sdt-nb" id="#{clientId}:footer:NormalBox">
+ <span class="rich-sdt-nb" id="#{clientId}:footer:NormalBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tfoot>
- <tr class="dr-sdt-fr rich-std-footer-row #{component.attributes['footerClass']}">
+ <tr class="rich-std-footer-row #{component.attributes['footerClass']}">
<jsp:scriptlet>
<![CDATA[
renderFooters(context, component,false);
]]>
</jsp:scriptlet>
- <th class="dr-sdt-fc dr-sdt-c-f rich-sdt-footer-cell">
- <div class="dr-sdt-cbody" />
+ <th class="rich-sdt-c-f rich-sdt-footer-cell">
+ <div class="rich-sdt-footer-cell-body" />
</th>
</tr>
</tfoot>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -137,7 +137,7 @@
assertEquals("table", div.getNodeName());
String classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-sdt"));
+ assertTrue(classAttr.contains("rich-sdt"));
Iterator childIter= div.getChildElementsIterator();
String id = grid.getId();
@@ -170,14 +170,14 @@
String elemClassAttr = elem.getAttributeValue("class");
res = false;
- if(elemClassAttr.contains("dr-sdt-inlinebox")){
+ if(elemClassAttr.contains("rich-sdt-inlinebox")){
res = true;
- }else if(elemClassAttr.contains("dr-sdt-hsplit")){
+ }else if(elemClassAttr.contains("rich-sdt-hsplit")){
res = true;
}
assertTrue(res);
- if(!elemClassAttr.contains("dr-sdt-hsplit")){
+ if(!elemClassAttr.contains("rich-sdt-hsplit")){
boolean templates = elem.getId().equals(grid.getId()+ "_GridBodyTemplate") || elem.getId().equals(grid.getId()+ "_GridFooterTemplate") || elem.getId().equals(grid.getId()+ "_GridHeaderTemplate");
assertTrue(templates);
@@ -222,9 +222,9 @@
assertNotNull(elemClassAttr);
if(element.getId().contains("FrozenBox")){
- assertTrue(elemClassAttr.contains("dr-sdt-tmplbox dr-sdt-fb"));
+ assertTrue(elemClassAttr.contains("rich-sdt-fb"));
}else if(element.getId().contains("NormalBox")){
- assertTrue(elemClassAttr.contains("dr-sdt-tmplbox dr-sdt-nb"));
+ assertTrue(elemClassAttr.contains("rich-sdt-nb"));
}
@@ -233,13 +233,13 @@
HtmlElement hcell = page.getHtmlElementById(id + ":hc_" + i);
assertNotNull(hcell);
elemClassAttr = hcell.getAttributeValue("class");
- assertTrue(elemClassAttr.contains("dr-sdt-hc rich-sdt-header-cell"));
+ assertTrue(elemClassAttr.contains("rich-sdt-header-cell"));
for (int j = 0; j < grid.getRows(); j++) {
HtmlElement bcell = page.getHtmlElementById(id + ":c_" + j + "_" + i);
assertNotNull(bcell);
elemClassAttr = bcell.getAttributeValue("class");
- assertTrue(elemClassAttr.contains("dr-sdt-bc rich-sdt-column-cell"));
+ assertTrue(elemClassAttr.contains("rich-sdt-column-cell"));
}
}
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -107,7 +107,7 @@
assertNotNull(className);
- assertEquals("dr-sdt-sort-asc", className);
+ assertEquals("rich-sdt-sort-asc", className);
} catch (Exception e) {
fail(e.getMessage());
@@ -177,7 +177,7 @@
assertNotNull(className);
- assertEquals("dr-sdt-sort-desc", className);
+ assertEquals("rich-sdt-sort-desc", className);
} catch (Exception e) {
fail(e.getMessage());
More information about the richfaces-svn-commits
mailing list