Author: ayanul Date: 2007-11-20 02:54:58 -0500 (Tue, 20 Nov 2007) New Revision: 4099 Added: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml Log: Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -31,7 +31,7 @@ public int getData1() { return data1; } - + public String getData2() { return data2; } Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -2,6 +2,18 @@ public class ModalPanel { + private boolean autosized; + private boolean immediate; + private boolean keepVisualState; + private String left; + private String top; + private String rendered; + private boolean required; + private String requiredMessage; + private int shadowDepth; + private int shadowOpacity; + private boolean showWhenRendered; + private int zindex; private int minHeight; private int minWidth; @@ -116,4 +128,100 @@ setMoveable(true); setResizeable(true); } + + public boolean isAutosized() { + return autosized; + } + + public void setAutosized(boolean autosized) { + this.autosized = autosized; + } + + public boolean isImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public boolean isKeepVisualState() { + return keepVisualState; + } + + public void setKeepVisualState(boolean keepVisualState) { + this.keepVisualState = keepVisualState; + } + + public String getLeft() { + return left; + } + + public void setLeft(String left) { + this.left = left; + } + + public String getTop() { + return top; + } + + public void setTop(String top) { + this.top = top; + } + + public String getRendered() { + return rendered; + } + + public void setRendered(String rendered) { + this.rendered = rendered; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public int getShadowDepth() { + return shadowDepth; + } + + public void setShadowDepth(int shadowDepth) { + this.shadowDepth = shadowDepth; + } + + public int getShadowOpacity() { + return shadowOpacity; + } + + public void setShadowOpacity(int shadowOpacity) { + this.shadowOpacity = shadowOpacity; + } + + public boolean isShowWhenRendered() { + return showWhenRendered; + } + + public void setShowWhenRendered(boolean showWhenRendered) { + this.showWhenRendered = showWhenRendered; + } + + public int getZindex() { + return zindex; + } + + public void setZindex(int zindex) { + this.zindex = zindex; + } } Added: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,187 @@ +package orderingList; + +import java.util.ArrayList; +import java.util.Random; + +import dataScroller.Data; + +public class OrderingList { + private ArrayList<Data> list; + private String [] status = {"error", "fatal", "info", "passed", "warn"}; + private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; + private String captionLabel; + private String componentState; + private String listHeight; + private String listWidth; + private String controlsType; + private String controlsVerticalAlign; + private String controlsHorizontalAlign; + private String headerLabel; + private String bottomControlLabel; + private String upControlLabel; + private String topControlLabel; + private String downControlLabel; + private boolean orderControlsVisible; + private boolean fastOrderControlsVisible; + private boolean rendered; + private boolean showButtonLabels; + + public ArrayList<Data> getList() { + return list; + } + + public void setList(ArrayList<Data> list) { + this.list = list; + } + + public OrderingList() { + captionLabel = "captionLabel"; + componentState = "none"; + listHeight = "300"; + listWidth = "400"; + controlsType = "none"; + controlsHorizontalAlign = "0"; + controlsVerticalAlign = "0"; + headerLabel = "headerLabel"; + bottomControlLabel = "bottom label"; + upControlLabel = "up label"; + downControlLabel = "down label"; + topControlLabel = "top label"; + orderControlsVisible = false; + fastOrderControlsVisible = false; + rendered = true; + showButtonLabels = false; + list = new ArrayList<Data>(); + for(int i = 0; i < 10; i++) { + list.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[new Random().nextInt(5)], statusIcon[new Random().nextInt(5)])); + } + } + + public String getListHeight() { + return listHeight; + } + + public void setListHeight(String listHeight) { + this.listHeight = listHeight; + } + + public String getListWidth() { + return listWidth; + } + + public void setListWidth(String listWidth) { + this.listWidth = listWidth; + } + + public String getControlsType() { + return controlsType; + } + + public void setControlsType(String controlsType) { + this.controlsType = controlsType; + } + + public String getBottomControlLabel() { + return bottomControlLabel; + } + + public void setBottomControlLabel(String bottomControlLabel) { + this.bottomControlLabel = bottomControlLabel; + } + + public String getCaptionLabel() { + return captionLabel; + } + + public void setCaptionLabel(String captionLabel) { + this.captionLabel = captionLabel; + } + + public String getUpControlLabel() { + return upControlLabel; + } + + public void setUpControlLabel(String upControlLabel) { + this.upControlLabel = upControlLabel; + } + + public String getTopControlLabel() { + return topControlLabel; + } + + public void setTopControlLabel(String topControlLabel) { + this.topControlLabel = topControlLabel; + } + + public String getComponentState() { + return componentState; + } + + public void setComponentState(String componentState) { + this.componentState = componentState; + } + + public String getControlsVerticalAlign() { + return controlsVerticalAlign; + } + + public void setControlsVerticalAlign(String controlsVerticalAlign) { + this.controlsVerticalAlign = controlsVerticalAlign; + } + + public String getControlsHorizontalAlign() { + return controlsHorizontalAlign; + } + + public void setControlsHorizontalAlign(String controlsHorizontalAlign) { + this.controlsHorizontalAlign = controlsHorizontalAlign; + } + + public String getHeaderLabel() { + return headerLabel; + } + + public void setHeaderLabel(String headerLabel) { + this.headerLabel = headerLabel; + } + + public String getDownControlLabel() { + return downControlLabel; + } + + public void setDownControlLabel(String downControlLabel) { + this.downControlLabel = downControlLabel; + } + + public boolean isOrderControlsVisible() { + return orderControlsVisible; + } + + public void setOrderControlsVisible(boolean orderControlsVisible) { + this.orderControlsVisible = orderControlsVisible; + } + + public boolean isFastOrderControlsVisible() { + return fastOrderControlsVisible; + } + + public void setFastOrderControlsVisible(boolean fastOrderControlsVisible) { + this.fastOrderControlsVisible = fastOrderControlsVisible; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public boolean isShowButtonLabels() { + return showButtonLabels; + } + + public void setShowButtonLabels(boolean showButtonLabels) { + this.showButtonLabels = showButtonLabels; + } +} Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -41,6 +41,7 @@ map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true})); map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); + map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, false})); } public String getSrc() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -8,16 +8,31 @@ public class ScrollableDataTable { private ArrayList<Data> data; - private String [] priority = {"blocker", "critical", "major", "minor", "trivial"}; - private String [] priorityIcon = {"/pics/sdt/priority_blocker.gif", "/pics/sdt/priority_critical.gif", "/pics/sdt/priority_major.gif", "/pics/sdt/priority_minor.gif", "/pics/sdt/priority_trivial.gif"}; + private String [] status = {"error", "fatal", "info", "passed", "warn"}; + private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; + private String width; + private String rows; + private String key; + private boolean hideWhenScrolling; + public boolean isHideWhenScrolling() { + return hideWhenScrolling; + } + + public void setHideWhenScrolling(boolean hideWhenScrolling) { + this.hideWhenScrolling = hideWhenScrolling; + } + public ScrollableDataTable() { + width = "400px"; + rows = "30"; + hideWhenScrolling = false; data = new ArrayList<Data>(); int k; for(int i = 0; i < 10000; i++) { k = new Random().nextInt(5); - data.add(new Data("Bug " + new Random().nextInt(10 + i), i,priority[k], priorityIcon[k])); + data.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[k], statusIcon[k])); } } @@ -28,4 +43,24 @@ public void setData(ArrayList<Data> data) { this.data = data; } + + public String getWidth() { + return width; + } + + public void setWidth(String width) { + this.width = width; + } + + public String getRows() { + return rows; + } + + public void setRows(String rows) { + this.rows = rows; + } + + public void setKey(String key) { + this.key = key; + } } \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="calendarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages /> <rich:messages showDetail="true"></rich:messages> @@ -92,5 +91,4 @@ </h:panelGrid> </rich:calendar> </h:panelGrid> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -7,8 +7,21 @@ <f:view> - <h:form> + <h:form id="test"> +<rich:tabPanel switchType="ajax"> - </h:form> +<rich:tab label="Sample 1"> +<h:outputText value="1"></h:outputText> +<h:inputText value="#{dDMenu.mode}" required="true" /> +</rich:tab> + +<rich:tab label="Sample 2"> +<a4j:support event="ontabenter"></a4j:support> +<h:outputText value="2"></h:outputText> +<h:inputText value="#{dDMenu.mode}"></h:inputText> +</rich:tab> + +</rich:tabPanel> + </h:form> </f:view> -</html> \ No newline at end of file +</html> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,30 +1,14 @@ -<f:subview id="DataFilterSliderSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - - <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" - ignoreDupResponses="true" requestDelay="100"> +<f:subview id="dataFilterSliderSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <a4j:region id="stat1"> - <a4j:outputPanel id="p1"> - <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" - binding="#{inventoryList.dataFilterSlider}" for="carList" - forValRef="inventoryList.carInventory" filterBy="getMileage" - manualInput="true" onSlide="true" onChange="true" - storeResults="true" trackStyleClass="track" width="400px" - styleClass="slider-container" startRange="10000" endRange="60000" - increment="10000" rangeStyleClass="range" trailer="true" - trailerStyleClass="trailer" handleStyleClass="handle" - handleValue="10000" id="slider_1"> - </rich:dataFilterSlider> - </a4j:outputPanel> + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" + for="carList" forValRef="inventoryList.carInventory" filterBy="getMileage" manualInput="true" onSlide="true" onChange="true" + storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000" + increment="10000" rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" handleStyleClass="handle" + handleValue="10000" id="dfsID"> + </rich:dataFilterSlider> - - - <a4j:outputPanel id="list-body" style="border: 1px"> + <h:panelGrid id="list-body"> <h:dataTable id="carIndex" rows="10" binding="#{inventoryList.carMakeIndexUIData}" value="#{inventoryList.carMakeIndex}" var="category" @@ -39,7 +23,6 @@ </a4j:commandLink> </h:column> - </h:dataTable> <h:dataTable id="carList" rows="10" @@ -76,7 +59,8 @@ <h:outputText value="#{category.mileage}" /> </h:column> </h:dataTable> - </a4j:outputPanel> - </a4j:region> - </a4j:form> -</f:subview> + </h:panelGrid> + <h:outputText value="click reRender for update page(RF-1365)" /> + <h:commandButton value="reRender" /> + +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,8 +4,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form dir="DSform"> - <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" var="dT" cellpadding="5px" rows="5" border="1"> <f:facet name="header"> @@ -29,5 +27,4 @@ <h:outputText value="#{dT.data1}" /> </h:column> </h:dataTable> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,9 +1,7 @@ <f:subview id="DataTableSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form dir="DSform"> <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" cellpadding="" - cellspacing="" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" onRowDblClick="print('onRowDblClickInputID', 'onRowDblClick work!')" onRowMouseDown="print('onRowMouseDownInputID', 'onRowMouseDown work!')" @@ -65,5 +63,4 @@ <h:outputText value="#{dataTableID.total}" /> </rich:column> </rich:dataTable> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,8 +1,6 @@ <f:subview id="DtadAndDropSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html"> - <h:form id="form"> - <h:panelGroup id="dragValueText"> <h:outputText value="#{dndBean.dragValue}" /> </h:panelGroup> @@ -193,5 +191,4 @@ <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="DropDownMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> - <h:form> <h:panelGrid columns="2"> <rich:spacer width="400px" height="400px"></rich:spacer> <rich:panel> @@ -62,5 +61,4 @@ </rich:panel> </h:panelGrid> <a4j:log></a4j:log> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,7 +3,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> <rich:panel id="indexID"> <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> @@ -295,5 +294,4 @@ <rich:effect for="frm5" name="showFrm5" type="Appear" /> -</h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -5,7 +5,6 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="" ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" @@ -93,5 +92,4 @@ </script> </a4j:outputPanel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="inputNumberSliderSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:panelGrid columns="1"> <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" @@ -17,5 +16,4 @@ </rich:inputNumberSlider> </h:panelGrid> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="inputNumberSpinnerSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... - <h:form> <h:messages></h:messages> <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" @@ -19,5 +18,4 @@ onmouseup="print('onmouseupInputID', 'onmouseup work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" onupclick="print('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,12 +4,10 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages /> <rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}"> <rich:insert id="insertID" highlight="#{insert.highlight}" rendered="#{insert.rendered}" src="#{insert.src}"></rich:insert> </rich:panel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="messageSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <h:form> <rich:panel> <h:outputText value="Rich Message Demo:" /> @@ -61,10 +60,4 @@ </h:outputText> </rich:messages> </rich:panel> - - <f:verbatim> - <br /> - </f:verbatim> - - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,27 +1,26 @@ <f:subview id="modalPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - - <h:form id="MPform"> <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" onhide="print('onhideInputID', 'onhide work!')" onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> - + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('MPid');return false;"/> + </f:facet> <h:outputText value="This is Modal Panel example" styleClass="text1" /> <f:verbatim> <br /> <br /> </f:verbatim> - <h:outputLink onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" value="Close"> + <h:outputLink onclick="Richfaces.hideModalPanel('MPid');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> </rich:modalPanel> - <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show MP</a> + <a onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a> + <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('MPid');" /> - <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -6,7 +6,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> <h:panelGrid columns="2"> - <h:outputText value="Width:" /> <h:inputText value="#{modalPanel.width}"> <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,45 @@ +<f:subview id="orderingListSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://labs.jboss.com/jbossrichfaces/ui/orderingList&quo... + <h:messages showDetail="true"/> + + <rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}" listWidth="#{orderingList.listWidth}" + controlsType="#{orderingList.controlsType}" bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}" + topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}" + controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}" + headerLabel="#{orderingList.headerLabel}" downControlLabel="#{orderingList.downControlLabel}" orderControlsVisible="#{orderingList.orderControlsVisible}" + fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}" rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}"> + <h:column width="100px"> + <f:facet name="header"> + <h:outputText value="Number" /> + </f:facet> + <h:outputText value="#{item.data1}" /> + </h:column> + + <h:column width="100px"> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:outputText value="#{item.data0}" /> + </h:column> + + <h:column width="100px"> + <f:facet name="header"> + <h:outputText value="Status" /> + </f:facet> + <h:selectOneMenu value="#{item.data2}"> + <f:selectItem itemLabel="error" itemValue="error"/> + <f:selectItem itemLabel="fatal" itemValue="fatal"/> + <f:selectItem itemLabel="info" itemValue="info"/> + <f:selectItem itemLabel="passed" itemValue="passed"/> + <f:selectItem itemLabel="warn" itemValue="warn"/> + </h:selectOneMenu> + </h:column> + + <h:column width="30px"> + <f:facet name="header"> + <h:outputText value="Icon" /> + </f:facet> + <h:graphicImage value="#{item.data3}" /> + </h:column> + </rich:orderingList> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,84 @@ +<f:subview id="orderingListPropertySubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <h:panelGrid columns="2"> + + <h:outputText value="controlsType" /> + <h:selectOneRadio value="#{orderingList.controlsType}"> + <f:selectItem itemLabel="none" itemValue="none"/> + <f:selectItem itemLabel="button" itemValue="button"/> + <f:selectItem itemLabel="link" itemValue="link"/> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="captionLabel" /> + <h:inputText value="#{orderingList.captionLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="headerLabel" /> + <h:inputText value="#{orderingList.headerLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="listHeight:" /> + <h:inputText value="#{orderingList.listHeight}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="listWidth" /> + <h:inputText value="#{orderingList.listWidth}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="controlsVerticalAlign" /> + <h:inputText value="#{orderingList.controlsVerticalAlign}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + + <h:outputText value="controlsHorizontalAlign" /> + <h:inputText value="#{orderingList.controlsHorizontalAlign}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="upControlLabel" /> + <h:inputText value="#{orderingList.upControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="bottomControlLabel" /> + <h:inputText value="#{orderingList.bottomControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="topControlLabel" /> + <h:inputText value="#{orderingList.topControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="downControlLabel" /> + <h:inputText value="#{orderingList.downControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="showButtonLabels" /> + <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="fastOrderControlsVisible" /> + <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="orderControlsVisible" /> + <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{orderingList.rendered}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,9 +1,7 @@ <f:subview id="paint2DSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <rich:paint2D id="paint2dID" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}" rendered="#{paint2D.rendered}" /> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="panelSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> - <h:form> <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> @@ -41,6 +40,5 @@ <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> </rich:panel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,8 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> - <h:panelGrid columnClasses="panel" border="0" columns="3"> + <h:panelGrid columnClasses="panel" border="0" columns="3"> <rich:panel styleClass="top"> <f:facet name="header"> <h:panelGroup> @@ -93,5 +92,4 @@ <h:outputText value="inside the form" /> </h:form> </rich:panel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="panelBarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages></h:messages> @@ -31,5 +30,4 @@ </rich:panelBar> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="panelMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> - <h:form> <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" @@ -167,10 +166,4 @@ </rich:panelMenuGroup> </rich:panelMenuGroup> </rich:panelMenu> - - <f:verbatim> - <br /> - <br /> - </f:verbatim> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,4 +1,3 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,8 +3,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="30" width="400px" + <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" + hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" reRender="inputID" oncomplete="print('oncompleteInputID', 'oncomplete work!')" onselectionchange="print('onselectionchangeInputID', 'onselectionchange work!')"> <rich:column width="100px" sortable="false"> <f:facet name="header"> @@ -22,19 +22,23 @@ <rich:column width="100px" sortable="false"> <f:facet name="header"> - <h:outputText value="Priority" /> + <h:outputText value="Status" /> </f:facet> - <h:outputText value="#{sdt.data2}" /> + <h:selectOneMenu value="#{sdt.data2}"> + <f:selectItem itemLabel="error" itemValue="error"/> + <f:selectItem itemLabel="fatal" itemValue="fatal"/> + <f:selectItem itemLabel="info" itemValue="info"/> + <f:selectItem itemLabel="passed" itemValue="passed"/> + <f:selectItem itemLabel="warn" itemValue="warn"/> + </h:selectOneMenu> </rich:column> - <rich:column width="100px" sortable="false"> + <rich:column width="30px" sortable="false"> <f:facet name="header"> - <h:outputText value="Name" /> + <h:outputText value="Icon" /> </f:facet> - <h:outputText value="#{sdt.data3}" /> + <h:graphicImage value="#{sdt.data3}" /> </rich:column> </rich:scrollableDataTable> - - - </h:form> + <h:inputText id="inputID" value="#{key}" /> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,5 +4,15 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:panelGrid columns="2"> + <h:outputText value="rows" /> + <h:inputText value="#{scrollableDT.rows}" /> + + <h:outputText value="width" /> + <h:inputText value="#{scrollableDT.width}" /> + + <h:outputText value="hideWhenScrolling" /> + <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" /> + </h:panelGrid> <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="separatorSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> - <h:form> <h:outputText value="Some text one..." styleClass="text"></h:outputText> <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" @@ -12,5 +11,4 @@ onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,5 @@ <f:subview id="simpleTogglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - - <h:form> <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" @@ -66,5 +64,4 @@ </rich:simpleTogglePanel> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="spacerSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:sql="http://java.sun.com/jsp/jstl/sql"> - <h:form> <style type="text/css"> .text { font-size: 20px; @@ -20,5 +19,4 @@ onmouseup="print('onmouseupInputID', 'onmouseup work!')"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,12 +3,11 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form id="suggestionbox_form"> <h:messages showDetail="true"/> <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter <br /> </f:verbatim> - <h:inputText value="#{suggestionBox.property}" id="text" /> + <h:inputText value="#{sb.property}" id="text" /> <rich:suggestionbox id="suggestionBoxId" for="text" var="result" zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" suggestionAction="#{sb.autocomplete}" @@ -33,5 +32,4 @@ </rich:suggestionbox> <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="tabPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> - <h:form> <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" @@ -51,5 +50,4 @@ </rich:tabPanel> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="togglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <h:form id="tooggleTest"> <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" style="width:300px!important; overflow: hidden;" onclick="print('onclickInputID', 'onclick work!')" @@ -13,7 +12,7 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1"> + <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID:panel1"> <h:outputText value="Expand" style="font-weight: bold;" /> <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -26,7 +25,7 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1"> + <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1"> <h:outputText value="Collapse" style="font-weight: bold;" /> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -67,7 +66,7 @@ <f:facet name="header"> <h:panelGroup> <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2"> + <rich:toggleControl id="toggleControl_panel_1" for="togglePanelSubviewID:panel2"> <h:outputText value="Next"></h:outputText> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -95,7 +94,7 @@ <f:facet name="header"> <h:panelGroup> <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2"> + <rich:toggleControl id="toggleControl_panel_2" for="togglePanelSubviewID:panel2"> <h:outputText value="Next"></h:outputText> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -123,7 +122,7 @@ <f:facet name="header"> <h:panelGroup> <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2"> + <rich:toggleControl id="toggleControl_panel_3" for="togglePanelSubviewID:panel2"> <h:outputText value="Next"></h:outputText> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -147,10 +146,5 @@ </f:facet> </rich:togglePanel> - <f:verbatim> - <br /> - <br /> - </f:verbatim> <ui:debug hotkey="L"></ui:debug> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,7 +3,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages></h:messages> <rich:toolBar id="toolBarId" width="#{toolBar.width}" @@ -33,5 +32,4 @@ </rich:toolBar> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="tooltipSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages></h:messages> @@ -67,5 +66,4 @@ <br /> </f:verbatim> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="treeSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:dnd="http://richfaces.ajax4jsf.org/drag-drop"> - <h:form> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> @@ -108,5 +107,4 @@ </rich:tree> <rich:spacer></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="virtualEarthSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> <h:panelGrid columns="2"> <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')" @@ -40,5 +39,4 @@ } </script> </a4j:outputPanel> - </h:form> </f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>orderingList</managed-bean-name> + <managed-bean-class>orderingList.OrderingList</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-20 07:54:58 UTC (rev 4099) @@ -44,7 +44,7 @@ /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml</param-value> + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml</param-value> </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,11 +1,11 @@ -<!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" +<f:subview contentType="text/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + <style> .divSize_1 { width: 150px; @@ -44,12 +44,7 @@ color: #228B22; } </style> - - -<f:view contentType="text/html"> - <body> - <h:form id="form"> - + <h:panelGrid id="panelGridID" columns="2" border="1"> <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> <h:panelGroup> @@ -96,9 +91,5 @@ <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> - - </h:form> - </body> -</f:view> -</html> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -35,8 +35,8 @@ <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;"> <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;"> - <ui:include src="${richBean.pathComponent}" /> <h:form> + <ui:include src="${richBean.pathComponent}" /> <ui:include src="${richBean.pathStraightforward}" /> <ui:include src="${richBean.pathProperty}" /> </h:form> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -33,9 +33,8 @@ <div id="divOpthID" align="right" style="z-index: 200"> <ui:include src="/pages/RichMenu/RichMenu.xhtml" /> </div> - - <ui:include src="${richBean.pathComponent}" /> <h:form> + <ui:include src="${richBean.pathComponent}" /> <ui:include src="${richBean.pathStraightforward}" /> <ui:include src="${richBean.pathProperty}" /> </h:form> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -15,6 +15,7 @@ <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> <f:selectItem itemValue="Blank" itemLabel="Blank" /> + <f:selectItem itemValue="OrderingList" itemLabel="OrderingList" /> <f:selectItem itemValue="Calendar" itemLabel="Calendar" /> <f:selectItem itemValue="DataFilterSlider" itemLabel="Data Filter Slider" /> <f:selectItem itemValue="DataScroller" itemLabel="Date Scroller" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -34,8 +34,8 @@ </div> <div id="divPageID" style="position: absolute; background-color:gray; top:60px; left: 10px; z-index: 2"> - <ui:include src="${richBean.pathComponent}" />\ <h:form> + <ui:include src="${richBean.pathComponent}" />\ <ui:include src="${richBean.pathStraightforward}" /> <ui:include src="${richBean.pathProperty}" /> </h:form>