9:54 a.m.
Author: piotr.buda
Date: 2008-08-08 10:54:04 -0400 (Fri, 08 Aug 2008)
New Revision: 9994
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
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
Log:
Removed obsolete CSS classes, renamed all dr-* classes
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-08-08
13:47:02 UTC (rev 9993)
+++
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-08-08
14:54:04 UTC (rev 9994)
@@ -199,8 +199,6 @@
"captionStyle");
writer.startElement("caption", table);
if (captionClass != null) {
- //TODO nick - dr-* classes are legacy and can be removed safely.
- // CSS styling can be defined in rich-* classes instead
captionClass = "extdt-caption rich-extdt-caption "
+ captionClass;
} else {
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-08-08
13:47:02 UTC (rev 9993)
+++
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-08-08
14:54:04 UTC (rev 9994)
@@ -187,7 +187,7 @@
writer,
table,
colums,
- "extdt-dr-menucell extdt-subheadercell
rich-extdt-subheadercell",
+ "extdt-menucell extdt-subheadercell
rich-extdt-subheadercell",
headerClass, "header", "th",
numberOfColumns);
/* encoding additional empty column used in resizing columns */
writer.startElement("th", table);
@@ -645,7 +645,6 @@
// TODO - encode column attributes.
writer.startElement(HTML.DIV_ELEM, table);
writer.writeAttribute("class", "extdt-cell-div",
null);
- // writer.writeAttribute("class", "dt-sdt-bcbody",
null); //KAW
// IE
renderChildren(context, column);
writer.endElement(HTML.DIV_ELEM);
@@ -1564,7 +1563,7 @@
writer.writeAttribute(HTML.id_ATTRIBUTE, clientId +
":sepSpan",
null);
writer
- .writeAttribute(HTML.class_ATTRIBUTE, "dt-sdt-hsep",
+ .writeAttribute(HTML.class_ATTRIBUTE, "extdt-hsep",
null);
writer.endElement(HTML.SPAN_ELEM);
@@ -1573,19 +1572,19 @@
+ "left";
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.id_ATTRIBUTE, spanId, null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dt-sdt-hdrop",
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "extdt-hdrop",
null);
writer.writeAttribute(HTML.style_ATTRIBUTE,
"visibility: hidden;", null);
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dt-sdt-hdrop-top dt-sdt-hdrop-top-left", null);
+ "extdt-hdrop-top extdt-hdrop-top-left", null);
writer.writeAttribute(HTML.style_ATTRIBUTE,
"visibility: hidden;", null);
writer.endElement(HTML.SPAN_ELEM);
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dt-sdt-hdrop-bottom dt-sdt-hdrop-bottom-left", null);
+ "extdt-hdrop-bottom extdt-hdrop-bottom-left", null);
writer.writeAttribute(HTML.style_ATTRIBUTE,
"visibility: hidden;", null);
writer.endElement(HTML.SPAN_ELEM);
@@ -1596,19 +1595,19 @@
spanId = tableId + "_hdrop_" + dataColumn.getId() +
"right";
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.id_ATTRIBUTE, spanId, null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dt-sdt-hdrop",
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "extdt-hdrop",
null);
writer.writeAttribute(HTML.style_ATTRIBUTE,
"visibility: hidden;", null);
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dt-sdt-hdrop-top dt-sdt-hdrop-top-right", null);
+ "extdt-hdrop-top extdt-hdrop-top-right", null);
writer.writeAttribute(HTML.style_ATTRIBUTE,
"visibility: hidden;", null);
writer.endElement(HTML.SPAN_ELEM);
writer.startElement(HTML.SPAN_ELEM, column);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "dt-sdt-hdrop-bottom dt-sdt-hdrop-bottom-right",
null);
+ "extdt-hdrop-bottom extdt-hdrop-bottom-right", null);
writer.writeAttribute(HTML.style_ATTRIBUTE,
"visibility: hidden;", null);
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-08-08
13:47:02 UTC (rev 9993)
+++
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-08-08
14:54:04 UTC (rev 9994)
@@ -7,54 +7,20 @@
<f:verbatim>
.extdt-empty-cell{
}
- /**
- * Body cell declaration
- * dr-sdt-bc - reqired
- * dr-sdt-bcDef - default, used if no custom styles defined in body template
- */
- .dt-sdt-bc {
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -moz-outline: none;
- -moz-user-focus: normal;
- cursor: default;
- border-right: 1px solid;
- border-bottom: 1px solid;
- }
- .extdt-dr-table {
- table-layout: fixed;
- }
+ .extdt-table-layout {
+ table-layout: fixed;
+ }
+
+ .extdt-table-filterrow {
+ }
- .extdt-table-filterrow{
- }
-
- .dt-sdt-rb {
- font-weight: normal;
- white-space: nowrap;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- }
-
- .extdt-subheadercell {
- overflow: hidden;
- }
-
- .dt-sdt-bcbody {
- cursor: default;
- font-weight: normal;
- white-space: nowrap;
- overflow: hidden;
- -o-text-overflow: ellipsis;
- text-overflow: ellipsis;
- -moz-box-sizing: border-box;
- -moz-outline: none;
- width: 100%;
- height: 20px;
- }
+ .extdt-subheadercell {
+ overflow: hidden;
+ }
- .extdt-dr-menucell{
- }
+ .extdt-menucell{
+ }
.extdt-maindiv {
}
@@ -66,7 +32,6 @@
}
.extdt-fakeierow {
-
}
.extdt-thead {
@@ -129,7 +94,7 @@
background-position:center;
}
- .dr-sdt-hsplit {
+ .extdt-hsplit {
width:1px;
border-right: 1px dashed;
cursor: e-resize;
@@ -194,7 +159,7 @@
/**
* Header cells drop target
*/
- .dt-sdt-hdrop {
+ .extdt-hdrop {
cursor: pointer;
font-size: 1px;
width: 10px;
@@ -207,7 +172,7 @@
z-index: 61;
}
- .dt-sdt-hdrop-top {
+ .extdt-hdrop-top {
/*background-image: url(col-move-top.gif);*/
background-repeat: no-repeat;
/*background-position: top center;*/
@@ -218,17 +183,17 @@
top: -9px;
}
- .dt-sdt-hdrop-top-left{
+ .extdt-hdrop-top-left {
background-position: top left;
left: -5px;
}
- .dt-sdt-hdrop-top-right{
+ .extdt-hdrop-top-right {
background-position: top right;
right: -4px;
}
- .dt-sdt-hdrop-bottom {
+ .extdt-hdrop-bottom {
/*background-image: url(col-move-top.gif);*/
background-repeat: no-repeat;
/*background-position: bottom center;*/
@@ -243,12 +208,12 @@
padding: 4px;
}
- .dt-sdt-hdrop-bottom-left{
+ .extdt-hdrop-bottom-left{
background-position: bottom left;
left: -5px;
}
- .dt-sdt-hdrop-bottom-right{
+ .extdt-hdrop-bottom-right{
background-position: bottom right;
right: -4px;
}
@@ -280,7 +245,7 @@
/**
* Header cells separator
*/
- .dt-sdt-hsep {
+ .extdt-hsep {
/* background-image: url(grid-split.gif);*/
background-position: center;
background-repeat: repeat-y;
@@ -323,13 +288,13 @@
</u:style>
</u:selector>
-<u:selector name=".dr-sdt-hsplit" >
+<u:selector name=".extdt-hsplit" >
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/s.gif"/>
</u:style>
</u:selector>
-<u:selector name=".dt-sdt-hdrop" >
+<u:selector name=".extdt-hdrop" >
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/s.gif"/>
</u:style>
@@ -349,7 +314,7 @@
</u:style>
</u:selector>
-<u:selector name=".extdt-dr-table" >
+<u:selector name=".extdt-table-layout" >
<u:style name="background-color" skin="tableBackgroundColor"
/> <!--tableBackgroundColor-->
<!-- <u:style name="border-collapse" value="inherit" /> fix
RF-535 -->
<u:style name="empty-cells" value="show" />
@@ -393,19 +358,19 @@
</u:style>
</u:selector>
-<u:selector name=".dt-sdt-hdrop-top">
+<u:selector name=".extdt-hdrop-top">
<u:style name="background-image">
<f:resource
f:key="/org/richfaces/renderkit/html/images/col-move-top.gif"/>
</u:style>
</u:selector>
-<u:selector name=".dt-sdt-hdrop-bottom">
+<u:selector name=".extdt-hdrop-bottom">
<u:style name="background-image">
<f:resource
f:key="/org/richfaces/renderkit/html/images/col-move-bottom.gif"/>
</u:style>
</u:selector>
-<u:selector name=".dt-sdt-hsep">
+<u:selector name=".extdt-hsep">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/s.gif"/>
</u:style>
@@ -445,21 +410,6 @@
<u:style name="font-family" skin="generalFamilyFont"/>
<!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-subtable-cell" >
- <u:style name="border-right" value="solid">
<!--tableBorderColor-->
- <f:verbatim skin="tableBorderWidth" />
- <f:verbatim skin="tableBorderColor" />
- </u:style>
- <u:style name="border-bottom" value="solid">
<!--tableBorderColor-->
- <f:verbatim skin="tableBorderWidth" />
- <f:verbatim skin="tableBorderColor" />
- </u:style>
- <u:style name="padding" value="4px 4px 4px 4px"/>
- <u:style name="font-size" skin="generalSizeFont"/>
<!--generalSizeFont-->
- <u:style name="color" skin="generalTextColor"/>
<!--generalTextColor-->
- <u:style name="font-family" skin="generalFamilyFont"/>
<!--generalFamilyFont-->
-</u:selector>
-
<u:selector name=".extdt-header" >
<u:style name="background-color"
skin="headerBackgroundColor"/> <!--headerBackgroundColor-->
<u:style name="background-image" > <!--from headerGradientColor to
headerBackgroundColor-->
@@ -604,62 +554,11 @@
</u:style> -->
</u:selector>
-<u:selector name=".dr-subtable-firstrow .dr-subtable-cell" >
- <!-- <u:style name="border" value="2px solid
#c0c0c0"/>-->
-</u:selector>
-
-<u:selector name=".dr-subtable-header" >
- <u:style name="background-color"
skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
-</u:selector>
-
-<u:selector name=".dr-subtable-headercell" >
- <u:style name="border-right" value="solid">
<!--tableBorderColor-->
- <f:verbatim skin="tableBorderWidth" />
- <f:verbatim skin="tableBorderColor" />
- </u:style>
- <u:style name="border-bottom" value="solid">
<!--tableBorderColor-->
- <f:verbatim skin="tableBorderWidth" />
- <f:verbatim skin="tableBorderColor" />
- </u:style>
- <u:style name="padding" value="4px 4px 4px 4px"/>
- <u:style name="text-align" value="center"/>
- <u:style name="font-size" skin="generalSizeFont"/>
<!--generalSizeFont-->
- <u:style name="color" skin="generalTextColor"/>
<!--generalTextColor-->
- <u:style name="font-family" skin="generalFamilyFont"/>
<!--generalFamilyFont-->
-</u:selector>
-
-
-<u:selector name=".dr-subtable-footer" >
- <u:style name="background-color"
skin="tableSubfooterBackgroundColor"/>
<!--tableSubfooterBackgroundColor-->
-</u:selector>
-
-<u:selector name=".dr-subtable-footercell" >
- <u:style name="border-right" value="solid">
<!--tableBorderColor-->
- <f:verbatim skin="tableBorderWidth" />
- <f:verbatim skin="tableBorderColor" />
- </u:style>
- <u:style name="border-bottom" value="solid">
<!--tableBorderColor-->
- <f:verbatim skin="tableBorderWidth" />
- <f:verbatim skin="tableBorderColor" />
- </u:style>
- <u:style name="padding" value="4px 4px 4px 4px"/>
- <u:style name="text-align" value="left"/>
-</u:selector>
-
-<u:selector name=".rich-sort-asc">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc"/>
- </u:style>
-</u:selector>
-<u:selector name=".rich-sort-desc">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortDesc"/>
- </u:style>
-</u:selector>
<u:selector name=".extdt-row-selected">
<u:style name="background-color"
skin="additionalBackgroundColor" />
</u:selector>
-<u:selector name=".dr-sdt-row-active">
+
+<u:selector name=".extdt-row-active">
<u:style name="color" skin="tabDisabledTextColor" />
</u:selector>
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
===================================================================
---
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-08
13:47:02 UTC (rev 9993)
+++
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-08
14:54:04 UTC (rev 9994)
@@ -39,6 +39,7 @@
/org/richfaces/renderkit/html/script/controlUtils.js,
/org/richfaces/renderkit/html/scripts/extended-data-table.js,
+ /org/richfaces/renderkit/html/scripts/drag-indicator.js,
/org/richfaces/renderkit/html/scripts/ext-dt-drag-indicator.js,
/org/richfaces/renderkit/html/scripts/ext-dt-simple-draggable.js,
@@ -57,17 +58,6 @@
to rendered areas manually in order to be handled correctly by AJAX updates
-->
- <div id="#{clientId}:dataTable_indicator" class="drgind_fly
drgind_default drag_indicator" style="display: none;" >
- <f:call name="encodeNamespace" />
-
- <script type="text/javascript">
- //<![CDATA[
- #{this:encodeDragDropChildScripts(context, component)};
- //]]>
- </script>
- </div>
- <span id="#{clientId}:dataTable_indicator_span" />
-
<div
id="#{clientId}"
class="extdt-maindiv"
@@ -77,10 +67,20 @@
<div id="#{clientId}:od" class="extdt-outerdiv"
style="width:100%; height:100%;"
+ <div id="#{clientId}:dataTable_indicator"
class="drgind_fly drgind_default drag_indicator" style="display:
none;" >
+ <f:call name="encodeNamespace" />
+
+ <script type="text/javascript">
+ //<![CDATA[
+ #{this:encodeDragDropChildScripts(context, component)};
+ //]]>
+ </script>
+ </div>
+ <span id="#{clientId}:dataTable_indicator_span" />
<div id="#{clientId}:innerd" class="extdt-innerdiv"
style="height:100%;width:100%;">
- <div id="#{clientId}:cs" class="dr-sdt-hsplit"
style="display: none;"/>
+ <div id="#{clientId}:cs" class="extdt-hsplit"
style="display: none;"/>
<table id="#{clientId}:tu"
- class="extdt-dr-table rich-table
#{component.attributes['styleClass']}"
+ class="extdt-table-layout rich-table
#{component.attributes['styleClass']}"
style="visibility:hidden;"
width="100%"
@@ -94,7 +94,7 @@
<td colspan="#{columnsCount}" style="padding: 0px;">
<div id="#{clientId}:sd" class="extdt-content"
style="height:50px;width:100%;">
<table id="#{clientId}:n" width="100%"
- class="extdt-dr-table rich-table
#{component.attributes['styleClass']}"
+ class="extdt-table-layout rich-table
#{component.attributes['styleClass']}"
style="#{component.attributes['style']}"
<f:call
name="utils.encodePassThruWithExclusions">