Author: ppitonak(a)redhat.com
Date: 2011-04-06 09:15:36 -0400 (Wed, 06 Apr 2011)
New Revision: 22380
Added:
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
Log:
https://issues.jboss.org/browse/RFPL-946
added two new templates - rich:dataGrid and rich:extendedDataTable
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06
13:15:36 UTC (rev 22380)
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*******************************************************************************/
-
package org.richfaces.tests.metamer;
/**
@@ -30,24 +29,24 @@
* @version $Revision$
*/
public enum Template {
- PLAIN ("plain", "Plain", ""),
- REDDIV ("redDiv", "Red div", ""),
- BLUEDIV ("blueDiv", "Blue div", ""),
- RICHDATATABLE ("richDataTable", "Rich Data Table",
"containerRichDataTable:2:"),
- HDATATABLE ("hDataTable", "JSF Data Table",
"containerHDataTable:2:"),
- UIREPEAT ("uiRepeat", "UI Repeat",
"containerUiRepeat:1:"),
- A4JREPEAT ("a4jRepeat", "A4J Repeat",
"containerA4JRepeat:1:");
+ PLAIN("plain", "Plain", ""),
+ REDDIV("redDiv", "Red div", ""),
+ BLUEDIV("blueDiv", "Blue div", ""),
+ RICHDATATABLE("richDataTable", "Rich Data Table",
"containerRichDataTable:2:"),
+ RICHDATAGRID("richDataGrid", "Rich Data Grid",
"containerRichDataGrid:1:"),
+ RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data
Table", "containerRichExtendedDataTable:2:"),
+ HDATATABLE("hDataTable", "JSF Data Table",
"containerHDataTable:2:"),
+ UIREPEAT("uiRepeat", "UI Repeat",
"containerUiRepeat:1:"),
+ A4JREPEAT("a4jRepeat", "A4J Repeat",
"containerA4JRepeat:1:");
/**
* identifier of a template
*/
private String name;
-
/**
* human-readable name of the template
*/
private String desc;
-
/**
* prefix of the component nested in this template
*/
@@ -80,7 +79,7 @@
public String getDesc() {
return desc;
}
-
+
/**
* Returns the prefix of component nested in this template
* @return
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,50 +39,50 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
- width: 720px !important;
+ .rf-edt[id$=richEDT] {
+ width: 920px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
- height: 2.5em !important;
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
+ height: 3em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 210px !important;
text-align: center;
}
- .rf-edt-c-columnSmoker {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSmoker {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnFavoriteColor {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnFavoriteColor {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
width: 150px !important;
text-align: center;
vertical-align: middle;
}
- .rf-sel-fld {
+ .rf-edt[id$=richEDT] .rf-sel-fld {
width: 180px !important;
}
</style>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,43 +39,43 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 70px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 990px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
- height: 2.5em !important;
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
+ height: 3em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnBirthdate {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnBirthdate {
text-align: center;
width: 170px !important;
}
- .rf-edt-c-columnCompanies {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnCompanies {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
width: 250px !important;
}
</style>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,7 +39,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 215px !important;
height: 300px !important;
}
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -40,39 +40,39 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 820px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
- height: 4.2em !important;
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
+ height: 5.3em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids2 {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids2 {
text-align: center;
width: 250px !important;
}
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -38,15 +38,15 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 151px !important;
height:
}
- .rf-edt-c-columnInput {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnInput {
width: 150px !important;
text-align: center;
}
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 2em !important;
}
</style>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -40,7 +40,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 300px !important;
height: 300px !important;
}
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,7 +39,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 300px !important;
height: 300px !important;
}
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,7 +39,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 215px !important;
height: 300px !important;
}
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,39 +39,39 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 820px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
height: 4.2em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids2 {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids2 {
text-align: center;
width: 250px !important;
}
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-04-06
08:50:27 UTC (rev 22379)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -39,39 +39,39 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 820px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
height: 4.2em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids2 {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids2 {
text-align: center;
width: 250px !important;
}
Added:
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css 2011-04-06
13:15:36 UTC (rev 22380)
@@ -0,0 +1,20 @@
+.rf-edt[id$=containerRichExtendedDataTable] {
+ width: 1200px;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] .rf-edt-c-col1 {
+ width: 100px !important;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] .rf-edt-c-col2 {
+ width: 1095px !important;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] tr:nth-child(3) .rf-edt-c-col1{
+ height: 400px !important;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] tr:nth-child(3) .rf-edt-c-col2{
+ height: 400px !important;
+ overflow: auto;
+}
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, 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.
+ -->
+
+ <ui:composition>
+ <rich:dataGrid value="#{model.simple}"
var="containerRichDataGridItem" id="containerRichDataGrid"
columns="2">
+
+ <f:facet name="header">
+ Rich Data Grid
+ </f:facet>
+
+ <h:panelGroup rendered="#{containerRichDataGridItem == 'row
4'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml"
/>
+ </h:panelGroup>
+ <h:outputText value="#{containerRichDataGridItem}"
rendered="#{containerRichDataGridItem != 'row 4'}" />
+
+ </rich:dataGrid>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml 2011-04-06
13:15:36 UTC (rev 22380)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, 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.
+ -->
+
+ <ui:composition>
+ <h:outputStylesheet library="css"
name="template-edt.css"/>
+
+ <rich:extendedDataTable value="#{model.simple}"
var="containerRichExtendedDataTableItem"
id="containerRichExtendedDataTable">
+
+ <f:facet name="header">
+ Rich Extended Data Table
+ </f:facet>
+
+ <h:column id="col1">
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerRichExtendedDataTableItem}
+ </h:column>
+
+ <h:column id="col2">
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerRichExtendedDataTableItem ==
'row 3'}">
+ <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichExtendedDataTableItem}"
rendered="#{containerRichExtendedDataTableItem != 'row 3'}" />
+ </h:column>
+
+ </rich:extendedDataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file