richfaces-svn-commits
August 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 734 discussions
JBoss Rich Faces SVN: r18712 - in trunk: examples/output-demo and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-08-17 11:03:04 -0400 (Tue, 17 Aug 2010)
New Revision: 18712
Modified:
trunk/examples/input-demo/pom.xml
trunk/examples/output-demo/pom.xml
trunk/ui/dist/richfaces-components-api/pom.xml
trunk/ui/dist/richfaces-components-ui/pom.xml
Log:
fix dist
Modified: trunk/examples/input-demo/pom.xml
===================================================================
--- trunk/examples/input-demo/pom.xml 2010-08-17 15:01:52 UTC (rev 18711)
+++ trunk/examples/input-demo/pom.xml 2010-08-17 15:03:04 UTC (rev 18712)
@@ -108,7 +108,7 @@
<goal>war</goal>
</goals>
<configuration>
- <webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
<classifier>jee6</classifier>
<packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes>
@@ -118,7 +118,7 @@
<configuration>
<webResources>
<resource>
- <directory>${symbol_dollar}{basedir}/src/main/java</directory>
+ <directory>${basedir}/src/main/java</directory>
<targetPath>/WEB-INF/src</targetPath>
</resource>
</webResources>
Modified: trunk/examples/output-demo/pom.xml
===================================================================
--- trunk/examples/output-demo/pom.xml 2010-08-17 15:01:52 UTC (rev 18711)
+++ trunk/examples/output-demo/pom.xml 2010-08-17 15:03:04 UTC (rev 18712)
@@ -109,7 +109,7 @@
<goal>war</goal>
</goals>
<configuration>
- <webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
<classifier>jee6</classifier>
<packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes>
@@ -119,7 +119,7 @@
<configuration>
<webResources>
<resource>
- <directory>${symbol_dollar}{basedir}/src/main/java</directory>
+ <directory>${basedir}/src/main/java</directory>
<targetPath>/WEB-INF/src</targetPath>
</resource>
</webResources>
Modified: trunk/ui/dist/richfaces-components-api/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-17 15:01:52 UTC (rev 18711)
+++ trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-17 15:03:04 UTC (rev 18712)
@@ -152,7 +152,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>org.richfaces.ui.common, org.richfaces.ui.core, org.richfaces.ui.iteration, org.richfaces.ui.output, org.richfaces.ui.input</includeGroupIds>
+ <includeGroupIds>org.richfaces.ui.core, org.richfaces.ui.iteration, org.richfaces.ui.output, org.richfaces.ui.input</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-17 15:01:52 UTC (rev 18711)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-17 15:03:04 UTC (rev 18712)
@@ -176,7 +176,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>${assembly.projects.group}.common, ${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, ${assembly.projects.group}.output</includeGroupIds>
+ <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, ${assembly.projects.group}.output</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18711 - trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-17 11:01:52 -0400 (Tue, 17 Aug 2010)
New Revision: 18711
Modified:
trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java
Log:
https://jira.jboss.org/browse/RF-8945
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-08-17 14:57:20 UTC (rev 18710)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-08-17 15:01:52 UTC (rev 18711)
@@ -58,7 +58,19 @@
// TagHandlers structure is created when view is compiled
// so there's no need to check for BehaviorsStack
- return factory.createComponentHandlerDelegate(new BehaviorsAddingComponentHandlerWrapper(owner));
+
+ ComponentHandler wrappedHandler = owner;
+
+ //TODO - consider re-wrapping by smb. other, use attributes to handle
+ if (wrappedHandler instanceof BehaviorsAddingComponentHandlerWrapper) {
+ //MyFaces calls delegate factory just in ComponentHandler class ctor, so this is to avoid infinite recursion
+ //our delegate is fine with null value
+ return null;
+ } else {
+ wrappedHandler = new BehaviorsAddingComponentHandlerWrapper(owner);
+ }
+
+ return factory.createComponentHandlerDelegate(wrappedHandler);
}
/*
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18710 - in trunk/examples/richfaces-showcase/src/main: resources/org/richfaces/demo/data/common and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-08-17 10:57:20 -0400 (Tue, 17 Aug 2010)
New Revision: 18710
Added:
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml
Removed:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml
Modified:
trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml
Log:
https://jira.jboss.org/browse/RF-9092
Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java 2010-08-17 14:57:20 UTC (rev 18710)
@@ -0,0 +1,59 @@
+package org.richfaces.demo.tables;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.SessionScoped;
+import javax.faces.event.AjaxBehaviorEvent;
+
+import org.richfaces.component.UIExtendedDataTable;
+import org.richfaces.demo.tables.model.cars.InventoryItem;
+
+@ManagedBean
+@SessionScoped
+public class ExtTableSelectionBean {
+ private Collection<Object> selection;
+ @ManagedProperty(value = "#{carsBean.allInventoryItems}")
+ private List<InventoryItem> inventoryItems;
+ private List<InventoryItem> selectionItems = new ArrayList<InventoryItem>();
+
+ public void selectionListener(AjaxBehaviorEvent event){
+ UIExtendedDataTable dataTable = (UIExtendedDataTable)event.getComponent();
+ Object originalKey = dataTable.getRowKey();
+ selectionItems.clear();
+ for (Object selectionKey: selection) {
+ dataTable.setRowKey(selectionKey);
+ if (dataTable.isRowAvailable()){
+ selectionItems.add((InventoryItem)dataTable.getRowData());
+ }
+ }
+ dataTable.setRowKey(originalKey);
+ }
+
+ public Collection<Object> getSelection() {
+ return selection;
+ }
+
+ public void setSelection(Collection<Object> selection) {
+ this.selection = selection;
+ }
+
+ public List<InventoryItem> getInventoryItems() {
+ return inventoryItems;
+ }
+
+ public void setInventoryItems(List<InventoryItem> inventoryItems) {
+ this.inventoryItems = inventoryItems;
+ }
+
+ public List<InventoryItem> getSelectionItems() {
+ return selectionItems;
+ }
+
+ public void setSelectionItems(List<InventoryItem> selectionItems) {
+ this.selectionItems = selectionItems;
+ }
+}
Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-08-17 13:41:49 UTC (rev 18709)
+++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-08-17 14:57:20 UTC (rev 18710)
@@ -238,6 +238,10 @@
<id>simpleTable</id>
<name>ExtendedData Table Basic Usage</name>
</sample>
+ <sample>
+ <id>exTableSelection</id>
+ <name>ExtendedData Table Selection usage</name>
+ </sample>
</samples>
</demo>
<demo>
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml 2010-08-17 13:41:49 UTC (rev 18709)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml 2010-08-17 14:57:20 UTC (rev 18710)
@@ -5,13 +5,18 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:composition>
- <p>ExtendedDataTable component provides next set of features:</p>
- <ul>
- <li>Horizontal/Vertical scrolling</li>
- <li>Ajax lazy loading on vertical scroll</li>
- <li>Support "frozen" columns which are not scrolled on using
- horizontal scroll</li>
- </ul>
+<p>This sample shows the selection management using built-in selection functionality.</p>
+<p><b>selectionMode</b> attribute which controls selection mode has three values:</p>
+<p>
+<ul>
+<li>multi</li>
+<li>single</li>
+<li>none</li>
+</ul>
+</p>
+<p>And in order to manage your selection - use <b>selection</b> attribute which should be pointed to
+some <b>collection of objects</b>. It will <b>hold rowKeys</b> of currently selected rows.</p>
+<p>Look to next simple sample:</p>
<ui:include src="#{demoNavigator.sampleIncludeURI}" />
<ui:include src="/templates/includes/source-view.xhtml">
<ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" />
@@ -19,8 +24,12 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
- <p>In order to turn on Ajax loading - just specify clientRows
- attribute with number of rows to be loaded on the client</p>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/ExtTableSelectionBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View ExtSelectionBean Source" />
+ <ui:param name="hideLabel" value="Hide ExtSelectionBean Source" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Copied: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml (from rev 18704, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml)
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml 2010-08-17 14:57:20 UTC (rev 18710)
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition 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:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <h:panelGrid columns="2">
+ <h:form>
+ <rich:extendedDataTable
+ value="#{extTableSelectionBean.inventoryItems}" var="car"
+ selection="#{extTableSelectionBean.selection}" id="table"
+ frozenColumns="2" style="height:300px; width:500px;">
+ <a4j:ajax execute="@form"
+ event="selectionchange"
+ listener="#{extTableSelectionBean.selectionListener}" render=":res" />
+ <f:facet name="header">
+ <h:outputText value="Cars marketplace" />
+ </f:facet>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="vendor" />
+ </f:facet>
+ <h:outputText value="#{car.vendor}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Model" />
+ </f:facet>
+ <h:outputText value="#{car.model}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Price" />
+ </f:facet>
+ <h:outputText value="#{car.price}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{car.mileage}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="VIN Code" />
+ </f:facet>
+ <h:outputText value="#{car.vin}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Items stock" />
+ </f:facet>
+ <h:outputText value="#{car.stock}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Days Live" />
+ </f:facet>
+ <h:outputText value="#{car.daysLive}" />
+ </rich:column>
+ </rich:extendedDataTable>
+ </h:form>
+ <a4j:outputPanel id="res">
+ <rich:panel header="Selected Rows:"
+ rendered="#{not empty extTableSelectionBean.selectionItems}">
+ <rich:list type="unordered"
+ value="#{extTableSelectionBean.selectionItems}" var="sel">
+ <h:outputText value="#{sel.vendor} - #{sel.model} - #{sel.price}" />
+ </rich:list>
+ </rich:panel>
+ </a4j:outputPanel>
+ </h:panelGrid>
+</ui:composition>
\ No newline at end of file
Deleted: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml 2010-08-17 13:41:49 UTC (rev 18709)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml 2010-08-17 14:57:20 UTC (rev 18710)
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition 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:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
- <h:form>
- <rich:extendedDataTable value="#{carsBean.allInventoryItems}"
- var="car" id="table" frozenColumns="2"
- style="height:300px; width:500px;">
- <f:facet name="header">
- <h:outputText value="Cars marketplace" />
- </f:facet>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="vendor" />
- </f:facet>
- <h:outputText value="#{car.vendor}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Model" />
- </f:facet>
- <h:outputText value="#{car.model}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Price" />
- </f:facet>
- <h:outputText value="#{car.price}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Mileage" />
- </f:facet>
- <h:outputText value="#{car.mileage}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="VIN Code" />
- </f:facet>
- <h:outputText value="#{car.vin}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Items stock" />
- </f:facet>
- <h:outputText value="#{car.stock}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Days Live" />
- </f:facet>
- <h:outputText value="#{car.daysLive}" />
- </rich:column>
- </rich:extendedDataTable>
- </h:form>
-</ui:composition>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-17 13:41:49 UTC (rev 18709)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-17 14:57:20 UTC (rev 18710)
@@ -8,7 +8,7 @@
<h:form>
<rich:extendedDataTable value="#{carsBean.allInventoryItems}"
var="car" id="table" frozenColumns="2"
- style="height:300px; width:500px;">
+ style="height:300px; width:500px;" selectionMode="none">
<f:facet name="header">
<h:outputText value="Cars marketplace" />
</f:facet>
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18709 - trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-17 09:41:49 -0400 (Tue, 17 Aug 2010)
New Revision: 18709
Modified:
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss
Log:
Bad path in extendedDataTable.ecss fixed
Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss
===================================================================
--- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-08-17 13:40:59 UTC (rev 18708)
+++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-08-17 13:41:49 UTC (rev 18709)
@@ -146,7 +146,7 @@
height: 9px;
font-size: 9px;
width: 9px;
- background-image: url("#{resource['reorderMarker.gif']}");
+ background-image: url("#{resource['org.richfaces:reorderMarker.gif']}");
display: none;
}
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18708 - trunk/examples/iteration-demo/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-08-17 09:40:59 -0400 (Tue, 17 Aug 2010)
New Revision: 18708
Modified:
trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml
Log:
Modified: trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml 2010-08-17 13:38:49 UTC (rev 18707)
+++ trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml 2010-08-17 13:40:59 UTC (rev 18708)
@@ -76,8 +76,7 @@
<h:outputText value="Selected rowKeys" style="padding-left: 30px;"/>
<h:outputText id="selectionOutput" value="#{dataBean.selectedRowKeys}"/>
-
- <it:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2"
+ <it:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2"
value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data."
styleClass="extendedDataTable" rowKeyVar="rkv" filterVar="fv" sortMode="multi"
selectionMode="#{dataBean.selectionMode}" selectedRowKeys="#{dataBean.selectedRowKeys}"
@@ -87,7 +86,7 @@
<h:outputText value="Current date: #{dataBean.date}"/>
</f:facet>
<f:facet name="footer">
- <it:dataScroller id="scroller3" for="extendedDataTable" page="#{dataBean.page}" maxPages="7"></it:dataScroller>
+ <h:outputText value="Footer of table."/>
</f:facet>
<f:facet name="noData">
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18707 - in trunk/ui/iteration/ui/src/main: java/org/richfaces/event and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-08-17 09:38:49 -0400 (Tue, 17 Aug 2010)
New Revision: 18707
Added:
trunk/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
trunk/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java
Log:
add dataTablePreRenderListener registration, fix selection clientBehavior
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2010-08-17 13:34:21 UTC (rev 18706)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2010-08-17 13:38:49 UTC (rev 18707)
@@ -33,6 +33,7 @@
import javax.faces.context.FacesContext;
import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
@@ -74,8 +75,14 @@
}
@Attribute(defaultValue = "0")
- public abstract int getFrozenColumns();
+ public abstract int getFrozenColumns();
+ @Attribute(events=@EventName(value="selectionchange", defaultEvent=true))
+ public abstract String getOnselectionchange();
+
+ @Attribute(events=@EventName("beforeselectionchange"))
+ public abstract String getOnbeforeselectionchange();
+
public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
if (SCROLL.equals(metaComponentId)) {
Object oldRowKey = getRowKey();
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-08-17 13:34:21 UTC (rev 18706)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-08-17 13:38:49 UTC (rev 18707)
@@ -37,12 +37,13 @@
import org.ajax4jsf.Messages;
import org.richfaces.DataScrollerUtils;
+import org.richfaces.component.AbstractDataScroller;
import org.richfaces.component.UIDataAdaptor;
-import org.richfaces.component.AbstractDataScroller;
import org.richfaces.component.util.MessageUtil;
import org.richfaces.log.RichfacesLogger;
import org.slf4j.Logger;
+
public class DataTablePreRenderListener implements SystemEventListener {
private static final Logger LOG = RichfacesLogger.COMPONENTS.getLogger();
Added: trunk/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml
===================================================================
--- trunk/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml (rev 0)
+++ trunk/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml 2010-08-17 13:38:49 UTC (rev 18707)
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+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.
+-->
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ version="2.0">
+
+ <application>
+ <system-event-listener>
+ <system-event-listener-class>org.richfaces.event.DataTablePreRenderListener</system-event-listener-class>
+ <system-event-class>javax.faces.event.PreRenderComponentEvent</system-event-class>
+ </system-event-listener>
+ </application>
+</faces-config>
\ No newline at end of file
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18706 - trunk/examples/iteration-demo/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-08-17 09:34:21 -0400 (Tue, 17 Aug 2010)
New Revision: 18706
Modified:
trunk/examples/iteration-demo/src/main/webapp/dataGrid.xhtml
trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml
trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml
trunk/examples/iteration-demo/src/main/webapp/index.xhtml
Log:
add link to DataGrid sample, fix extendedDataTable sample, add datascroller component to the dataGrid, extendedDataTable samples
Modified: trunk/examples/iteration-demo/src/main/webapp/dataGrid.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/dataGrid.xhtml 2010-08-17 13:16:12 UTC (rev 18705)
+++ trunk/examples/iteration-demo/src/main/webapp/dataGrid.xhtml 2010-08-17 13:34:21 UTC (rev 18706)
@@ -54,7 +54,12 @@
<h:outputText value="#{record.name}"/>
<h:outputText value="#{record.title}"/>
- <h:outputText value="#{record.EMail}"/>
+ <h:outputText value="#{record.EMail}"/>
+
+ <f:facet name="footer">
+ <it:dataScroller id="scroller3" for="dataGrid" page="#{dataBean.page}" maxPages="7"></it:dataScroller>
+ </f:facet>
+
</it:dataGrid>
</h:form>
</h:body>
Modified: trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2010-08-17 13:16:12 UTC (rev 18705)
+++ trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2010-08-17 13:34:21 UTC (rev 18706)
@@ -21,7 +21,7 @@
</f:facet>
<f:facet name="header">
- <h:outputText value="header facet" />
+ <h:outputText value="header"/>
</f:facet>
<it:column id="column_name" sortBy="#{record.name}"
Modified: trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml 2010-08-17 13:16:12 UTC (rev 18705)
+++ trunk/examples/iteration-demo/src/main/webapp/extendedtable.xhtml 2010-08-17 13:34:21 UTC (rev 18706)
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:it="http://richfaces.org/iteration">
<!--
JBoss, Home of Professional Open Source
Copyright ${year}, Red Hat, Inc. and individual contributors
@@ -75,7 +75,9 @@
<input id="selectionLocker" type="checkbox"/>
<h:outputText value="Selected rowKeys" style="padding-left: 30px;"/>
<h:outputText id="selectionOutput" value="#{dataBean.selectedRowKeys}"/>
- <rich:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2"
+
+
+ <it:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2"
value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data."
styleClass="extendedDataTable" rowKeyVar="rkv" filterVar="fv" sortMode="multi"
selectionMode="#{dataBean.selectionMode}" selectedRowKeys="#{dataBean.selectedRowKeys}"
@@ -85,12 +87,13 @@
<h:outputText value="Current date: #{dataBean.date}"/>
</f:facet>
<f:facet name="footer">
- <h:outputText value="Footer of table."/>
+ <it:dataScroller id="scroller3" for="extendedDataTable" page="#{dataBean.page}" maxPages="7"></it:dataScroller>
+
</f:facet>
<f:facet name="noData">
<h:outputText value="There isn't data." style="border: solid black 1px;"/>
</f:facet>
- <rich:column id="rkv">
+ <it:column id="rkv">
<f:facet name="header">
<h:outputText value="Index"/>
</f:facet>
@@ -100,11 +103,11 @@
<h:outputText id="footerFacet" value="index"/>
</f:facet>
</c:if>
- </rich:column>
- <rich:column>
+ </it:column>
+ <it:column>
<textarea cols="5" rows="5"/>
- </rich:column>
- <rich:column id="column_name" filterExpression="#{fn:containsIgnoreCase(record.name, fv)}" sortBy="#{record.name}">
+ </it:column>
+ <it:column id="column_name" filterExpression="#{fn:containsIgnoreCase(record.name, fv)}" sortBy="#{record.name}">
<f:facet name="header">
<h:outputText id="columnHeader1" value="Column Header Facet"/>
</f:facet>
@@ -114,30 +117,30 @@
<h:outputText id="columnFooter1" value="Column Footer Facet"/>
</f:facet>
</c:if>
- </rich:column>
+ </it:column>
- <rich:column id="column_title" width="200px" sortBy="#{record.title}">
+ <it:column id="column_title" width="200px" sortBy="#{record.title}">
<h:outputText value="#{record.title}" />
<c:if test="#{dataBean.rendered}">
<f:facet name="footer">
<h:outputText id="columnFooter2" value="Column Footer Facet2"/>
</f:facet>
</c:if>
- </rich:column>
+ </it:column>
- <rich:column id="column_email" width="300px">
+ <it:column id="column_email" width="300px">
<h:outputText value="#{record.EMail}" />
- </rich:column>
- <rich:column id="column_company_name" width="300px">
+ </it:column>
+ <it:column id="column_company_name" width="300px">
<h:outputText value="#{record.companies[0].name}" />
- </rich:column>
- <rich:column id="column_company_state">
+ </it:column>
+ <it:column id="column_company_state">
<h:outputText value="#{record.companies[0].state}" />
- </rich:column>
- <rich:column id="column_company_phone">
+ </it:column>
+ <it:column id="column_company_phone">
<h:outputText value="#{record.companies[0].phone}" />
- </rich:column>
- </rich:extendedDataTable>
+ </it:column>
+ </it:extendedDataTable>
<input id="submit" type="submit" />
</h:form>
</h:body>
Modified: trunk/examples/iteration-demo/src/main/webapp/index.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/index.xhtml 2010-08-17 13:16:12 UTC (rev 18705)
+++ trunk/examples/iteration-demo/src/main/webapp/index.xhtml 2010-08-17 13:34:21 UTC (rev 18706)
@@ -10,9 +10,11 @@
<ul>
<li><h:link outcome="dataTable">rich:DataTable</h:link></li>
<li><h:link outcome="extendedtable">rich:extendedDataTable</h:link></li>
+ <li><h:link outcome="extendedtable">rich:DataGrid</h:link></li>
<li><h:link outcome="filteringAndSorting">filtering and sorting feature</h:link></li>
<li><h:link outcome="list">rich:list</h:link></li>
</ul>
+
<h:form>
<h:panelGrid columns="3">
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18705 - trunk/core/parent.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-08-17 09:16:12 -0400 (Tue, 17 Aug 2010)
New Revision: 18705
Modified:
trunk/core/parent/pom.xml
Log:
revert previous change
Modified: trunk/core/parent/pom.xml
===================================================================
--- trunk/core/parent/pom.xml 2010-08-17 12:14:49 UTC (rev 18704)
+++ trunk/core/parent/pom.xml 2010-08-17 13:16:12 UTC (rev 18705)
@@ -77,13 +77,6 @@
<!-- Trigger checkstyle checking for this module -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-build-checkstyle</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18704 - in trunk/examples/richfaces-showcase: src/main/java/org/richfaces/demo/function and 15 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-08-17 08:14:49 -0400 (Tue, 17 Aug 2010)
New Revision: 18704
Added:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml
Modified:
trunk/examples/richfaces-showcase/pom.xml
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java
trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml
Log:
https://jira.jboss.org/browse/RF-9086
https://jira.jboss.org/browse/RF-9047
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/pom.xml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -1,263 +1,295 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>10-SNAPSHOT</version>
+ </parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>richfaces-showcase</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>Richfaces Examples: Richfaces Showcase Application</name>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>richfaces-showcase</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>Richfaces Examples: Richfaces Showcase Application</name>
- <properties>
- <!-- FIXME these should be through the richfaces-parent -->
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <properties>
+ <!-- FIXME these should be through the richfaces-parent -->
+ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <jetty.port>8080</jetty.port>
- <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
- <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
- </properties>
+ <jetty.port>8080</jetty.port>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
+ </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${org.richfaces.bom.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${org.richfaces.bom.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
+ <!--
+ simple logger binding: only messages of level INFO and higher are
+ printed
+ -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
- <build>
- <finalName>richfaces-showcase</finalName>
+ <build>
+ <finalName>richfaces-showcase</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <connectors>
- <connector
- implementation="org.mortbay.jetty.nio.SelectChannelConnector"
- >
- <port>${jetty.port}</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <targetPath>/WEB-INF/src</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <targetPath>/WEB-INF/src</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>jdk5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>jee6</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
- <classifier>jee6</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes>
- <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <classifier>tomcat6</classifier>
- </configuration>
- </plugin>
+ <profiles>
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jee6</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
+ <classifier>jee6</classifier>
+ <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes>
+ <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <targetPath>/WEB-INF/src</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <classifier>tomcat6</classifier>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <targetPath>/WEB-INF/src</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>sources</finalName>
- <descriptor>assembler.xml</descriptor>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <classesDirectory>${basedir}/target/sources/sources</classesDirectory>
- <classifier>sources</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jee6</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>group-sources</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <finalName>sources</finalName>
+ <descriptor>assembler.xml</descriptor>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <classesDirectory>${basedir}/target/sources/sources</classesDirectory>
+ <classifier>sources</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jee6</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <targetPath>/WEB-INF/src</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
- <repositories>
- <!-- FIXME - This should be set globally in parent -->
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <repositories>
+ <!-- FIXME - This should be set globally in parent -->
+ <repository>
+ <id>maven-repository2.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/richfaces-sh...</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/richfaces-sh...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java 2010-08-17 12:14:49 UTC (rev 18704)
@@ -2,17 +2,12 @@
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
-import javax.faces.context.FacesContext;
@ManagedBean(name = "functionBean")
@RequestScoped
public class FunctionBean {
private String text;
- public void processHover() {
- setText(FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("name"));
- }
-
public String getText() {
return text;
}
Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -310,7 +310,7 @@
<sample>
<id>simple</id>
<name>Simple Toggle Panel</name>
- </sample>
+ </sample>
</samples>
</demo>
<demo>
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -16,6 +16,13 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/common/SelectsBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View Bean Source" />
+ <ui:param name="hideLabel" value="Hide Bean Source" />
+ </ui:include>
+
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -14,5 +14,29 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/ReportBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View ReportBean Source" />
+ <ui:param name="hideLabel" value="Hide ReportBean Source" />
+ </ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/model/expenses/ExpenseReport.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View ExpenseReport Source" />
+ <ui:param name="hideLabel" value="Hide ExpenseReport Source" />
+ </ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View ExpenseReportRecord Source" />
+ <ui:param name="hideLabel" value="Hide ExpenseReportRecord Source" />
+ </ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/model/expenses/ExpenseReportRecordItem.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View ExpenseReportRecordItem Source" />
+ <ui:param name="hideLabel" value="Hide ExpenseReportRecordItem Source" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -12,5 +12,11 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/CarsFilteringBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View CarsFilteringBean Source" />
+ <ui:param name="hideLabel" value="Hide CarsFilteringBean Source" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -20,5 +20,11 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/CapitalsSortingBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View CapitalsSortingBean Source" />
+ <ui:param name="hideLabel" value="Hide CapitalsSortingBean Source" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -0,0 +1,26 @@
+<!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">
+
+<ui:composition>
+ <p>ExtendedDataTable component provides next set of features:</p>
+ <ul>
+ <li>Horizontal/Vertical scrolling</li>
+ <li>Ajax lazy loading on vertical scroll</li>
+ <li>Support "frozen" columns which are not scrolled on using
+ horizontal scroll</li>
+ </ul>
+ <ui:include src="#{demoNavigator.sampleIncludeURI}" />
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" />
+ <ui:param name="sourceType" value="xhtml" />
+ <ui:param name="openLabel" value="View Source" />
+ <ui:param name="hideLabel" value="Hide Source" />
+ </ui:include>
+ <p>In order to turn on Ajax loading - just specify clientRows
+ attribute with number of rows to be loaded on the client</p>
+</ui:composition>
+
+</html>
\ No newline at end of file
Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelectionSample.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition 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:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <h:form>
+ <rich:extendedDataTable value="#{carsBean.allInventoryItems}"
+ var="car" id="table" frozenColumns="2"
+ style="height:300px; width:500px;">
+ <f:facet name="header">
+ <h:outputText value="Cars marketplace" />
+ </f:facet>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="vendor" />
+ </f:facet>
+ <h:outputText value="#{car.vendor}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Model" />
+ </f:facet>
+ <h:outputText value="#{car.model}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Price" />
+ </f:facet>
+ <h:outputText value="#{car.price}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{car.mileage}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="VIN Code" />
+ </f:facet>
+ <h:outputText value="#{car.vin}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Items stock" />
+ </f:facet>
+ <h:outputText value="#{car.stock}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Days Live" />
+ </f:facet>
+ <h:outputText value="#{car.daysLive}" />
+ </rich:column>
+ </rich:extendedDataTable>
+ </h:form>
+</ui:composition>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -12,7 +12,8 @@
<li>Support "frozen" columns which are not scrolled on using
horizontal scroll</li>
</ul>
-
+ <p>The component not requires special model usage but supports all the standard ones and all the
+ models which rich:dataTable supports.</p>
<ui:include src="#{demoNavigator.sampleIncludeURI}" />
<ui:include src="/templates/includes/source-view.xhtml">
<ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" />
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -22,9 +22,8 @@
</tbody>
</table>
<h:form>
- <a4j:jsFunction name="updateName" render="showname"
- action="#{functionBean.processHover}">
- <f:param name="name" />
+ <a4j:jsFunction name="updateName" render="showname">
+ <a4j:param name="name" assignTo="#{functionBean.text}"/>
</a4j:jsFunction>
</h:form>
</ui:composition>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -15,6 +15,12 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/resources/rich/messages.xhtml" />
+ <ui:param name="sourceType" value="xhtml" />
+ <ui:param name="openLabel" value="View Messages Composite Component" />
+ <ui:param name="hideLabel" value="Hide Messages Composite Component" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -25,7 +25,12 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
-
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/poll/PollBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View Bean Source" />
+ <ui:param name="hideLabel" value="Hide Bean Source" />
+ </ui:include>
<rich:panel>
<b>NOTE:</b>polling is automatically disabled in this demo after one minute of working.
</rich:panel>
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -22,6 +22,12 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/push/ChoicesBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View Bean Source" />
+ <ui:param name="hideLabel" value="Hide Bean Source" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -17,9 +17,10 @@
a4j:region</b> component and has no execute definitions - them uses<b>
execute="@region"</b></p>
<p>Look to the simple example below. There are two similar user
- info panels. But the ajax behaviors inside the first panel uses execute
- declarations and pointed to panelGrid id. And the second panel inputs
- just wrapped to region without any additional execute definitions.</p>
+ info panels. But the <b><u>button inside the first panel will not works</u> </b>as not uses execute
+ declarations and by default execut equals to @this. Separate definition needed to start working properly.
+ And the <b>second panel inputs
+ just wrapped to region with the commandButton and works</b> without any additional execute definitions.</p>
<ui:include src="#{demoNavigator.sampleIncludeURI}" />
<ui:include src="/templates/includes/source-view.xhtml">
<ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" />
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -15,16 +15,11 @@
</f:facet>
<h:panelGrid columns="2" id="userInfoPanel1">
<h:outputText value="User Name: " />
- <h:inputText value="#{regionBean.user1.name}">
- <a4j:ajax render="echopanel1" event="keyup"
- execute="userInfoPanel1" />
- </h:inputText>
+ <h:inputText value="#{regionBean.user1.name}"/>
<h:outputText value="User email: " />
- <h:inputText value="#{regionBean.user1.email}">
- <a4j:ajax render="echopanel1" event="keyup"
- execute="userInfoPanel1" />
- </h:inputText>
+ <h:inputText value="#{regionBean.user1.email}"/>
</h:panelGrid>
+ <a4j:commandButton render="echopanel1" value="submit"/>
</h:panelGrid>
<h:panelGrid columns="2" id="echopanel1">
<f:facet name="header">
@@ -46,14 +41,11 @@
<a4j:region>
<h:panelGrid columns="2">
<h:outputText value="User Name: " />
- <h:inputText value="#{regionBean.user2.name}">
- <a4j:ajax render="echopanel2" event="keyup" />
- </h:inputText>
+ <h:inputText value="#{regionBean.user2.name}"/>
<h:outputText value="User email: " />
- <h:inputText value="#{regionBean.user2.email}">
- <a4j:ajax render="echopanel2" event="keyup" />
- </h:inputText>
+ <h:inputText value="#{regionBean.user2.email}"/>
</h:panelGrid>
+ <a4j:commandButton render="echopanel2" value="submit"/>
</a4j:region>
</h:panelGrid>
<h:panelGrid columns="2" id="echopanel2">
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -15,5 +15,11 @@
<ui:param name="openLabel" value="View Source" />
<ui:param name="hideLabel" value="Hide Source" />
</ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/CapitalsBean.java" />
+ <ui:param name="sourceType" value="java" />
+ <ui:param name="openLabel" value="View Bean Source" />
+ <ui:param name="hideLabel" value="Hide Bean Source" />
+ </ui:include>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -8,7 +8,7 @@
<p>This sample shows simple master-detail table implemented using<b>
rich:dataTable</b> and<b> rich:subtable</b> components</p>
<p>There is one feature which is completely new for 4.x - subtables
- now could be collapsed/expanded by using new component <b>rich:tableToggleControl</b></p>
+ now could be collapsed/expanded by using new component <b>rich:subTableToggleControl</b></p>
<p>Switching customization:</p>
<ul>
<li>subTable's could be collapsed/expanded in different modes
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -20,12 +20,12 @@
</style>
<h:form>
<rich:togglePanel id="panel1" activeItem="item1" render="tabs">
- <rich:togglePanelItem name="item1" styleClass="rf-tgp-i">
+ <rich:togglePanelItem name="item1">
<p>This toggle panel switches in Ajax mode. So only one active
item loaded to the client.</p>
<p>For now you are at Panel 1</p>
</rich:togglePanelItem>
- <rich:togglePanelItem name="item2" styleClass="rf-tgp-i">
+ <rich:togglePanelItem name="item2">
<p>After the second link click - panel changed active item to
the second one according to name specified in the
togglePanelBehavior</p>
Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
+++ trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml 2010-08-17 12:14:49 UTC (rev 18704)
@@ -19,20 +19,20 @@
<h:outputLink value="#"
onclick="jQuery(#{rich:element('hide')}).slideDown(); jQuery(#{rich:element('show')}).hide(); return false;"
id="sh1" styleClass="show">
- <h:outputText value="#{empty openlabel?'View Source' : openlabel }" />
+ <h:outputText value="#{empty openLabel?'View Source' : openLabel }" />
</h:outputLink>
</a4j:outputPanel>
<a4j:outputPanel id="hide" layout="block" style="display:none">
<h:outputLink styleClass="hide" value="#"
onclick="jQuery(#{rich:element('hide')}).slideUp(); jQuery(#{rich:element('show')}).show(500); return false;">
- <h:outputText value="#{empty hidelabel?'Hide Source' : openlabel }" />
+ <h:outputText value="#{empty hideLabel?'Hide Source' : hideLabel }" />
</h:outputLink>
<at:syntaxHighlighter styleClass="source" src="#{src}"
sourceType="#{sourceType}" />
<h:outputLink styleClass="hide" value="#"
onclick="jQuery(#{rich:element('hide')}).slideUp(); jQuery(#{rich:element('show')}).show(500); return false;">
- <h:outputText value="#{empty hidelabel?'Hide Source' : openlabel }" />
+ <h:outputText value="#{empty hideLabel?'Hide Source' : hideLabel }" />
</h:outputLink>
</a4j:outputPanel>
</a4j:outputPanel>
15 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r18703 - in modules/tests/metamer/trunk/application/src/main: webapp/components and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-08-17 07:48:36 -0400 (Tue, 17 Aug 2010)
New Revision: 18703
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
Log:
https://jira.jboss.org/browse/RFPL-676
* added two pages for rich:popupPanel
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-08-17 11:21:01 UTC (rev 18702)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-08-17 11:48:36 UTC (rev 18703)
@@ -117,6 +117,7 @@
components.put("richJQuery", "Rich jQuery");
components.put("richList", "Rich List");
components.put("richPanel", "Rich Panel");
+ components.put("richPopupPanel", "Rich Popup Panel");
components.put("richSubTable", "Rich Subtable");
components.put("richSubTableToggleControl", "Rich Subtable Toggle Control");
components.put("richToggleControl", "Rich Toggle Control");
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2010-08-17 11:48:36 UTC (rev 18703)
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, 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.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.bean;
+
+import java.io.Serializable;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+import org.richfaces.component.UIPopupPanel;
+
+import org.richfaces.tests.metamer.Attributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:popupPanel.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "richPopupPanelBean")
+@SessionScoped
+public class RichPopupPanelBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getUIComponentAttributes(UIPopupPanel.class, getClass());
+
+ attributes.setAttribute("header", "popup panel header");
+ attributes.setAttribute("height", 300);
+ attributes.setAttribute("left", "auto");
+ attributes.setAttribute("maxHeight", 500);
+ attributes.setAttribute("maxWidth", 500);
+ attributes.setAttribute("minHeight", 300);
+ attributes.setAttribute("minWidth", 300);
+ attributes.setAttribute("moveable", true);
+ attributes.setAttribute("rendered", true);
+ attributes.setAttribute("resizeable", true);
+ attributes.setAttribute("top", "auto");
+ attributes.setAttribute("trimOverlayedElements", true);
+ attributes.setAttribute("width", 500);
+
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/list.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/list.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
@@ -0,0 +1,45 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, 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.
+-->
+
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <ui:composition template="/templates/list.xhtml">
+
+ <ui:define name="pageTitle">Rich Popup Panel</ui:define>
+
+ <ui:define name="links">
+
+ <metamer:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains a <b>rich:popupPanel</b> and input boxes for all its attributes.
+ </metamer:testPageLink>
+
+ <metamer:testPageLink id="outsideForm" outcome="outsideForm" value="Outside Form">
+ Simple page that contains a <b>rich:popupPanel</b> outside form and input boxes for all its attributes.
+ </metamer:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
@@ -0,0 +1,123 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, 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.
+-->
+
+<!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:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ <c:set var="dontRenderForm" value="#{true}"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+ <h:commandButton value="Call the popup">
+ <rich:componentControl target="popupPanel" operation="show" />
+ </h:commandButton>
+
+ <rich:popupPanel id="popupPanel"
+ ZIndex="#{richPopupPanelBean.attributes['ZIndex'].value}"
+ autosized="#{richPopupPanelBean.attributes['autosized'].value}"
+ controlsClass="#{richPopupPanelBean.attributes['controlsClass'].value}"
+ domElementAttachment="#{richPopupPanelBean.attributes['domElementAttachment'].value}"
+ followByScroll="#{richPopupPanelBean.attributes['followByScroll'].value}"
+ header="#{richPopupPanelBean.attributes['header'].value}"
+ headerClass="#{richPopupPanelBean.attributes['headerClass'].value}"
+ height="#{richPopupPanelBean.attributes['height'].value}"
+ keepVisualState="#{richPopupPanelBean.attributes['keepVisualState'].value}"
+ left="#{richPopupPanelBean.attributes['left'].value}"
+ maxHeight="#{richPopupPanelBean.attributes['maxHeight'].value}"
+ maxWidth="#{richPopupPanelBean.attributes['maxWidht'].value}"
+ minHeight="#{richPopupPanelBean.attributes['minHeight'].value}"
+ minWidht="#{richPopupPanelBean.attributes['minWidht'].value}"
+ modal="#{richPopupPanelBean.attributes['modal'].value}"
+ moveable="#{richPopupPanelBean.attributes['moveable'].value}"
+ onbeforehide = "#{richPopupPanelBean.attributes['onbeforehide'].value}"
+ onbeforeshow = "#{richPopupPanelBean.attributes['onbeforeshow'].value}"
+ onhide = "#{richPopupPanelBean.attributes['onhide'].value}"
+ onmaskclick = "#{richPopupPanelBean.attributes['onmaskclick'].value}"
+ onmaskcontextmenu = "#{richPopupPanelBean.attributes['onmaskcontextmenu'].value}"
+ onmaskdblclick = "#{richPopupPanelBean.attributes['onmaskdblclick'].value}"
+ onmaskmousedown = "#{richPopupPanelBean.attributes['onmaskmousedown'].value}"
+ onmaskmousemove = "#{richPopupPanelBean.attributes['onmaskmousemove'].value}"
+ onmaskmouseout = "#{richPopupPanelBean.attributes['onmaskmouseout'].value}"
+ onmaskmouseover = "#{richPopupPanelBean.attributes['onmaskmouseover'].value}"
+ onmaskmouseup = "#{richPopupPanelBean.attributes['onmaskmouseup'].value}"
+ onmove = "#{richPopupPanelBean.attributes['onmove'].value}"
+ onresize = "#{richPopupPanelBean.attributes['onresize'].value}"
+ onshow = "#{richPopupPanelBean.attributes['onshow'].value}"
+ overlapEmbedObjects="#{richPopupPanelBean.attributes['overlapEmbedObjects'].value}"
+ rendered="#{richPopupPanelBean.attributes['rendered'].value}"
+ resizeable="#{richPopupPanelBean.attributes['resizeable'].value}"
+ shadowDepth="#{richPopupPanelBean.attributes['shadowDepth'].value}"
+ shadowOpacity="#{richPopupPanelBean.attributes['shadowOpacity'].value}"
+ show="#{richPopupPanelBean.attributes['show'].value}"
+ top="#{richPopupPanelBean.attributes['top'].value}"
+ trimOverlayedElements="#{richPopupPanelBean.attributes['trimOverlayedElements'].value}"
+ visualOptions="#{richPopupPanelBean.attributes['visualOptions'].value}"
+ width="#{richPopupPanelBean.attributes['width'].value}"
+ >
+ <f:facet name="controls">
+ <h:outputLink value="#" onclick="#{rich:component('popupPanel')}.hide(); return false;">X</h:outputLink>
+ </f:facet>
+
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum bibendum magna non
+ justo eleifend ullamcorper. Nulla id libero consectetur mauris rutrum tincidunt. Vestibulum
+ nibh elit, aliquam eget aliquet non, consequat cursus odio. Aenean et libero et lorem sollicitudin
+ ultrices ullamcorper nec odio. Etiam enim sapien, pellentesque at cursus ut, commodo ut tortor.
+ Proin ut urna et risus varius lobortis eget in urna. Integer vitae tortor quis purus volutpat aliquet.
+ Maecenas ultrices magna placerat elit pretium varius. Etiam vitae metus orci, non laoreet metus.
+ Fusce velit lectus, feugiat ullamcorper dictum ut, egestas quis ante. Nulla a ante in ligula euismod
+ ullamcorper nec pulvinar diam. Mauris vitae diam nec diam imperdiet suscipit in ac sem. In hac habitasse
+ platea dictumst. Suspendisse potenti. Ut consectetur, elit in blandit consequat, neque orci aliquet
+ ligula, sit amet sagittis sapien velit a ante. Phasellus mollis, urna sit amet congue ultrices, tortor
+ quam viverra metus, nec ornare nunc mi vitae lacus. Proin quis lectus nunc, id accumsan elit. Donec
+ vitae lorem ac diam molestie condimentum. Suspendisse tempor orci a ligula condimentum non congue
+ urna facilisis.
+
+ <br/>
+
+ <a href="#" onclick="#{rich:component('popupPanel')}.hide()">hide this panel</a>
+ </p>
+ </rich:popupPanel>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <h:form id="form">
+ <metamer:attributes value="#{richPopupPanelBean.attributes}" id="attributes" render="log"/>
+ </h:form>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2010-08-17 11:48:36 UTC (rev 18703)
@@ -0,0 +1,119 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, 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.
+-->
+
+<!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:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+ <h:commandButton value="Call the popup">
+ <rich:componentControl target="popupPanel" operation="show" />
+ </h:commandButton>
+
+ <rich:popupPanel id="popupPanel"
+ ZIndex="#{richPopupPanelBean.attributes['ZIndex'].value}"
+ autosized="#{richPopupPanelBean.attributes['autosized'].value}"
+ controlsClass="#{richPopupPanelBean.attributes['controlsClass'].value}"
+ domElementAttachment="#{richPopupPanelBean.attributes['domElementAttachment'].value}"
+ followByScroll="#{richPopupPanelBean.attributes['followByScroll'].value}"
+ header="#{richPopupPanelBean.attributes['header'].value}"
+ headerClass="#{richPopupPanelBean.attributes['headerClass'].value}"
+ height="#{richPopupPanelBean.attributes['height'].value}"
+ keepVisualState="#{richPopupPanelBean.attributes['keepVisualState'].value}"
+ left="#{richPopupPanelBean.attributes['left'].value}"
+ maxHeight="#{richPopupPanelBean.attributes['maxHeight'].value}"
+ maxWidth="#{richPopupPanelBean.attributes['maxWidht'].value}"
+ minHeight="#{richPopupPanelBean.attributes['minHeight'].value}"
+ minWidht="#{richPopupPanelBean.attributes['minWidht'].value}"
+ modal="#{richPopupPanelBean.attributes['modal'].value}"
+ moveable="#{richPopupPanelBean.attributes['moveable'].value}"
+ onbeforehide="#{richPopupPanelBean.attributes['onbeforehide'].value}"
+ onbeforeshow="#{richPopupPanelBean.attributes['onbeforeshow'].value}"
+ onhide="#{richPopupPanelBean.attributes['onhide'].value}"
+ onmaskclick="#{richPopupPanelBean.attributes['onmaskclick'].value}"
+ onmaskcontextmenu="#{richPopupPanelBean.attributes['onmaskcontextmenu'].value}"
+ onmaskdblclick="#{richPopupPanelBean.attributes['onmaskdblclick'].value}"
+ onmaskmousedown="#{richPopupPanelBean.attributes['onmaskmousedown'].value}"
+ onmaskmousemove="#{richPopupPanelBean.attributes['onmaskmousemove'].value}"
+ onmaskmouseout="#{richPopupPanelBean.attributes['onmaskmouseout'].value}"
+ onmaskmouseover="#{richPopupPanelBean.attributes['onmaskmouseover'].value}"
+ onmaskmouseup="#{richPopupPanelBean.attributes['onmaskmouseup'].value}"
+ onmove="#{richPopupPanelBean.attributes['onmove'].value}"
+ onresize="#{richPopupPanelBean.attributes['onresize'].value}"
+ onshow="#{richPopupPanelBean.attributes['onshow'].value}"
+ overlapEmbedObjects="#{richPopupPanelBean.attributes['overlapEmbedObjects'].value}"
+ rendered="#{richPopupPanelBean.attributes['rendered'].value}"
+ resizeable="#{richPopupPanelBean.attributes['resizeable'].value}"
+ shadowDepth="#{richPopupPanelBean.attributes['shadowDepth'].value}"
+ shadowOpacity="#{richPopupPanelBean.attributes['shadowOpacity'].value}"
+ show="#{richPopupPanelBean.attributes['show'].value}"
+ top="#{richPopupPanelBean.attributes['top'].value}"
+ trimOverlayedElements="#{richPopupPanelBean.attributes['trimOverlayedElements'].value}"
+ visualOptions="#{richPopupPanelBean.attributes['visualOptions'].value}"
+ width="#{richPopupPanelBean.attributes['width'].value}"
+ >
+ <f:facet name="controls">
+ <h:outputLink value="#" onclick="#{rich:component('popupPanel')}.hide(); return false;">X</h:outputLink>
+ </f:facet>
+
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum bibendum magna non
+ justo eleifend ullamcorper. Nulla id libero consectetur mauris rutrum tincidunt. Vestibulum
+ nibh elit, aliquam eget aliquet non, consequat cursus odio. Aenean et libero et lorem sollicitudin
+ ultrices ullamcorper nec odio. Etiam enim sapien, pellentesque at cursus ut, commodo ut tortor.
+ Proin ut urna et risus varius lobortis eget in urna. Integer vitae tortor quis purus volutpat aliquet.
+ Maecenas ultrices magna placerat elit pretium varius. Etiam vitae metus orci, non laoreet metus.
+ Fusce velit lectus, feugiat ullamcorper dictum ut, egestas quis ante. Nulla a ante in ligula euismod
+ ullamcorper nec pulvinar diam. Mauris vitae diam nec diam imperdiet suscipit in ac sem. In hac habitasse
+ platea dictumst. Suspendisse potenti. Ut consectetur, elit in blandit consequat, neque orci aliquet
+ ligula, sit amet sagittis sapien velit a ante. Phasellus mollis, urna sit amet congue ultrices, tortor
+ quam viverra metus, nec ornare nunc mi vitae lacus. Proin quis lectus nunc, id accumsan elit. Donec
+ vitae lorem ac diam molestie condimentum. Suspendisse tempor orci a ligula condimentum non congue
+ urna facilisis.
+
+ <br/>
+
+ <a href="#" onclick="#{rich:component('popupPanel')}.hide()">hide this panel</a>
+ </p>
+ </rich:popupPanel>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richPopupPanelBean.attributes}" id="attributes" render="log"/>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
15 years, 9 months
- 1
- 0