[richfaces-svn-commits] JBoss Rich Faces SVN: r17327 - in root/ui-sandbox/tables/trunk/ui/src/main: resources/META-INF/resources and 1 other directory.

Author: konstantin.mishin Date: 2010-05-27 14:18:51 -0400 (Thu, 27 May 2010) New Revision: 17327 Added: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss Removed: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java Log: RF-7887 Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-27 18:18:24 UTC (rev 17326) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-27 18:18:51 UTC (rev 17327) @@ -62,7 +62,7 @@ @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "extendedDataTable.js"), - @ResourceDependency(name = "extendedDataTable.css") }) + @ResourceDependency(name = "extendedDataTable.ecss") }) public class ExtendedDataTableRenderer extends SortingFilteringRowsRenderer implements MetaComponentRenderer { private static enum PartName { @@ -327,6 +327,7 @@ writer.startElement(HTML.DIV_ELEM, table); writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-header", null); header.encodeAll(context); writer.endElement(HTML.DIV_ELEM); @@ -420,6 +421,7 @@ writer.startElement(HTML.DIV_ELEM, table); writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-footer", null); footer.encodeAll(context); writer.endElement(HTML.DIV_ELEM); @@ -593,20 +595,17 @@ writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null); writer.startElement(HTML.TR_ELEMENT, component); - writer.startElement(HTML.TD_ELEM, component); + writer.startElement(HTML.TH_ELEM, component); writer.write("&nbsp;"); - writer.endElement(HTML.TD_ELEM); + writer.endElement(HTML.TH_ELEM); writer.endElement(HTML.TR_ELEMENT); - writer.startElement(HTML.TR_ELEMENT, component); - writer.startElement(HTML.TD_ELEM, component); - writer.write("&nbsp;"); - writer.endElement(HTML.TD_ELEM); - writer.endElement(HTML.TR_ELEMENT); - writer.startElement(HTML.TR_ELEMENT, component); - writer.startElement(HTML.TD_ELEM, component); - writer.write("&nbsp;"); - writer.endElement(HTML.TD_ELEM); - writer.endElement(HTML.TR_ELEMENT); + for (int i = 0; i < 6; i++) { + writer.startElement(HTML.TR_ELEMENT, component); + writer.startElement(HTML.TD_ELEM, component); + writer.write("&nbsp;"); + writer.endElement(HTML.TD_ELEM); + writer.endElement(HTML.TR_ELEMENT); + } writer.endElement(HTML.TABLE_ELEMENT); writer.startElement(HTML.DIV_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); Deleted: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2010-05-27 18:18:24 UTC (rev 17326) +++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2010-05-27 18:18:51 UTC (rev 17327) @@ -1,123 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -.rich-extable{ - overflow: hidden; - background-color: #FFFFFF; - border: 1px solid #C4C0C9; - /*height: 100%;*/ -} - -.rich-extable-header { - background-color : #D4CFC7; -} - -.rich-extable-body{ - overflow-x: hidden; - overflow-y: auto; - width: 100%; -} - -.rich-extable-spacer { - height: 0px; - font-size: 0px; - line-height: 0px; -} - -.rich-extable-footer { - background-color: #CCCCCC; -} - -.rich-extable-footer-align{ - vertical-align: top; -} - -.rich-extable-part{ - overflow: hidden; -} - -.rich-extable-footer-part{ - overflow-x: auto; - overflow-y: visible; -} - -.rich-extable-resizer-holder { - left : 0px; - position: relative; - height: 0px; -} - -.rich-extable-resizer { - background-image: url("#{resource['spacer.gif']}"); - cursor:e-resize; - height:20px; /*TODO*/ - position:absolute; - left: 100%; - margin-left: -3px; - width:6px; -} - -.rich-extable-drag{ - cursor:e-resize; - position:absolute; - background-color: #848089; - width:1px; - display: none; -} - -.rich-extable-reorder{ - position:absolute; - border-collapse: collapse; - display: none; -} - -.rich-extable-reorder td{ - width: 30px; - height: 10px; - font-size: 5px; - border: 1px solid #C4C0C9; -} - -.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{ - height: 20px; - overflow: hidden; - border-bottom: 1px solid #C4C0C9; - border-right: 1px solid #C4C0C9; -} - -.rich-extable-empty-footer-cell{ - border-right: 1px solid #C4C0C9; - height: 1px; -} - -.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content{ - padding: 2px; - white-space: nowrap; -} - -.rich-extable-reorder-marker { - position:absolute; - height: 9px; - font-size: 9px; - width:9px; - background-image: url("#{resource['reorderMarker.gif']}"); - display: none; -} \ No newline at end of file Copied: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss (from rev 17318, root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css) =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss (rev 0) +++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-27 18:18:51 UTC (rev 17327) @@ -0,0 +1,154 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +.rich-extable{ + overflow: hidden; + background-color: '#{richSkin.tableBackgroundColor}'; + border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; + /*height: 100%;*/ +} + +.rich-extable-header, .rich-extable-table-header { + background-color : '#{richSkin.tableHeaderBackgroundColor}'; +} + +.rich-extable-table-header { + border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; +} + +.rich-extable-body{ + overflow-x: hidden; + overflow-y: auto; + width: 100%; +} + +.rich-extable-spacer { + height: 0px; + /*font-size: 0px; + line-height: 0px;*/ +} + +.rich-extable-footer, .rich-extable-table-footer { + border-top: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; + background-color: '#{richSkin.tableFooterBackgroundColor}'; +} + +.rich-extable-footer-align{ + vertical-align: top; +} + +.rich-extable-part{ + overflow: hidden; +} + +.rich-extable-footer-part{ + overflow-x: auto; + overflow-y: visible; +} + +.rich-extable-resizer-holder { + left : 0px; + position: relative; + height: 0px; +} + +.rich-extable-resizer { + background-image: url("#{resource['spacer.gif']}"); + cursor:e-resize; + height:20px; /*TODO*/ + position:absolute; + left: 100%; + margin-left: -3px; + width:6px; +} + +.rich-extable-drag{ + cursor:e-resize; + position:absolute; + border-left: '1px dashed #{richSkin.generalTextColor}'; + /*background-color: #848089;*/ + width:1px; + display: none; +} + +.rich-extable-reorder{ + position:absolute; + border-collapse: collapse; + display: none; +} + +.rich-extable-reorder th{ + width: 20px; + height: 5px; + font-size: 1px; + background-color: '#{richSkin.tableHeaderBackgroundColor}'; + border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; +} + +.rich-extable-reorder td{ + width: 20px; + height: 5px; + font-size: 1px; + background-color: '#{richSkin.tableBackgroundColor}'; + border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; +} + +.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{ + height: 20px; + overflow: hidden; + border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; + border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; +} + +.rich-extable-empty-footer-cell{ + border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; + height: 1px; +} + +.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content, .rich-extable-table-header, .rich-extable-table-footer{ + padding: 3px 7px; + white-space: nowrap; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; +} + +.rich-extable-header-cell-content, .rich-extable-table-header { + font-weight:bold; + color : '#{richSkin.tableHeaderTextColor}'; +} + +.rich-extable-footer-cell-content, .rich-extable-table-footer { + font-weight:bold; + color: '#{richSkin.generalTextColor}'; +} + +.rich-extable-cell-content { + color: '#{richSkin.generalTextColor}'; +} + +.rich-extable-reorder-marker { + position:absolute; + height: 9px; + font-size: 9px; + width:9px; + background-image: url("#{resource['reorderMarker.gif']}"); + display: none; +} \ No newline at end of file