[richfaces-svn-commits] JBoss Rich Faces SVN: r3036 - in trunk/test-applications/jsp/src/main: java/rich and 5 other directories.

Author: ayanul Date: 2007-09-21 05:04:38 -0400 (Fri, 21 Sep 2007) New Revision: 3036 Added: trunk/test-applications/jsp/src/main/java/rich/RichBean.java trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp Removed: trunk/test-applications/jsp/src/main/java/rich/Rich.java trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp Log: Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-21 09:04:38 UTC (rev 3036) @@ -21,7 +21,6 @@ package calendar; -import java.lang.reflect.Array; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -29,11 +28,7 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.TimeZone; - -import javax.faces.component.UIComponent; import javax.faces.event.ValueChangeEvent; -import javax.faces.webapp.UIComponentTag; - import org.richfaces.event.CurrentDateChangeEvent; public class CalendarBean { @@ -76,6 +71,7 @@ private String scrollMode; private String label; private String timeZone; + private String mode; private int zindex; private int counter; @@ -153,18 +149,21 @@ required = false; weekDay = "none"; month = "none"; + mode = "client"; timeZone = "Eastern European Time"; preloadDateRangeBegin = "10.09.2007"; preloadDateRangeEnd = "11.10.2007"; } public Date getPrDateRangeBegin() { + if("ajax".equals(mode)) return null; Calendar cal = Calendar.getInstance(); StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,"."); ArrayList<Integer> date = new ArrayList<Integer>(); while(st.hasMoreTokens()) { date.add(Integer.parseInt(st.nextToken())); } + cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); System.out.println(cal.getTime()); return cal.getTime(); @@ -172,6 +171,7 @@ } public Date getPrDateRangeEnd() { + if("ajax".equals(mode)) return null; Calendar cal = Calendar.getInstance(); StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, "."); ArrayList<Integer> date = new ArrayList<Integer>(); @@ -442,4 +442,12 @@ public void setPreloadDateRangeEnd(String preloadDateRangeEnd) { this.preloadDateRangeEnd = preloadDateRangeEnd; } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } } Deleted: trunk/test-applications/jsp/src/main/java/rich/Rich.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/Rich.java 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/java/rich/Rich.java 2007-09-21 09:04:38 UTC (rev 3036) @@ -1,7 +0,0 @@ -package rich; - -import java.util.ArrayList; - -public class Rich { - -} Copied: trunk/test-applications/jsp/src/main/java/rich/RichBean.java (from rev 2912, trunk/test-applications/jsp/src/main/java/rich/Rich.java) =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/RichBean.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2007-09-21 09:04:38 UTC (rev 3036) @@ -0,0 +1,20 @@ +package rich; + +import java.util.ArrayList; + +public class RichBean { + + private String src; + + public RichBean() { + src = ""; + } + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } +} Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -47,16 +47,22 @@ toolTipMode="#{calendarBean.toolTipMode}" scrollMode="#{calendarBean.scrollMode}" rendered="#{calendarBean.rendered}" - focus="popupModeID" - timeZone="#{calendarBean.tmZone}" + focus="popupModeID" + mode="#{calendarBean.mode}" required="#{calendarBean.required}" requiredMessage="Required Message"> + <f:facet name="weekDay"> + <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</span></f:verbatim> + </f:facet> + <f:facet name="optionalHeader"> <h:outputText value="optionalHeader Facet" /> </f:facet> + <f:facet name="optionalFooter"> <h:outputText value="optionalFooter Facet" /> </f:facet> + <f:validator validatorId="org.richfaces.CalendarValidator" /> <h:panelGrid columns="2"> @@ -114,7 +120,13 @@ <h:commandButton type="button" value="Select Date" onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - <h:outputText value="Preload date range begin(d.m.y)" /> + <h:outputText value="Mode:" /> + <h:selectOneRadio value="#{calendarBean.mode}" onclick="submit();"> + <f:selectItem itemLabel="client" itemValue="client"/> + <f:selectItem itemLabel="ajax" itemValue="ajax"/> + </h:selectOneRadio> + + <h:outputText value="Preload date range begin(d.m.y)" /> <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> <h:outputText value="Preload date range end(d.m.y)" /> @@ -217,14 +229,12 @@ <f:verbatim></f:verbatim> <h:commandButton value="Submit" /> - - <rich:messages showDetail="true"></rich:messages> </h:panelGrid> <f:verbatim> <br /> </f:verbatim> - + <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -1,132 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style type="text/css"> - - body{ - font: normal 11px tahoma, sans-serif; - } - - .column{ - width:75px; - font: normal 11px tahoma, sans-serif; - text-align:center; - } - - .column-index{ - width:75px; - font: normal 11px tahoma, sans-serif; - text-align:left; - } - - .list-row3{ - background-color:#ececec; - } - - .list-row1{ - background-color:#f1f6fd; - } - - .list-row2{ - background-color:#fff; - } - - .list-header{ - font: bold 11px tahoma, sans-serif; - text-align:center; - } - - .list-table1{ - border:1px solid #bed6f8; - } - - .list-table2{ - border:1px solid #bed6f8; - } - - - - </style> -<f:subview id="dfsID"> - - <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" - ignoreDupResponses="true" requestDelay="100"> - - <a4j:region id="stat1"> - <a4j:outputPanel id="slider-body"> - - <rich:dataFilterSlider sliderListener="#{mybean.doSlide}" - binding="#{inventoryList.dataFilterSlider}" for="carList" - forValRef="inventoryList.carInventory" filterBy="getMileage" - manualInput="true" onSlide="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> - - - <a4j:outputPanel id="list-body"> - <f:verbatim> - - </f:verbatim> - <h:dataTable id="carIndex" rows="10" - binding="#{inventoryList.carMakeIndexUIData}" - value="#{inventoryList.carMakeIndex}" var="category" - styleClass="list-table1" columnClasses="column-index" - rowClasses="list-row3"> - - <h:column> - <a4j:commandLink actionListener="#{inventoryList.filterCarList}" - reRender="carList"> - <h:outputText value="#{category}" /> - <f:attribute name="filterRule" value="showTable" /> - - </a4j:commandLink> - </h:column> - - </h:dataTable> - - <h:dataTable id="carList" rows="10" - value="#{inventoryList.carInventory}" var="category" - rowClasses="list-row1, list-row2" columnClasses="column" - headerClass="list-header" styleClass="list-table2"> - - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" value="Make" /> - </f:facet> - <h:outputText value="#{category.make}" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" value="Model" /> - </f:facet> - <h:outputText value="#{category.model}" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" - value="#{inventoryList.priceColumnName}" /> - </f:facet> - <h:outputText value="#{category.price}" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" - value="#{inventoryList.mileageColumnName}" /> - </f:facet> - <h:outputText value="#{category.mileage}" /> - </h:column> - </h:dataTable> - </a4j:outputPanel> - </a4j:region> - <h:commandLink value="Back" action="main"></h:commandLink> - </a4j:form> - -</f:subview> - Copied: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp (from rev 2912, trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp) =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -0,0 +1,133 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<style type="text/css"> + + body{ + font: normal 11px tahoma, sans-serif; + } + + .column{ + width:75px; + font: normal 11px tahoma, sans-serif; + text-align:center; + } + + .column-index{ + width:75px; + font: normal 11px tahoma, sans-serif; + text-align:left; + } + + .list-row3{ + background-color:#ececec; + } + + .list-row1{ + background-color:#f1f6fd; + } + + .list-row2{ + background-color:#fff; + } + + .list-header{ + font: bold 11px tahoma, sans-serif; + text-align:center; + } + + .list-table1{ + border:1px solid #bed6f8; + } + + .list-table2{ + border:1px solid #bed6f8; + } + + + + </style> + +<f:subview id="dfsID"> + + <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" + ignoreDupResponses="true" requestDelay="100"> + + <a4j:region id="stat1"> + <a4j:outputPanel id="slider-body"> + + <rich:dataFilterSlider sliderListener="#{mybean.doSlide}" + binding="#{inventoryList.dataFilterSlider}" for="carList" + forValRef="inventoryList.carInventory" filterBy="getMileage" + manualInput="true" onSlide="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> + + + <a4j:outputPanel id="list-body"> + <f:verbatim> + + </f:verbatim> + <h:dataTable id="carIndex" rows="10" + binding="#{inventoryList.carMakeIndexUIData}" + value="#{inventoryList.carMakeIndex}" var="category" + styleClass="list-table1" columnClasses="column-index" + rowClasses="list-row3"> + + <h:column> + <a4j:commandLink actionListener="#{inventoryList.filterCarList}" + reRender="carList"> + <h:outputText value="#{category}" /> + <f:attribute name="filterRule" value="showTable" /> + + </a4j:commandLink> + </h:column> + + </h:dataTable> + + <h:dataTable id="carList" rows="10" + value="#{inventoryList.carInventory}" var="category" + rowClasses="list-row1, list-row2" columnClasses="column" + headerClass="list-header" styleClass="list-table2"> + + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Make" /> + </f:facet> + <h:outputText value="#{category.make}" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Model" /> + </f:facet> + <h:outputText value="#{category.model}" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" + value="#{inventoryList.priceColumnName}" /> + </f:facet> + <h:outputText value="#{category.price}" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" + value="#{inventoryList.mileageColumnName}" /> + </f:facet> + <h:outputText value="#{category.mileage}" /> + </h:column> + </h:dataTable> + </a4j:outputPanel> + </a4j:region> + <h:commandLink value="Back" action="main"></h:commandLink> + </a4j:form> + +</f:subview> + Modified: trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -12,8 +12,6 @@ <h:form> <rich:messages showDetail="true"></rich:messages> - <h:outputText value="#{emptyPage.text}" /> - </h:form> </body> </html> Deleted: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:04:38 UTC (rev 3036) @@ -1,10 +0,0 @@ -<?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>divBean</managed-bean-name> - <managed-bean-class>div.DivBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> -</faces-config> Deleted: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:04:38 UTC (rev 3036) @@ -1,10 +0,0 @@ -<?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>emptyPage</managed-bean-name> - <managed-bean-class>emptyPage.EmptyPage</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> -</faces-config> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-09-21 09:04:38 UTC (rev 3036) @@ -3,8 +3,8 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>rich</managed-bean-name> - <managed-bean-class>rich.Rich</managed-bean-class> + <managed-bean-name>richBean</managed-bean-name> + <managed-bean-class>rich.RichBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> </faces-config> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 09:04:38 UTC (rev 3036) @@ -74,7 +74,7 @@ </navigation-case> <navigation-case> <from-outcome>DFS</from-outcome> - <to-view-id>/DataFilterSlider/DFS.jsp</to-view-id> + <to-view-id>/DataFilterSlider/DataFilterSlider.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>DDM</from-outcome> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:04:38 UTC (rev 3036) @@ -12,7 +12,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message! .xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-RichTest.xml</param-value> + <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message! .xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichTest.xml</param-value> </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> Modified: trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -15,7 +15,8 @@ <h:commandLink action="#{skinBean.change}" value="set skin" /> <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="" itemLabel="none" /> <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> @@ -49,7 +50,7 @@ </h:form> <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> - <jsp:include page="${divBean.src}" /> + <jsp:include page="${richBean.src}" /> </div> </div> </body> Modified: trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -9,12 +9,14 @@ <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> </head> <body> +<div id="divOptionID" align="right" style="position: static; z-index: 200"> <h:form> <h:panelGrid columns="2"> <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> <h:commandLink action="#{skinBean.change}" value="set skin" /> <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="" itemLabel="none" /> <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> @@ -46,10 +48,11 @@ </h:selectOneMenu> </h:panelGrid> </h:form> + </div> <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1"> <jsp:include page="SelectOneMenuPage.jsp" /> </div> - <jsp:include page="${divBean.src}" /> + <jsp:include page="${richBean.src}" /> </body> </html> </f:view> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-21 09:04:24 UTC (rev 3035) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-21 09:04:38 UTC (rev 3036) @@ -15,7 +15,8 @@ <h:commandLink action="#{skinBean.change}" value="set skin" /> <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="" itemLabel="none" /> <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> @@ -47,7 +48,7 @@ </h:selectOneMenu> </h:panelGrid> </h:form> - <jsp:include page="${divBean.src}" /> + <jsp:include page="${richBean.src}" /> </body> </html> </f:view> \ No newline at end of file