richfaces-svn-commits
August 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 734 discussions
JBoss Rich Faces SVN: r18843 - modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-08-20 06:58:54 -0400 (Fri, 20 Aug 2010)
New Revision: 18843
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
Log:
* fixed a typo
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-08-20 10:54:21 UTC (rev 18842)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-08-20 10:58:54 UTC (rev 18843)
@@ -84,7 +84,7 @@
valueChangeListeners="#{richInputNumberSliderBean.attributes['valueChangeListeners'].value}">
<ui:remove>
<a4j:ajax id="sliderAjax" render="output"/>
- </ui:remove>c
+ </ui:remove>
</rich:inputNumberSlider>
<br/><br/>
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18842 - in trunk: examples/output-demo/src/main/webapp/examples and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-08-20 06:54:21 -0400 (Fri, 20 Aug 2010)
New Revision: 18842
Modified:
trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java
trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/AccordionItem.js
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss
Log:
Accordion width and height attributes
Modified: trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java
===================================================================
--- trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-20 10:54:21 UTC (rev 18842)
@@ -29,7 +29,6 @@
}
public String getValue() {
- System.out.println("value = " + value);
return value;
}
Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2010-08-20 10:54:21 UTC (rev 18842)
@@ -15,7 +15,7 @@
<p>Page</p>
<h:form id="f" style="border:blue solid thin;">
- <pn:accordion>
+ <pn:accordion width="500px" height="300px">
<pn:accordionItem header="label 1">Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here.</pn:accordionItem>
<pn:accordionItem header="label 2">content 2</pn:accordionItem>
<pn:accordionItem header="label 3">content 3</pn:accordionItem>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java 2010-08-20 10:54:21 UTC (rev 18842)
@@ -70,6 +70,8 @@
onmousedown,
onmousemove,
onmouseout,
+ width,
+ height,
onmouseover,
onmouseup
}
@@ -83,6 +85,22 @@
return COMPONENT_FAMILY;
}
+ public String getWidth() {
+ return (String) getStateHelper().eval(PropertyKeys.width);
+ }
+
+ public void setWidth(String width) {
+ getStateHelper().put(PropertyKeys.width, width);
+ }
+
+ public String getHeight() {
+ return (String) getStateHelper().eval(PropertyKeys.height);
+ }
+
+ public void setHeight(String height) {
+ getStateHelper().put(PropertyKeys.height, height);
+ }
+
public String getItemHeaderClassActive() {
return (String) getStateHelper().eval(PropertyKeys.itemHeaderClassActive);
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2010-08-20 10:54:21 UTC (rev 18842)
@@ -25,6 +25,7 @@
import org.ajax4jsf.javascript.JSObject;
import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.AbstractAccordion;
+import org.richfaces.component.util.HtmlUtil;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
@@ -34,6 +35,8 @@
import java.io.IOException;
import java.util.Map;
+import static org.richfaces.component.html.HtmlAccordion.PropertyKeys.*;
+
/**
* @author akolonitsky
* @since 2010-08-05
@@ -56,6 +59,15 @@
}
@Override
+ protected String getStyle(UIComponent component) {
+ return HtmlUtil.concatStyles(
+ attributeAsStyle(component, height),
+ attributeAsStyle(component, width),
+
+ super.getStyle(component));
+ }
+
+ @Override
protected String getStyleClass(UIComponent component) {
return "rf-ac " + attributeAsString(component, "styleClass");
}
@@ -79,6 +91,7 @@
@Override
protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) {
Map<String, Object> options = super.getScriptObjectOptions(context, component);
+ options.put("isKeepHeight", !attributeAsString(component, height).isEmpty());
options.remove("items");
return options;
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java 2010-08-20 10:54:21 UTC (rev 18842)
@@ -43,7 +43,7 @@
*/
public class DivPanelRenderer extends RendererBase {
- private static final RenderKitUtils.Attributes PASS_THROUGH_ATTRIBUTES0 = attributes(
+ private static final RenderKitUtils.Attributes PASS_THROUGH_ATTRIBUTES = attributes(
lang,
onclick,
ondblclick,
@@ -53,10 +53,21 @@
onmouseover,
onmouseup,
title,
- style,
dir
);
+ protected static String attributeAsStyle(UIComponent comp, Enum attr) {
+ String value = attributeAsString(comp, attr.toString());
+ if (value.isEmpty()) {
+ return "";
+ }
+
+ return new StringBuilder()
+ .append(attr).append(':').append(value).toString();
+ }
+ protected static String attributeAsString(UIComponent comp, Enum attr) {
+ return attributeAsString(comp, attr.toString());
+ }
protected static String attributeAsString(UIComponent comp, String attr) {
Object o = comp.getAttributes().get(attr);
return o == null ? "" : o.toString();
@@ -80,9 +91,18 @@
writer.startElement(HTML.DIV_ELEM, component);
writer.writeAttribute("id", component.getClientId(context), "clientId");
writer.writeAttribute("class", getStyleClass(component), null);
- renderPassThroughAttributes(context, component, PASS_THROUGH_ATTRIBUTES0);
+ writer.writeAttribute(HTML.STYLE_ATTRIBUTE, getStyle(component), null);
+ renderPassThroughAttributes(context, component, getPassThroughAttributes());
}
+ protected String getStyle(UIComponent component) {
+ return attributeAsString(component, "style");
+ }
+
+ protected RenderKitUtils.Attributes getPassThroughAttributes() {
+ return PASS_THROUGH_ATTRIBUTES;
+ }
+
protected String getStyleClass(UIComponent component) {
return attributeAsString(component, "styleClass");
}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-08-20 10:54:21 UTC (rev 18842)
@@ -25,6 +25,16 @@
</property>
<property>
<description></description>
+ <property-name>height</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>width</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
<property-name>bypassUpdates</property-name>
<property-class>boolean</property-class>
</property>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-08-20 10:54:21 UTC (rev 18842)
@@ -338,6 +338,16 @@
</attribute>
<attribute>
<description></description>
+ <name>height</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>width</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
<name>bypassUpdates</name>
<type>boolean</type>
</attribute>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/AccordionItem.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/AccordionItem.js 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/AccordionItem.js 2010-08-20 10:54:21 UTC (rev 18842)
@@ -69,7 +69,10 @@
* @return {jQuery Object}
* */
__content : function () {
- return $(rf.getDomElement(this.id + ":content"));
+ if (!this.__content_) {
+ this.__content_ = $(rf.getDomElement(this.id + ":content"));
+ }
+ return this.__content_;
},
/**
@@ -80,14 +83,15 @@
__enter : function () {
var parentPanel = this.getTogglePanel();
if (parentPanel.isKeepHeight) {
+ this.__content().hide();
var h = parentPanel.getInnerHeight();
var items = parentPanel.getItems();
for (var i = 0; i < items.length; i++) {
- h -= items[i].getHeight();
+ h -= items[i].__header().outerHeight();
}
- this.__content().height(h);
+ this.__content().height(h - 20); // 20 it is padding top and bottom
}
this.__content().show();
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2010-08-20 10:41:27 UTC (rev 18841)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2010-08-20 10:54:21 UTC (rev 18842)
@@ -1,5 +1,5 @@
.rf-ac {
- width: 300px; /*visible width*/
+ /*width: 300px;*/ /*visible width*/
border-width: 1px;
border-style: solid;
border-color: '#{richSkin.panelBorderColor}';
@@ -28,7 +28,7 @@
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: '#{richSkin.panelBorderColor}';
- height: 100px /*visible modal panel height minus header height*/;
+ /*height: 100px*/ /*visible modal panel height minus header height*/;
position: relative;
overflow: auto;
overflow-x: hidden;
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18841 - branches/RF-7939-showcase/src/main/java/org/richfaces/demo/tables.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-08-20 06:41:27 -0400 (Fri, 20 Aug 2010)
New Revision: 18841
Modified:
branches/RF-7939-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java
Log:
https://jira.jboss.org/browse/RF-9019
Modified: branches/RF-7939-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java
===================================================================
--- branches/RF-7939-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java 2010-08-20 10:38:21 UTC (rev 18840)
+++ branches/RF-7939-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java 2010-08-20 10:41:27 UTC (rev 18841)
@@ -1,5 +1,6 @@
package org.richfaces.demo.tables;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -14,7 +15,7 @@
@ManagedBean
@SessionScoped
-public class ExtTableSelectionBean {
+public class ExtTableSelectionBean implements Serializable{
private Collection<Object> selection;
@ManagedProperty(value = "#{carsBean.allInventoryItems}")
private List<InventoryItem> inventoryItems;
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18840 - branches/RF-7939-showcase/src/main/webapp/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-08-20 06:38:21 -0400 (Fri, 20 Aug 2010)
New Revision: 18840
Modified:
branches/RF-7939-showcase/src/main/webapp/templates/main.xhtml
Log:
https://jira.jboss.org/browse/RF-9019
Modified: branches/RF-7939-showcase/src/main/webapp/templates/main.xhtml
===================================================================
--- branches/RF-7939-showcase/src/main/webapp/templates/main.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
+++ branches/RF-7939-showcase/src/main/webapp/templates/main.xhtml 2010-08-20 10:38:21 UTC (rev 18840)
@@ -30,9 +30,9 @@
<h:outputText value=" | "/>
<h:outputLink value="http://community.jboss.org/community/richfaces">RichFaces Community Space</h:outputLink>
<h:outputText value=" | "/>
- <h:outputLink value="http://downloads.jboss.org/richfaces/milestones/4.0.X/4.0.0.ALPHA2/richfa...">Download</h:outputLink>
+ <h:outputLink value="http://jboss.org/richfaces/download/milestones.html">Download</h:outputLink>
<h:outputText value=" | "/>
- <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/root/examples/richfaces-showcase/">Sources</h:outputLink>
+ <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces-showcase/">Sources</h:outputLink>
</td>
</tr>
<tr>
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18839 - in modules/tests/metamer/trunk/application/src/main: webapp/components and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-08-20 06:30:49 -0400 (Fri, 20 Aug 2010)
New Revision: 18839
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml
Log:
https://jira.jboss.org/browse/RF-9035
* created page for rich:inputNumberSlider
* added slider to rich:dataTable, rich:extendedDataTable, rich:subTable and h:dataTable
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-20 09:20:08 UTC (rev 18838)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-08-20 10:30:49 UTC (rev 18839)
@@ -118,6 +118,7 @@
components.put("richExtendedDataTable", "Rich Extended Data Table");
components.put("richFunctions", "Rich Functions");
components.put("richInplaceInput", "Rich Inplace Input");
+ components.put("richInputNumberSlider", "Rich Input Number Slider");
components.put("richJQuery", "Rich jQuery");
components.put("richList", "Rich List");
components.put("richPanel", "Rich Panel");
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-08-20 10:30:49 UTC (rev 18839)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * 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.ViewScoped;
+
+import org.richfaces.component.html.HtmlInputNumberSlider;
+import org.richfaces.tests.metamer.Attributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:inputNumberSlider.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "richInputNumberSliderBean")
+@ViewScoped
+public class RichInputNumberSliderBean implements Serializable {
+
+ private static final long serialVersionUID = 595154649809L;
+ 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(HtmlInputNumberSlider.class, getClass());
+
+ attributes.setAttribute("enableManualInput", true);
+ attributes.setAttribute("inputSize", 3);
+ attributes.setAttribute("maxValue", 100);
+ attributes.setAttribute("minValue", 0);
+ attributes.setAttribute("rendered", true);
+ attributes.setAttribute("showBoundaryValues", true);
+ attributes.setAttribute("showInput", true);
+ attributes.setAttribute("step", 1);
+
+ }
+
+ 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/RichInputNumberSliderBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2010-08-20 09:20:08 UTC (rev 18838)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
@@ -175,7 +175,8 @@
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSlider" />
</f:facet>
- <h:outputText value="#{record.numberOfKids}" />
+ <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"/>
+
<f:facet name="footer">
<h:outputText id="columnFooterNumberOfKids" value="Number of Kids" />
</f:facet>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-08-20 09:20:08 UTC (rev 18838)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
@@ -163,7 +163,8 @@
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSlider" />
</f:facet>
- <h:outputText value="#{record.numberOfKids}" />
+ <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"/>
+
<f:facet name="footer">
<h:outputText id="columnFooterNumberOfKids" value="Number of Kids" />
</f:facet>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-08-20 09:20:08 UTC (rev 18838)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
@@ -163,7 +163,8 @@
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSlider" />
</f:facet>
- <h:outputText value="#{record.numberOfKids}" />
+ <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"/>
+
<f:facet name="footer">
<h:outputText id="columnFooterNumberOfKids" value="Number of Kids" />
</f:facet>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
@@ -0,0 +1,41 @@
+<!--
+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 Input Number Slider</ui:define>
+
+ <ui:define name="links">
+
+ <metamer:testPageLink id="simple" outcome="simple" value="Simple">
+ Page containing <b>rich:inputNumberSlider</b> and input boxes for all its attributes.
+ </metamer:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
@@ -0,0 +1,100 @@
+<!--
+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: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:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html">
+
+ <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">
+ <rich:inputNumberSlider id="slider"
+ accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
+ converter="#{richInputNumberSliderBean.attributes['converter'].value}"
+ converterMessage="#{richInputNumberSliderBean.attributes['converterMessage'].value}"
+ decreaseClass="#{richInputNumberSliderBean.attributes['decreaseClass'].value}"
+ decreaseSelectedClass="#{richInputNumberSliderBean.attributes['decreaseSelectedClass'].value}"
+ delay="#{richInputNumberSliderBean.attributes['delay'].value}"
+ disabled="#{richInputNumberSliderBean.attributes['disabled'].value}"
+ enableManualInput="#{richInputNumberSliderBean.attributes['enableManualInput'].value}"
+ handleClass="#{richInputNumberSliderBean.attributes['handleClass'].value}"
+ handleSelectedClass="#{richInputNumberSliderBean.attributes['handleSelectedClass'].value}"
+ immediate="#{richInputNumberSliderBean.attributes['immediate'].value}"
+ increaseClass="#{richInputNumberSliderBean.attributes['increaseClass'].value}"
+ increaseSelectedClass="#{richInputNumberSliderBean.attributes['increaseSelectedClass'].value}"
+ inputClass="#{richInputNumberSliderBean.attributes['inputClass'].value}"
+ inputPosition="#{richInputNumberSliderBean.attributes['inputPosition'].value}"
+ inputSize="#{richInputNumberSliderBean.attributes['inputSize'].value}"
+ localValue="#{richInputNumberSliderBean.attributes['localValue'].value}"
+ localValueSet="#{richInputNumberSliderBean.attributes['localValueSet'].value}"
+ maxValue="#{richInputNumberSliderBean.attributes['maxValue'].value}"
+ maxlength="#{richInputNumberSliderBean.attributes['maxlength'].value}"
+ minValue="#{richInputNumberSliderBean.attributes['minValue'].value}"
+ rendered="#{richInputNumberSliderBean.attributes['rendered'].value}"
+ required="#{richInputNumberSliderBean.attributes['required'].value}"
+ requiredMessage="#{richInputNumberSliderBean.attributes['requiredMessage'].value}"
+ showArrows="#{richInputNumberSliderBean.attributes['showArrows'].value}"
+ showBoundaryValues="#{richInputNumberSliderBean.attributes['showBoundaryValues'].value}"
+ showInput="#{richInputNumberSliderBean.attributes['showInput'].value}"
+ showToolTip="#{richInputNumberSliderBean.attributes['showToolTip'].value}"
+ step="#{richInputNumberSliderBean.attributes['step'].value}"
+ style="#{richInputNumberSliderBean.attributes['style'].value}"
+ styleClass="#{richInputNumberSliderBean.attributes['styleClass'].value}"
+ submittedValue="#{richInputNumberSliderBean.attributes['submittedValue'].value}"
+ tabindex="#{richInputNumberSliderBean.attributes['tabindex'].value}"
+ toolTipClass="#{richInputNumberSliderBean.attributes['toolTipClass'].value}"
+ trackClass="#{richInputNumberSliderBean.attributes['trackClass'].value}"
+ valid="#{richInputNumberSliderBean.attributes['valid'].value}"
+ validator="#{richInputNumberSliderBean.attributes['validator'].value}"
+ validatorMessage="#{richInputNumberSliderBean.attributes['validatorMessage'].value}"
+ validators="#{richInputNumberSliderBean.attributes['validators'].value}"
+ value="#{richInputNumberSliderBean.attributes['value'].value}"
+ valueChangeListener="#{richInputNumberSliderBean.attributes['valueChangeListener'].value}"
+ valueChangeListeners="#{richInputNumberSliderBean.attributes['valueChangeListeners'].value}">
+ <ui:remove>
+ <a4j:ajax id="sliderAjax" render="output"/>
+ </ui:remove>c
+ </rich:inputNumberSlider>
+
+ <br/><br/>
+
+ output: <h:outputText id="output" value="#{richInputNumberSliderBean.attributes['value'].value}"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richInputNumberSliderBean.attributes}" id="attributes" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml 2010-08-20 09:20:08 UTC (rev 18838)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml 2010-08-20 10:30:49 UTC (rev 18839)
@@ -134,7 +134,7 @@
</ul>
</rich:column>
<rich:column>
- <h:outputText value="#{item.numberOfKids}" />
+ <rich:inputNumberSlider id="numOfKidsSlider" value="#{item.numberOfKids}" maxValue="5"/>
</rich:column>
<f:facet name="footer">
<h:outputText value="Total of #{list[0].sex == 'MALE' ? 'men' : 'women'}: #{list.size()}" />
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18838 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-20 05:20:08 -0400 (Fri, 20 Aug 2010)
New Revision: 18838
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
Log:
Updated skinning for inputNumberSlider
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-08-20 06:20:00 UTC (rev 18837)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-08-20 09:20:08 UTC (rev 18838)
@@ -33,9 +33,9 @@
}
.rf-ins-mn, .rf-ins-mx, input.rf-ins-i, .rf-ins-tt {
- font-size: 11px;
- font-family: arial;
- color: #000000;
+ font-size: '#{richSkin.generalSizeFont}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.generalTextColor}';
}
.rf-ins-mn, .rf-ins-mx {
@@ -44,13 +44,17 @@
}
.rf-ins-mn {
- border-left: 1px solid #c0c0c0;
+ border-left-width: 1px;
+ border-left-style: solid;
+ border-left-color: '#{richSkin.panelBorderColor}';
padding-left: 3px;
float: left;
}
.rf-ins-mx {
- border-right: 1px solid #c0c0c0;
+ border-right-width: 1px;
+ border-right-style: solid;
+ border-right-color: '#{richSkin.panelBorderColor}';
padding-right: 3px;
float: right;
text-align: right;
@@ -62,8 +66,11 @@
}
input.rf-ins-i {
- background: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}") top repeat-x #fff;
- border: 1px inset #C0C0C0;
+ background: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}") top repeat-x;
+ background-color: '#{richSkin.controlBackgroundColor}';
+ border-width: 1px;
+ border-style: inset;
+ border-color: '#{richSkin.panelBorderColor}';
margin: 0px 10px 0px 10px;
vertical-align: bottom;
}
@@ -77,8 +84,11 @@
}
.rf-ins-t {
- background: url("#{resource['org.richfaces.renderkit.html.images.SliderTrackGradient']}") 1px 1px repeat-x #FFFFFF;
- border: 1px solid #C0C0C0;
+ background: url("#{resource['org.richfaces.renderkit.html.images.SliderTrackGradient']}") 1px 1px repeat-x;
+ background-color: '#{richSkin.controlBackgroundColor}';
+ border-width: 1px;
+ border-style: solid;
+ border-color: '#{richSkin.panelBorderColor}';
display: block;
height: 6px;
clear: both;
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18837 - modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-08-20 02:20:00 -0400 (Fri, 20 Aug 2010)
New Revision: 18837
Modified:
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Book_Info.xml
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Component_Reference.ent
Log:
Possible fix for locale issue RF-8903
Modified: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Book_Info.xml
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Book_Info.xml 2010-08-20 06:08:40 UTC (rev 18836)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Book_Info.xml 2010-08-20 06:20:00 UTC (rev 18837)
@@ -3,7 +3,7 @@
]>
<bookinfo id="book-Component_Reference-Component_Reference">
<title>Component Reference</title>
- <subtitle>A reference guide to the components of the RichFaces &VERSIONLONG;<remark> (draft)</remark>
+ <subtitle>A reference guide to the components of the RichFaces 4<remark> (draft)</remark>
framework</subtitle>
<productname>RichFaces</productname>
<productnumber>4.0</productnumber>
@@ -11,7 +11,7 @@
<pubsnumber>1</pubsnumber>
<abstract>
<para>
- This book details each component in the RichFaces &VERSION; framework, including examples of their use in applications.
+ This book details each component in the RichFaces 4 framework, including examples of their use in applications.
</para>
</abstract>
<corpauthor>
@@ -28,8 +28,12 @@
<year>&YEAR;</year>
<holder>&HOLDER;</holder>
</copyright>
- <!-- FOR PUBLICAN --><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><!-- FOR JDOCBOOK: --><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="fallback_content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </xi:fallback>
+ <!-- FOR PUBLICAN -->
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <!-- FOR JDOCBOOK -->
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="fallback_content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
</xi:include>
<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</bookinfo>
Modified: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Component_Reference.ent
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Component_Reference.ent 2010-08-20 06:08:40 UTC (rev 18836)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/Component_Reference.ent 2010-08-20 06:20:00 UTC (rev 18837)
@@ -1,6 +1,5 @@
<!ENTITY PRODUCT "RichFaces">
<!ENTITY VERSION "4.0">
-<!ENTITY VERSIONLONG "4.0.0.ALPHA2">
<!ENTITY BOOKID "Component_Reference">
<!ENTITY HOLDER "Red Hat">
<!ENTITY YEAR "2009">
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18836 - in modules/docs/branches/draft: Component_Reference/src/main/docbook/en-US/extras and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-08-20 02:08:40 -0400 (Fri, 20 Aug 2010)
New Revision: 18836
Added:
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richautocomplete-richautocomplete.png
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richtabPanel-richtabPanel_component.png
Removed:
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richcomboBox-Defining_suggestion_values.xml_sample
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richcomboBox-richcomboBox.png
Modified:
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtoggleControl-richtoggleControl_example.xml_sample
modules/docs/branches/draft/parent/pom.xml
Log:
Revised rich inputs and panels according to tech review
Modified: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2010-08-20 00:30:13 UTC (rev 18835)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2010-08-20 06:08:40 UTC (rev 18836)
@@ -21,14 +21,14 @@
The <sgmltag><rich:accordion></sgmltag> is a series of panels stacked on top of each other, each collapsed such that only the header of the panel is showing. When the header of a panel is clicked, it is expanded to show the content of the panel. Clicking on a different header will collapse the previous panel and epand the selected one. Each panel contained in a <sgmltag><rich:accordion></sgmltag> component is a <sgmltag><rich:accordionItem></sgmltag> component.
</para>
<figure id="figu-Component_Reference-richaccordion-richaccordion">
- <title><sgmltag><rich:accordion></sgmltag></title>
+ <title>A <sgmltag><rich:accordion></sgmltag> component containing three <sgmltag><rich:accordionItem></sgmltag> components</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/figu-Component_Reference-richaccordion-richaccordion.png" format="PNG" />
</imageobject>
<textobject>
<para>
- A <sgmltag><rich:accordion></sgmltag> component displaying details on different cameras. Only the first panel is expanded.
+ A <sgmltag><rich:accordion></sgmltag> component containing three <sgmltag><rich:accordionItem></sgmltag> components. Only the first panel is expanded.
</para>
</textobject>
</mediaobject>
@@ -46,23 +46,32 @@
<para>
The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values:
</para>
- <itemizedlist>
- <listitem>
- <para>
- <literal>server</literal>, the default setting, which causes the <sgmltag><rich:accordionItem></sgmltag> components to perform a common submission, completely re-rendering the page. Only one panel at a time is uploaded to the client side.
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ajax</literal>, which causes the <sgmltag><rich:accordionItem></sgmltag> components to perform an Ajax form submission, and the content of the panel is rendered. Only one panel at a time is uploaded to the client side.
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>client</literal>, which causes the <sgmltag><rich:accordionItem></sgmltag> components to update on the client side. JavaScript changes the styles such that one <sgmltag><rich:accordionItem></sgmltag> component becomes hidden while the other is shown.
- </para>
- </listitem>
- </itemizedlist>
+ <variablelist>
+ <varlistentry>
+ <term><literal>server</literal></term>
+ <listitem>
+ <para>
+ The default setting. Activation of a <sgmltag><rich:accordionItem></sgmltag> component causes the parent <sgmltag><rich:accordion></sgmltag> component to perform a common submission, completely re-rendering the page. Only one panel at a time is uploaded to the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>ajax</literal></term>
+ <listitem>
+ <para>
+ Activation of a <sgmltag><rich:accordionItem></sgmltag> component causes the parent <sgmltag><rich:accordion></sgmltag> component to perform an Ajax form submission, and the content of the panel is rendered. Only one panel at a time is uploaded to the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>client</literal></term>
+ <listitem>
+ <para>
+ Activation of a <sgmltag><rich:accordionItem></sgmltag> component causes the parent <sgmltag><rich:accordion></sgmltag> component to update on the client side. JavaScript changes the styles such that one panel component becomes hidden while the other is shown.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
<!-- TODO
@@ -74,10 +83,10 @@
</section>
-->
- <section id="sect-Component_Reference-richaccordion-richaccordion_events">
- <title><sgmltag><rich:accordion></sgmltag> events</title>
+ <section id="sect-Component_Reference-richaccordion-richaccordion_client-side_events">
+ <title><sgmltag><rich:accordion></sgmltag> client-side events</title>
<para>
- The <sgmltag><rich:accordion></sgmltag> component uses the common events for all switchable panels:
+ In addition to the standard Ajax events and HTML events, the <sgmltag><rich:accordion></sgmltag> component uses the client-side events common to all switchable panels:
</para>
<itemizedlist>
<listitem>
@@ -93,6 +102,20 @@
</itemizedlist>
</section>
+ <section id="sect-Component_Reference-richaccordion-richaccordion_server-side_events">
+ <title><sgmltag><rich:accordion></sgmltag> server-side events</title>
+ <para>
+ The <sgmltag><rich:accordion></sgmltag> component uses the server-side events common to all switchable panels:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The <varname>ItemChangeEvent</varname> event occurs on the server side when an item is changed through Ajax using the <literal>server</literal> mode. It can be processed using the <varname>ItemChangeListener</varname> attribute.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
<section id="sect-Component_Reference-richaccordion-Reference_data">
<title>Reference data</title>
<itemizedlist>
@@ -131,12 +154,35 @@
<para>
The <sgmltag><rich:accordionItem></sgmltag> component is a panel for use with the <sgmltag><rich:accordion></sgmltag> component. Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richaccordion" /> for details on the <sgmltag><rich:accordion></sgmltag> component.
</para>
+ <figure id="figu-Component_Reference-richaccordionItem-richaccordion">
+ <title>A <sgmltag><rich:accordion></sgmltag> component containing three <sgmltag><rich:accordionItem></sgmltag> components</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richaccordion-richaccordion.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ A <sgmltag><rich:accordion></sgmltag> component containing three <sgmltag><rich:accordionItem></sgmltag> components. Only the first panel is expanded.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
- <section id="sect-Component_Reference-richaccordionItem-richaccordionItem_events">
- <title><sgmltag><rich:accordionItem></sgmltag> events</title>
+ <section id="sect-Component_Reference-richaccordionItem-Basic_usage">
+ <title>Basic usage</title>
<para>
- The <sgmltag><rich:accordionItem></sgmltag> component uses the common events for all switchable panel items:
+ Basic usage of the <sgmltag><rich:accordionItem></sgmltag> component requires the <varname>label</varname> attribute, which provides the text on the panel header. The panel header is all that is visible when the accordion item is collapsed.
</para>
+ <para>
+ Alternatively the <literal>header</literal> facet could be used in place of the <varname>label</varname> attribute. This would allow for additional styles and custom content to be applied to the tab.
+ </para>
+ </section>
+
+ <section id="sect-Component_Reference-richaccordionItem-richaccordionItem_client-side_events">
+ <title><sgmltag><rich:accordionItem></sgmltag> client-side events</title>
+ <para>
+ In addition to the standard HTML events, the <sgmltag><rich:accordionItem></sgmltag> component uses the client-side events common to all switchable panel items:
+ </para>
<itemizedlist>
<listitem>
<para>
@@ -290,7 +336,7 @@
If <code>show="true"</code> then the pop-up panel will display when the page is first loaded.
</para>
<para>
- The <sgmltag><rich:popupPanel></sgmltag> component can be shown and hidden manually through two different methods:
+ The <sgmltag><rich:popupPanel></sgmltag> component can be shown and hidden manually using the <code>show()</code> and <code>hide()</code> methods from the JavaScript API. These can be implemented using two different approaches:
</para>
<itemizedlist>
<listitem>
@@ -332,13 +378,16 @@
<section id="sect-Component_Reference-richpopupPanel-Size_and_positioning">
<title>Size and positioning</title>
<para>
- The pop-up panel can be both re-sized and re-positioned by the user. The minimum possible size for the panel can be set with the <varname>minWith</varname> and <varname>minHeight</varname> attributes. These abilities can be deactivated by setting <code>resizable</code> or <code>movable</code> to <literal>false</literal> as necessary. The state of the modal panel, including size and position on screen, can be maintained and restored after submitting and reloading by setting <code>keepVisualState="true"</code>.
+ The pop-up panel can be both re-sized and re-positioned by the user. The minimum possible size for the panel can be set with the <varname>minWith</varname> and <varname>minHeight</varname> attributes. These abilities can be deactivated by setting <code>resizable</code> or <code>movable</code> to <literal>false</literal> as necessary.
+ <!--
+ The state of the modal panel, including size and position on screen, can be maintained and restored after submitting and reloading by setting <code>keepVisualState="true"</code>.
+ -->
</para>
<para>
The pop-up panel can be automatically sized when it is shown if the <varname>autosized</varname> attribute is set to <literal>true</literal>.
</para>
<para>
- The <sgmltag><rich:popupPanel></sgmltag> component is usually rendered in front of any other objects on the page. This is achieved by attaching the component to the <sgmltag><body></sgmltag> element of the page, and setting a very high <emphasis>"z-index"</emphasis> (the stack order of the object). However, this may produce unwanted behavior in sufficiently complex layouts, such as those with multiple pop-up panels. To avoid this, the <sgmltag><rich:popupPanel></sgmltag> component can be reattached to its original <acronym>DOM</acronym> element by setting <varname>domElementAttachment</varname> to either <literal>parent</literal> or <literal>form</literal>.
+ The <sgmltag><rich:popupPanel></sgmltag> component is usually rendered in front of any other objects on the page. This is achieved by attaching the component to the <sgmltag><body></sgmltag> element of the page, and setting a very high <emphasis>"z-index"</emphasis> (the stack order of the object). This approach is taken because relatively-positioned elements could still overlap the pop-up panel if they exist at higher levels of the <acronym>DOM</acronym> hierarchy, even if their z-index is less than the <sgmltag><rich:popupPanel></sgmltag> component. However, to avoid form limitation of the pop-up panel on pages where no such elements exist, the <sgmltag><rich:popupPanel></sgmltag> component can be reattached to its original <acronym>DOM</acronym> element by setting <varname>domElementAttachment</varname> to either <literal>parent</literal> or <literal>form</literal>.
</para>
<para>
Embedded objects inserted into the <acronym>HTML</acronym> with the <sgmltag><embed></sgmltag> tag will typically be rendered in front of a <sgmltag><rich:popupPanel></sgmltag> component. The <sgmltag><rich:popupPanel></sgmltag> component can be forcibly rendered in front of these objects by setting <code><varname>overlapEmbedObjects</varname>="true"</code>.
@@ -357,7 +406,7 @@
The <sgmltag><rich:popupPanel></sgmltag> component can contain any other rich component just like a normal panel.
</para>
<para>
- If the contents of the <sgmltag><rich:popupPanel></sgmltag> component extend beyond the borders of the pop-up panel, they will be trimmed. However, the <sgmltag><rich:popupPanel></sgmltag> component will expand to accommodate the contents if the <varname>trimOverlayedElements</varname> attribute is set to <literal>false</literal>.
+ Contents of the <sgmltag><rich:popupPanel></sgmltag> component which are positioned relatively may be trimmed if they extend beyond the borders of the pop-up panel. For certain in-line controls this behavior may be preferable, but for other dynamic controls it could be undesirable. If the <varname>trimOverlayedElements</varname> attribute is set to <literal>false</literal> then child components will not be trimmed if they extend beyond the borders of the pop-up panel.
</para>
</section>
@@ -465,6 +514,20 @@
The <sgmltag><rich:tab></sgmltag> component represents an individual tab inside a <sgmltag><rich:tabPanel></sgmltag> component, including the tab's content. Clicking on the tab header will bring its corresponding content to the front of other tabs. Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtabPanel" /> for details on the <sgmltag><rich:tabPanel></sgmltag> component.
</para>
+ <figure id="figu-Component_Reference-richtab-richtabPanel_component">
+ <title>A <sgmltag><rich:tabPanel></sgmltag> component containing three <sgmltag><rich:tab></sgmltag> components</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richtabPanel-richtabPanel_component.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ A <sgmltag><rich:tabPanel></sgmltag> component containing three <sgmltag><rich:tab></sgmltag> components.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
<section id="sect-Component_Reference-richtab-Basic_usage">
<title>Basic usage</title>
<para>
@@ -485,10 +548,10 @@
</para>
</section>
- <section id="sect-Component_Reference-richtab-richtab_events">
- <title><sgmltag><rich:tab></sgmltag> events</title>
+ <section id="sect-Component_Reference-richtab-richtab_client-side_events">
+ <title><sgmltag><rich:tab></sgmltag> client-side events</title>
<para>
- The <sgmltag><rich:tab></sgmltag> component uses the common events for all switchable panel items:
+ In addition to the standard HTML events, the <sgmltag><rich:tab></sgmltag> component uses the client-side events common to all switchable panel items:
</para>
<itemizedlist>
<listitem>
@@ -542,35 +605,60 @@
<para>
The <sgmltag><rich:tabPanel></sgmltag> component provides a set of tabbed panels for displaying one panel of content at a time. The tabs can be highly customized and themed. Each tab within a <sgmltag><rich:tabPanel></sgmltag> container is a <sgmltag><rich:tab></sgmltag> component. Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtab" /> for further details on the <sgmltag><rich:tab></sgmltag> component.
</para>
+ <figure id="figu-Component_Reference-richtabPanel-richtabPanel_component">
+ <title>A <sgmltag><rich:tabPanel></sgmltag> component containing three <sgmltag><rich:tab></sgmltag> components</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richtabPanel-richtabPanel_component.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ A <sgmltag><rich:tabPanel></sgmltag> component containing three <sgmltag><rich:tab></sgmltag> components.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
<note>
- <title><sgmltag><a4j:form></sgmltag> elements required</title>
+ <title>Form elements required</title>
<para>
- All <sgmltag><rich:tabPanel></sgmltag> components should be wrapped in an <sgmltag><a4j:form></sgmltag> element so that content is correctly submitted. Alternatively, each <sgmltag><rich:tab></sgmltag> component within the <sgmltag><rich:tabPanel></sgmltag> component should be wrapped in an <sgmltag><a4j:form></sgmltag> element.
+ All <sgmltag><rich:tabPanel></sgmltag> components should be wrapped in a form element so that the contents of the tab are processed correctly during a tab change in either <literal>ajax</literal> or <literal>server</literal> mode.
</para>
+ <para>
+ Alternatively, the contents of a <sgmltag><rich:tab></sgmltag> component within the <sgmltag><rich:tabPanel></sgmltag> component could be wrapped in a form element, such that they will be processed using the inner submitting component only. In this case, the <sgmltag><rich:tabPanel></sgmltag> component will automatically add form tags around the tab's contents, and the contents will not be processed during switching.
+ </para>
</note>
<section id="sect-Component_Reference-richtabPanel-Switching_tabs">
- <title>Switching tabs</title>
+ <title>Switching panels</title>
<para>
The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values:
</para>
- <itemizedlist>
- <listitem>
- <para>
- <literal>server</literal>, the default setting, which causes the <sgmltag><rich:tabPanel></sgmltag> component to perform a common submission, completely re-rendering the page. Only one panel at a time is uploaded to the client side.
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ajax</literal>, which causes the <sgmltag><rich:tabPanel></sgmltag> component to perform an Ajax form submission, and the content of the panel is rendered. Only one panel at a time is uploaded to the client side.
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>client</literal>, which causes <sgmltag><rich:tabPanel></sgmltag> components to update on the client side. JavaScript changes the styles such that one panel becomes hidden while the other is shown.
- </para>
- </listitem>
- </itemizedlist>
+ <variablelist>
+ <varlistentry>
+ <term><literal>server</literal></term>
+ <listitem>
+ <para>
+ The default setting. Activation of a <sgmltag><rich:tab></sgmltag> component causes the parent <sgmltag><rich:tabPanel></sgmltag> component to perform a common submission, completely re-rendering the page. Only one tab at a time is uploaded to the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>ajax</literal></term>
+ <listitem>
+ <para>
+ Activation of a <sgmltag><rich:tab></sgmltag> component causes the parent <sgmltag><rich:tabPanel></sgmltag> component to perform an Ajax form submission, and the content of the tab is rendered. Only one tab at a time is uploaded to the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>client</literal></term>
+ <listitem>
+ <para>
+ Activation of a <sgmltag><rich:tab></sgmltag> component causes the parent <sgmltag><rich:tabPanel></sgmltag> component to update on the client side. JavaScript changes the styles such that one tab becomes hidden while the other is shown.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
The <code>activeItem</code> attribute holds the active tab name.
</para>
@@ -662,10 +750,10 @@
</variablelist>
</section>
- <section id="sect-Component_Reference-richtabPanel-richtabPanel_events">
- <title><sgmltag><rich:tabPanel></sgmltag> events</title>
+ <section id="sect-Component_Reference-richtabPanel-richtabPanel_client-side_events">
+ <title><sgmltag><rich:tabPanel></sgmltag> client-side events</title>
<para>
- The <sgmltag><rich:tabPanel></sgmltag> component uses the common events for all switchable panels:
+ In addition to the standard Ajax events and HTML events, the <sgmltag><rich:tabPanel></sgmltag> component uses the client-side events common to all switchable panels:
</para>
<itemizedlist>
<listitem>
@@ -681,6 +769,20 @@
</itemizedlist>
</section>
+ <section id="sect-Component_Reference-richtabPanel-richtabPanel_server-side_events">
+ <title><sgmltag><rich:tabPanel></sgmltag> server-side events</title>
+ <para>
+ The <sgmltag><rich:tabPanel></sgmltag> component uses the server-side events common to all switchable panels:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The <varname>ItemChangeEvent</varname> event occurs on the server side when an item is changed through Ajax using the <literal>server</literal> mode. It can be processed using the <varname>ItemChangeListener</varname> attribute.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
<section id="sect-Component_Reference-richtabPanel-Reference_data">
<title>Reference data</title>
<itemizedlist>
@@ -717,24 +819,27 @@
<section id="sect-Component_Reference-Panels_and_containers-richtoggleControl">
<title><sgmltag><rich:toggleControl></sgmltag></title>
<para>
- The <sgmltag><rich:toggleControl></sgmltag> behavior can be attached to any interface component. It works with a <sgmltag><rich:toggleLayout></sgmltag> component to switch between different <sgmltag><rich:togglePanel></sgmltag> components.
+ The <sgmltag><rich:toggleControl></sgmltag> behavior can be attached to any interface component. It works with a <sgmltag><rich:togglePanel></sgmltag> component to switch between different <sgmltag><rich:togglePanelItem></sgmltag> components.
</para>
<para>
- Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtogglePanel" /> and <xref linkend="sect-Component_Reference-Panels_and_containers-richtoggleLayout" /> for details on how to use the components together.
+ Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtogglePanel" /> and <xref linkend="sect-Component_Reference-Panels_and_containers-richtogglePanelItem" /> for details on how to use the components together.
</para>
<section id="sect-Component_Reference-richtoggleControl-Basic_usage">
<title>Basic usage</title>
<para>
- The <sgmltag><rich:toggleControl></sgmltag> can be used to cycle through <sgmltag><rich:togglePanel></sgmltag> components in a <sgmltag><rich:toggleLayout></sgmltag> container, or to switch directly to a named <sgmltag><rich:togglePanel></sgmltag>.
+ The <sgmltag><rich:toggleControl></sgmltag> can be used to switch through <sgmltag><rich:togglePanelItem></sgmltag> components in a <sgmltag><rich:togglePanel></sgmltag> container. If the <sgmltag><rich:toggleControl></sgmltag> component is positioned inside a <sgmltag><rich:togglePanel></sgmltag> component, no attributes need to be defined, as the control is assumed to switch through the <sgmltag><rich:togglePanelItem></sgmltag> components of its parent.
</para>
<para>
- Cycling through components requires the <varname>for</varname> attribute, which points to the <varname>id</varname> identifier of the <sgmltag><rich:toggleLayout></sgmltag> that it controls.
+ A <sgmltag><rich:toggleControl></sgmltag> component can be located outside the <sgmltag><rich:togglePanel></sgmltag> component it needs to switch. Where this is the case, the <sgmltag><rich:togglePanel></sgmltag> is identified using the <varname>activePanel</varname> attribute. the Cycling through components requires the <varname>for</varname> attribute, which points to the <varname>id</varname> identifier of the <sgmltag><rich:togglePanel></sgmltag> that it controls.
</para>
+ </section>
+
+ <section id="sect-Component_Reference-richtoggleControl-Specifying_the_next_state">
+ <title>Specifying the next state</title>
<para>
- A specific <sgmltag><rich:togglePanel></sgmltag> can be activated through a <sgmltag><rich:toggleControl></sgmltag> component with the <varname>targetItem</varname> attribute. The <varname>targetItem</varname> attribute points to the <varname>id</varname> identifier of the <sgmltag><rich:togglePanel></sgmltag> to display.
+ The <sgmltag><rich:toggleControl></sgmltag> component will cycle through <sgmltag><rich:togglePanelItem></sgmltag> components in the order they are defined within the view. However, the next item to switch to can be explicitly defined by including a <sgmltag><rich:toggleControl></sgmltag> component within a <sgmltag><rich:togglePanelItem></sgmltag> and using the <varname>targetItem</varname> attribute. The <varname>targetItem</varname> attribute points to the <sgmltag><rich:togglePanelItem></sgmltag> to switch to when the state is next changed. <xref linkend="exam-Component_Reference-richtoggleControl-richtoggleControl_example" /> demonstrates how to specify the next switchable state in this way.
</para>
-
<example id="exam-Component_Reference-richtoggleControl-richtoggleControl_example">
<title><sgmltag><rich:toggleControl></sgmltag> example</title>
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richtoggleControl-richtoggleControl_example.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -773,27 +878,30 @@
</section>
</section>
- <!--<rich:toggleLayout>-->
- <section id="sect-Component_Reference-Panels_and_containers-richtoggleLayout">
- <title><sgmltag><rich:toggleLayout></sgmltag></title>
+ <!--<rich:togglePanel>-->
+ <section id="sect-Component_Reference-Panels_and_containers-richtogglePanel">
+ <title><sgmltag><rich:togglePanel></sgmltag></title>
<para>
- The <sgmltag><rich:toggleLayout></sgmltag> component is a wrapper for multiple <sgmltag><rich:togglePanel></sgmltag> components. Each child component is displayed after being activated with the <sgmltag><rich:toggleControl></sgmltag> behavior.
+ The <sgmltag><rich:togglePanel></sgmltag> component is a wrapper for multiple <sgmltag><rich:togglePanelItem></sgmltag> components. Each child component is displayed after being activated with the <sgmltag><rich:toggleControl></sgmltag> behavior.
</para>
<para>
Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtoggleControl" /> and <xref linkend="sect-Component_Reference-Panels_and_containers-richtogglePanel" /> for details on how to use the components together.
</para>
+ <para>
+ The <sgmltag><rich:togglePanel></sgmltag> component is used as a base for the other switchable components, the <sgmltag><rich:accordion></sgmltag> component and the <sgmltag><rich:tabPanel></sgmltag> component. It provides an abstract switchable component without any associated markup. As such, the <sgmltag><rich:togglePanel></sgmltag> component could be customized to provide a switchable component when neither an accordion component or a tab panel component is appropriate.
+ </para>
- <section id="sect-Component_Reference-richtoggleLayout-Basic_usage">
+ <section id="sect-Component_Reference-richtogglePanel-Basic_usage">
<title>Basic usage</title>
<para>
- The initial state of the component can be configured using the <varname>activeItem</varname> attribute, which points to a facet name to display. Alternatively, if no <varname>activeItem</varname> attribute is defined, the initial state will be blank until the user selects an option.
+ The initial state of the component can be configured using the <varname>activeItem</varname> attribute, which points to a child component to display. Alternatively, if no <varname>activeItem</varname> attribute is defined, the initial state will be blank until the user activates a child component using the <sgmltag><rich:toggleControl></sgmltag> component.
</para>
<para>
- The child components are shown in the order in which they are defined in the <acronym>XHTML</acronym> code.
+ The child components are shown in the order in which they are defined in the view.
</para>
</section>
- <section id="sect-Component_Reference-richtoggleLayout-Toggling_between_panels">
+ <section id="sect-Component_Reference-richtogglePanel-Toggling_between_panels">
<title>Toggling between components</title>
<para>
The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values:
@@ -817,74 +925,107 @@
</itemizedlist>
</section>
- <section id="sect-Component_Reference-richtoggleLayout-Reference_data">
+ <section id="sect-Component_Reference-richtogglePanel-Switching_panels">
+ <title>Switching panels</title>
+ <para>
+ The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>server</literal></term>
+ <listitem>
+ <para>
+ The default setting. Activation of a child component causes the parent <sgmltag><rich:togglePanel></sgmltag> component to perform a common submission, completely re-rendering the page. Only one child at a time is uploaded to the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>ajax</literal></term>
+ <listitem>
+ <para>
+ Activation of a child component causes the parent <sgmltag><rich:togglePanel></sgmltag> component to perform an Ajax form submission, and the content of the child is rendered. Only one child at a time is uploaded to the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>client</literal></term>
+ <listitem>
+ <para>
+ Activation of a child component causes the parent <sgmltag><rich:togglePanel></sgmltag> component to update on the client side. JavaScript changes the styles such that one child component becomes hidden while the other is shown.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
+
+ <section id="sect-Component_Reference-richtogglePanel-Reference_data">
<title>Reference data</title>
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.ToggleLayout</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.TogglePanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlToggleLayout</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ToggleLayout</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.TogglePanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.ToggleLayoutRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TogglePanelRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ToggleLayoutTag</classname>
+ <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelTag</classname>
</para>
</listitem>
</itemizedlist>
</section>
</section>
- <!--<rich:togglePanel>-->
- <section id="sect-Component_Reference-Panels_and_containers-richtogglePanel">
- <title><sgmltag><rich:togglePanel></sgmltag></title>
+ <!--<rich:togglePanelItem>-->
+ <section id="sect-Component_Reference-Panels_and_containers-richtogglePanelItem">
+ <title><sgmltag><rich:togglePanelItem></sgmltag></title>
<para>
- The <sgmltag><rich:togglePanel></sgmltag> component is a switchable panel for use with the <sgmltag><rich:toggleLayout></sgmltag> component. Switching between <sgmltag><rich:togglePanel></sgmltag> components is handled by the <sgmltag><rich:toggleControl></sgmltag> behavior.
+ The <sgmltag><rich:togglePanelItem></sgmltag> component is a switchable panel for use with the <sgmltag><rich:togglePanel></sgmltag> component. Switching between <sgmltag><rich:togglePanelItem></sgmltag> components is handled by the <sgmltag><rich:toggleControl></sgmltag> behavior.
</para>
<para>
- Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtoggleControl" /> and <xref linkend="sect-Component_Reference-Panels_and_containers-richtoggleLayout" /> for details on how to use the components together.
+ Refer to <xref linkend="sect-Component_Reference-Panels_and_containers-richtoggleControl" /> and <xref linkend="sect-Component_Reference-Panels_and_containers-richtogglePanel" /> for details on how to use the components together.
</para>
- <section id="sect-Component_Reference-richtogglePanel-Reference_data">
+ <section id="sect-Component_Reference-richtogglePanelItem-Reference_data">
<title>Reference data</title>
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.TogglePanel</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.TogglePanelItem</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanel</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanelItem</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.TogglePanel</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.TogglePanelItem</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.TogglePanelRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TogglePanelItemRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelTag</classname>
+ <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelItemTag</classname>
</para>
</listitem>
</itemizedlist>
Modified: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-08-20 00:30:13 UTC (rev 18835)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-08-20 06:08:40 UTC (rev 18836)
@@ -116,70 +116,70 @@
</section>
-->
- <!--<rich:comboBox>-->
- <section id="sect-Component_Reference-Rich_inputs-richcomboBox">
- <title><sgmltag><rich:comboBox></sgmltag></title>
+ <!--<rich:autocomplete>-->
+ <section id="sect-Component_Reference-Rich_inputs-richautocomplete">
+ <title><sgmltag><rich:autocomplete></sgmltag></title>
<para>
- The <sgmltag><rich:comboBox></sgmltag> component is an auto-completing combo-box with built-in Ajax capabilities. It supports client-side suggestions, browser-like selection, Seam entity converter support, and customization of the look and feel.
+ The <sgmltag><rich:autocomplete></sgmltag> component is an auto-completing input-box with built-in Ajax capabilities. It supports client-side suggestions, browser-like selection, and customization of the look and feel.
</para>
- <figure id="figu-Component_Reference-richcomboBox-richcomboBox">
- <title><sgmltag><rich:comboBox></sgmltag></title>
+ <figure id="figu-Component_Reference-richautocomplete-richautocomplete">
+ <title><sgmltag><rich:autocomplete></sgmltag></title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/figu-Component_Reference-richcomboBox-richcomboBox.png" format="PNG" />
+ <imagedata fileref="images/figu-Component_Reference-richautocomplete-richautocomplete.png" format="PNG" />
</imageobject>
<textobject>
<para>
- A <sgmltag><rich:comboBox></sgmltag> component. The letter <wordasword>A</wordasword> has been entered, such that the suggestion list only shows those options beginning with <wordasword>A</wordasword>.
+ A <sgmltag><rich:autocomplete></sgmltag> component. The letter <wordasword>A</wordasword> has been entered, such that the suggestion list only shows those options beginning with <wordasword>A</wordasword>.
</para>
</textobject>
</mediaobject>
</figure>
- <section id="sect-Component_Reference-richcomboBox-Basic_usage">
+ <section id="sect-Component_Reference-richautocomplete-Basic_usage">
<title>Basic usage</title>
<para>
- The <varname>value</varname> attribute stores the selected value for the combo-box. Suggestions shown in the drop-down list for the combo-box can be specified in one of two ways:
+ The <varname>value</varname> attribute stores the text entered by the user for the auto-complete box. Suggestions shown in the auto-complete list can be specified using the <varname>autocompleteList</varname> attribute, which points to a collection of suggestions:
</para>
+ <example id="exam-Component_Reference-richautocomplete-Defining_suggestion_values">
+ <title>Defining suggestion values</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ </example>
+ <!--
<itemizedlist>
<listitem>
<para>
- Using the <varname>suggestionValues</varname> attribute, and defining a collection of suggestions:
- </para>
- <example id="exam-Component_Reference-richcomboBox-Defining_suggestion_values">
- <title>Defining suggestion values</title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomboBox-Defining_suggestion_values.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- </example>
- </listitem>
- <listitem>
- <para>
Using the JSF components <sgmltag><f:selectItem></sgmltag> and <sgmltag><f:selectItems></sgmltag> to define a list of items:
</para>
- <example id="exam-Component_Reference-richcomboBox-Defining_list_items_for_richinplaceSelect">
+ <example id="exam-Component_Reference-richautocomplete-Defining_list_items_for_richinplaceSelect">
<title>Defining list items for <sgmltag><rich:inplaceSelect></sgmltag></title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomboBox-Defining_list_items_for_richinplaceSelect.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richautocomplete-Defining_list_items_for_richinplaceSelect.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
</listitem>
</itemizedlist>
+ -->
</section>
- <section id="sect-Component_Reference-richcomboBox-Interactivity_options">
+ <section id="sect-Component_Reference-richautocomplete-Interactivity_options">
<title>Interactivity options</title>
+ <!-- TODO
<para>
The input box can display an instructional label before text is entered. This can be set through the <varname>defaultLabel</varname> attribute.
</para>
+ -->
<para>
- Users can type into the combo-box's text field to enter a value, which also searches through the suggestion items in the drop-down box. By default, the first suggestion item is selected as the user types. This behavior can be deactivated by setting <code><varname>selectFirstOnUpdate</varname>="false"</code>.
+ Users can type into the combo-box's text field to enter a value, which also searches through the suggestion items in the drop-down box. By default, the first suggestion item is selected as the user types. This behavior can be deactivated by setting <code><varname>selectFirst</varname>="false"</code>.
</para>
<para>
- Setting <code><varname>directInputSuggestions</varname>="true"</code> causes the combo-box to fill the text field box with a matching suggestion as the user types. Alternatively, the text field can be disabled by setting <code><varname>enableManualInput</varname>="false"</code>, which forces the users to pick from items in the drop-down box.
+ Setting <code><varname>autoFill</varname>="true"</code> causes the combo-box to fill the text field box with a matching suggestion as the user types.
</para>
</section>
- <section id="sect-Component_Reference-richcomboBox-richcomboBox_events">
- <title><sgmltag><rich:comboBox></sgmltag> events</title>
+ <!-- TODO
+ <section id="sect-Component_Reference-richautocomplete-richautocomplete_events">
+ <title><sgmltag><rich:autocomplete></sgmltag> events</title>
<para>
- The <sgmltag><rich:comboBox></sgmltag> component has two unique event handlers:
+ The <sgmltag><rich:autocomplete></sgmltag> component has two unique event handlers:
</para>
<itemizedlist>
<listitem>
@@ -194,33 +194,34 @@
</listitem>
</itemizedlist>
</section>
+ -->
- <section id="sect-Component_Reference-richcomboBox-Reference_data">
+ <section id="sect-Component_Reference-richautocomplete-Reference_data">
<title>Reference data</title>
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.ComboBox</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.autocomplete</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlComboBox</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlAutocomplete</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ComboBox</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.autocomplete</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.ComboBoxRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.autocompleteRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ComboBoxTag</classname>
+ <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.autocompleteTag</classname>
</para>
</listitem>
</itemizedlist>
@@ -335,18 +336,20 @@
<section id="sect-Component_Reference-richinplaceInput-Interactivity_options">
<title>Interactivity options</title>
+ <!--
<para>
When in the initial "view" state, the starting label can be set using the <varname>defaultLabel</varname> attribute, such as <code><varname>defaultLabel</varname>="click to edit"</code>.
</para>
-
+ -->
<para>
- By default, the event to switch the component to the "edit" state is a single mouse click. This can be changed using the <varname>editEvent</varname> attribute to specify a different event. When switching to "edit" mode, the existing text can be automatically highlighted to make editing easier by setting <code><varname>selectOnEdit</varname>="true"</code>.
+ By default, the event to switch the component to the "edit" state is a single mouse click. This can be changed using the <varname>editEvent</varname> attribute to specify a different event.
</para>
<para>
The user can confirm and save their input by pressing the <keycap>Enter</keycap> key or cancel by pressing the <keycap>Esc</keycap> key. Alternatively, buttons for confirming or canceling can be added to the component by setting <code>showControls="true"</code>. These buttons can be positioned using the <varname>controlsHorizontalPosition</varname> attribute with settings of <literal>left</literal>, <literal>right</literal>, or <literal>center</literal>, and the <varname>controlsVerticalPosition</varname> attribute with settings <literal>bottom</literal>, <literal>center</literal>, or <literal>top</literal>. The confirmation control icons can be altered using the <varname>saveControlIcon</varname> and <varname>cancelControlIcon</varname>. Further customization is possible through the use of facets.
</para>
</section>
+ <!-- TODO
<section id="sect-Component_Reference-richinplaceInput-richinplaceInput_events">
<title><sgmltag><rich:inplaceInput></sgmltag> events</title>
<para>
@@ -375,6 +378,7 @@
</listitem>
</itemizedlist>
</section>
+ -->
<section id="sect-Component_Reference-richinplaceInput-Reference_data">
<title>Reference data</title>
@@ -504,12 +508,12 @@
<section id="sect-Component_Reference-Rich_inputs-richinputNumberSlider">
<title><sgmltag><rich:inputNumberSlider></sgmltag></title>
<para>
- The <sgmltag><rich:inputNumberSlider></sgmltag> component provides a slider for changing numerical values. Optional features include a tool-tip to display the value while sliding, and a text field for typing the numerical value which can then be validated against the slider's range.
+ The <sgmltag><rich:inputNumberSlider></sgmltag> component provides a slider for changing numerical values. Optional features include control arrows to step through the values, a tool-tip to display the value while sliding, and a text field for typing the numerical value which can then be validated against the slider's range.
</para>
<section id="sect-Component_Reference-richinputNumberSlider-Basic_usage">
<title>Basic usage</title>
<para>
- Basic use of the component with no attributes specified will render a slider with a minimum value of 0, a maximum of 100, and a gradient step of 1, together with a text field for typing the desired numerical value. The slider is labeled with the minimum and maximum boundary values, and a tool-tip showing the current value is shown while sliding the slider.
+ Basic use of the component with no attributes specified will render a slider with a minimum value of 0, a maximum of 100, and a gradient step of 1, together with a text field for typing the desired numerical value. The slider is labeled with the minimum and maximum boundary values, and a tool-tip showing the current value is shown while sliding the slider. The <varname>value</varname> attribute is used for storing the currently selected value of the slider.
</para>
</section>
@@ -525,7 +529,7 @@
The minimum and maximum labels on the slider can be hidden by setting <code><varname>showBoundaryValues</varname>="false"</code>. The tool-tip showing the current value can be hidden by setting <code><varname>showToolTip</varname>="false"</code>.
</para>
<para>
- Arrow controls can be added to either side of the slider to adjust the value incrementally by setting <code>showArrows="true"</code>. Clicking the arrows move the slider indicator in that direction by the gradient step, and clicking and holding the arrows moves the indicator continuously. The time delay for each step when updating continuously can be defined using the <varname>delay</varname> attribute.
+ Arrow controls can be added to either side of the slider to adjust the value incrementally by setting <code><varname>showArrows</varname>="true"</code>. Clicking the arrows move the slider indicator in that direction by the gradient step, and clicking and holding the arrows moves the indicator continuously. The time delay for each step when updating continuously can be defined using the <varname>delay</varname> attribute.
</para>
</section>
Copied: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample (from rev 18789, modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richcomboBox-Defining_suggestion_values.xml_sample)
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample (rev 0)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample 2010-08-20 06:08:40 UTC (rev 18836)
@@ -0,0 +1 @@
+<rich:autocomplete value="#{bean.state}" autocompleteList="#{bean.suggestions}" />
Deleted: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richcomboBox-Defining_suggestion_values.xml_sample
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richcomboBox-Defining_suggestion_values.xml_sample 2010-08-20 00:30:13 UTC (rev 18835)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richcomboBox-Defining_suggestion_values.xml_sample 2010-08-20 06:08:40 UTC (rev 18836)
@@ -1 +0,0 @@
-<rich:comboBox value="#{bean.state}" suggestionValues="#{bean.suggestions}" />
Modified: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtoggleControl-richtoggleControl_example.xml_sample
===================================================================
--- modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtoggleControl-richtoggleControl_example.xml_sample 2010-08-20 00:30:13 UTC (rev 18835)
+++ modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtoggleControl-richtoggleControl_example.xml_sample 2010-08-20 06:08:40 UTC (rev 18836)
@@ -1,17 +1,17 @@
-<rich:toggleLayout id="layout" activeItem="short">
- <rich:togglePanel id="short">
+<rich:togglePanel id="layout" activeItem="short">
+ <rich:togglePanelItem id="short">
//content
<h:commandButton>
<rich:toggleControl targetItem="details"> // switches to details state
</h:commandButton>
- </rich:togglePanel>
- <rich:togglePanel id="details">
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="details">
//content
<h:commandButton>
<rich:toggleControl targetItem="short"> //switches to short state
</h:commandButton>
- <rich:togglePanel>
-</rich:toggleLayout>
+ <rich:togglePanelItem>
+</rich:togglePanel>
<h:commandButton>
- <rich:toggleControl for="layout"/> // cycles through the states
+ <rich:toggleControl activePanel="layout"/> // cycles through the states
</h:commandButton>
Copied: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richautocomplete-richautocomplete.png (from rev 18789, modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richcomboBox-richcomboBox.png)
===================================================================
(Binary files differ)
Deleted: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richcomboBox-richcomboBox.png
===================================================================
(Binary files differ)
Added: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richtabPanel-richtabPanel_component.png
===================================================================
(Binary files differ)
Property changes on: modules/docs/branches/draft/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richtabPanel-richtabPanel_component.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: modules/docs/branches/draft/parent/pom.xml
===================================================================
--- modules/docs/branches/draft/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
+++ modules/docs/branches/draft/parent/pom.xml 2010-08-20 06:08:40 UTC (rev 18836)
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18835 - in branches/RF-9112: archetypes and 14 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-08-19 20:30:13 -0400 (Thu, 19 Aug 2010)
New Revision: 18835
Modified:
branches/RF-9112/archetypes/pom.xml
branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml
branches/RF-9112/archetypes/richfaces-component-short/pom.xml
branches/RF-9112/archetypes/richfaces-component/pom.xml
branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml
branches/RF-9112/bom/pom.xml
branches/RF-9112/cdk/parent/pom.xml
branches/RF-9112/cdk/pom.xml
branches/RF-9112/core/parent/pom.xml
branches/RF-9112/core/pom.xml
branches/RF-9112/examples/parent/pom.xml
branches/RF-9112/examples/pom.xml
branches/RF-9112/parent/pom.xml
branches/RF-9112/pom.xml
branches/RF-9112/ui/core/api/pom.xml
branches/RF-9112/ui/pom.xml
Log:
fix bootstrap build
Modified: branches/RF-9112/archetypes/pom.xml
===================================================================
--- branches/RF-9112/archetypes/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -27,6 +27,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.archetypes</groupId>
Modified: branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -5,6 +5,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/archetypes/richfaces-component/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-component/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/richfaces-component/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/archetypes/richfaces-component-short/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-component-short/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/richfaces-component-short/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/bom/pom.xml
===================================================================
--- branches/RF-9112/bom/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/bom/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -31,6 +31,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<description>
Modified: branches/RF-9112/cdk/parent/pom.xml
===================================================================
--- branches/RF-9112/cdk/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/cdk/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -27,32 +27,7 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/cdk/parent</developerConnection>
<url>http://fisheye.jboss.org/browse/Richfaces/cdk/parent</url>
</scm>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<pluginManagement>
<plugins>
@@ -146,16 +121,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
<version>1.0_02.CR4</version>
@@ -183,11 +148,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r05</version>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
@@ -268,11 +228,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.8</version>
Modified: branches/RF-9112/cdk/pom.xml
===================================================================
--- branches/RF-9112/cdk/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/cdk/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -6,6 +6,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/core/parent/pom.xml
===================================================================
--- branches/RF-9112/core/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/core/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -41,8 +41,8 @@
</properties>
<dependencyManagement>
- <dependencies>
- <!-- Test Dependencies -->
+ <dependencies>
+ <!-- Test Dependencies -->
<!--
These dependencies are usually provided by
org.jboss.test-jsf:htmlunit-client, but the latest 2.7
@@ -69,7 +69,7 @@
<artifactId>easymockclassextension</artifactId>
<version>2.5.2</version>
</dependency>
- </dependencies>
+ </dependencies>
</dependencyManagement>
<build>
Modified: branches/RF-9112/core/pom.xml
===================================================================
--- branches/RF-9112/core/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/core/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -24,6 +24,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.core</groupId>
Modified: branches/RF-9112/examples/parent/pom.xml
===================================================================
--- branches/RF-9112/examples/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/examples/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -26,6 +26,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
Modified: branches/RF-9112/examples/pom.xml
===================================================================
--- branches/RF-9112/examples/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/examples/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -29,6 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -49,4 +50,4 @@
<!--<module>dist</module>-->
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: branches/RF-9112/parent/pom.xml
===================================================================
--- branches/RF-9112/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -31,6 +31,8 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../bom/pom.xml</relativePath>
+
</parent>
<description>
@@ -79,6 +81,33 @@
<artifactId>junit</artifactId>
<version>4.7</version>
</dependency>
+ <!-- Test Dependencies -->
+ <!--
+ These dependencies are usually provided by
+ org.jboss.test-jsf:htmlunit-client, but the latest 2.7
+ HtmlUnit version has problems with jQuery, so we are
+ overriding version back to 2.5.
+ -->
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit-core-js</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.5.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: branches/RF-9112/pom.xml
===================================================================
--- branches/RF-9112/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -8,6 +8,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/ui/core/api/pom.xml
===================================================================
--- branches/RF-9112/ui/core/api/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/ui/core/api/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -22,6 +22,7 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/ui/pom.xml
===================================================================
--- branches/RF-9112/ui/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/ui/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -29,6 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui</groupId>
15 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r18834 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-19 20:01:57 -0400 (Thu, 19 Aug 2010)
New Revision: 18834
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml
Log:
a4j:status - added tests for instant attributes (RFPL-735)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2010-08-19 23:24:46 UTC (rev 18833)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2010-08-20 00:01:57 UTC (rev 18834)
@@ -83,7 +83,7 @@
<ui:define name="outOfTemplateAfter">
<h:form id="attributesForm">
<metamer:attributes value="#{a4jStatusBean.attributes}"
- id="attributes" type="ajax" render="status" />
+ id="attributes" type="ajax" render="commonGrid" />
</h:form>
</ui:define>
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2010-08-20 00:01:57 UTC (rev 18834)
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * 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.ftest.a4jStatus;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
+import static org.jboss.test.selenium.encapsulated.JavaScript.js;
+import static org.testng.Assert.assertEquals;
+
+import java.net.URL;
+
+import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.jboss.test.selenium.locator.ElementLocator;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class TestInstantAttributes extends AbstracStatusTest {
+
+ StatusAttributes attributes = new StatusAttributes() {
+ protected void applyText(ElementLocator<?> locator, String value) {
+ guardXhr(selenium).type(locator, value);
+
+ };
+ };
+
+ JavaScript alert = js("alert('{0}')");
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/a4jStatus/instantAttributes.xhtml");
+ }
+
+ @BeforeMethod
+ public void installStatusExtensions() {
+ super.installStatusExtensions();
+ }
+
+ @Test
+ public void testOnStart() {
+ for (int i = 0; i < 2; i++) {
+ attributes.setOnStart(alert.parametrize("start" + 1));
+
+ enableHalt();
+ selenium.click(button1);
+ selenium.waitForCondition(js("selenium.isAlertPresent()"));
+ assertEquals(selenium.getAlert(), "start" + 1);
+ waitForHalt();
+ unhalt();
+ disableHalt();
+ }
+ }
+
+ @Test
+ public void testOnError() {
+ for (int i = 0; i < 2; i++) {
+ attributes.setOnError(alert.parametrize("error" + i));
+
+ guardXhr(selenium).click(buttonError);
+ assertEquals(selenium.getAlert(), "error" + i);
+ }
+ }
+
+ @Test
+ public void testOnSuccess() {
+ for (int i = 0; i < 2; i++) {
+ attributes.setOnSuccess(alert.parametrize("success" + 1));
+
+ guardXhr(selenium).click(button1);
+ assertEquals(selenium.getAlert(), "success" + 1);
+ }
+ }
+
+ @Test
+ public void testOnStop() {
+ for (int i = 0; i < 2; i++) {
+ attributes.setOnStop(alert.parametrize("stop" + i));
+
+ guardXhr(selenium).click(button1);
+ assertEquals(selenium.getAlert(), "stop" + i);
+
+ guardXhr(selenium).click(buttonError);
+ assertEquals(selenium.getAlert(), "stop" + i);
+ }
+ }
+
+}
\ No newline at end of file
15 years, 8 months
- 1
- 0