September 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r2915 - tags/3.1.0/framework/impl/src/main/java/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-09-12 14:47:30 -0400 (Wed, 12 Sep 2007) New Revision: 2915 Modified: tags/3.1.0/framework/impl/src/main/java/org/richfaces/VersionBean.java Log: correct release number Modified: tags/3.1.0/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- tags/3.1.0/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-09-12 18:19:56 UTC (rev 2914) +++ tags/3.1.0/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-09-12 18:47:30 UTC (rev 2915) @@ -37,7 +37,7 @@ * Revision version, must be auto modified by CVS */ - public static final String REVISION = "0-SNAPSHOT" ; + public static final String REVISION = "0" ; public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$"; public static final Version _version = new Version();

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2914 - trunk/ui/calendar/src/main/templates/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: akushunin Date: 2007-09-12 14:19:56 -0400 (Wed, 12 Sep 2007) New Revision: 2914 Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: modification connected with RF-854 Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-12 18:07:27 UTC (rev 2913) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-12 18:19:56 UTC (rev 2914) @@ -14,9 +14,10 @@ <h:styles>/org/richfaces/renderkit/html/css/calendar.xcss</h:styles> <div id="#{clientId}" - style="z-index: #{ component . attributes [ 'zindex' ]" + style="z-index: #{component.attributes['zindex']}; #{component.attributes['style']}" class="#{component.attributes['styleClass']}" - x:passThruWithExclusions="value,name,type,id"><script + x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> + <script type="text/javascript"> new Calendar('#{clientId}', { submitFunction: @@ -141,18 +142,18 @@ onkeydown="#{component.attributes['oninputkeydown']}" onkeyup="#{component.attributes['oninputkeyup']}" size="#{component.attributes['inputSize']}" - style="vertical-align: middle;" + style="vertical-align: middle; #{component.attributes['inputStyle']}" class="rich-calendar-input #{component.attributes['inputClass']}" tabindex="#{component.attributes['tabindex']}"> </input> <jsp:scriptlet> <![CDATA[ - String buttonIcon = (String) component.getAttributes().get("buttonIcon"); + String buttonIcon = org.richfaces.component.util.ViewUtil.getResourceURL((String) component.getAttributes().get("buttonIcon"),context); + String buttonIconDisabled = org.richfaces.component.util.ViewUtil.getResourceURL((String) component.getAttributes().get("buttonIconDisabled"),context); String buttonLabel = (String) component.getAttributes().get("buttonLabel"); - String buttonIconDisabled = (String) component.getAttributes().get("buttonIconDisabled"); - variables.setVariable("buttonIcon",buttonIcon); variables.setVariable("buttonLabel",buttonLabel); variables.setVariable("buttonIconDisabled",buttonIconDisabled); - if(buttonLabel==null || buttonLabel.equals("")){ + variables.setVariable("buttonIcon",buttonIcon); + if(buttonLabel==null || buttonLabel.length()==0){ ]]> </jsp:scriptlet> <img id="#{clientId}PopupButton" class="rich-calendar-button #{component.attributes['buttonClass']}"

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2913 - trunk/test-applications/jsp/src/main/webapp/DataTable.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2007-09-12 14:07:27 -0400 (Wed, 12 Sep 2007) New Revision: 2913 Removed: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.xhtml Log: Deleted: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.xhtml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DT.xhtml 2007-09-12 18:06:29 UTC (rev 2912) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DT.xhtml 2007-09-12 18:07:27 UTC (rev 2913) @@ -1,124 +0,0 @@ -<h:form dir="DSform" - 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"> - - <rich:dataTable id="dataTableID" var="dataTableID" - value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" - headerClass="header" footerClass="footer" - onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> - <f:facet name="caption"> - <h:outputText value="caption" /> - </f:facet> - <f:facet name="header"> - <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> - <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> - <h:outputText value="2-row head" /> - </rich:column> - <h:column rendered="#{dataTable.r2rendered}"> - <h:outputText value="head in UIColumn" /> - </h:column> - <rich:column breakBefore="true"> - <h:outputText value="2-d row head" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <f:facet name="footer"> - <h:outputText value="table foot" /> - </f:facet> - <rich:columnGroup> - <rich:column id="mounth" styleClass="column" rowspan="2" - headerClass="cheader" footerClass="cfooter"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.mounth}" /> - </rich:column> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.town}" /> - </rich:column> - </rich:columnGroup> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> - </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> - <rich:column id="name"> - <h:outputText value="#{detail.name}" /> - </rich:column> - <rich:column id="qty" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{detail.qty}" /> - </rich:column> - </rich:subTable> - <rich:column id="total" styleClass="total" colspan="2"> - <h:outputText value="#{dataTableID.total}" /> - </rich:column> - </rich:dataTable> - - <h:panelGrid columns="2"> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{dataTable.align}"> - <f:selectItem itemLabel="center" itemValue="*center" /> - <f:selectItem itemLabel="left" itemValue="*left" /> - <f:selectItem itemLabel="right " itemValue="*right" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Border: "></h:outputText> - <h:inputText value="#{dataTable.border}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Columns Width: "></h:outputText> - <h:inputText value="#{dataTable.columnsWidth}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{dataTable.width}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{dataTable.bgcolor}"> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="rendered:" /> - <h:selectBooleanCheckbox value="#{dataTable.rendered}" - onclick="submit();" /> - - <h:outputText value=" row 2 rendered" /> - <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" - onclick="submit();" /> - </h:panelGrid> - - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> -

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2912 - in trunk/test-applications/jsp/src/main: java/div and 31 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2007-09-12 14:06:29 -0400 (Wed, 12 Sep 2007) New Revision: 2912 Added: trunk/test-applications/jsp/src/main/java/rich/ trunk/test-applications/jsp/src/main/java/rich/Rich.java trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp Removed: trunk/test-applications/jsp/src/main/webapp/Div/ Modified: trunk/test-applications/jsp/src/main/java/div/DivBean.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/ 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/main.jsp Log: update Modified: trunk/test-applications/jsp/src/main/java/div/DivBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-09-12 18:06:29 UTC (rev 2912) @@ -1,72 +1,18 @@ package div; public class DivBean { - private String [] src = { - "/Calendar/Calendar.jsp", - "/DataFilterSlider/DataFilterSlider.jsp", - "/DataScroller/DS.jsp", - "/DradAndDrop/DragAndDrop.jsp", - "/DropDownMenu/DDMenu.jsp", - "/Effect/Effect.jsp", - "/Gmap/Gmap.jsp", - "/inputNumberSlider/inputNumberSlider.jsp", - "/inputNumberSpinner/inputNumberSpinner.jsp", - "/Insert/Insert.jsp", - "/Message/Message.jsp", - "/ModalPanel/ModalPanel.jsp", - "/Paint2D/Paint2D.jsp", - "/Panel/Panel.jsp", - "/Panel/panel2.jsp", - "/PanelBar/PanelBar.jsp", - "/PanelMenu/PanelMenu.jsp", - "/Separator/Separator.jsp", - "/SimpleTogglePanel/SimpleTogglePanel.jsp", - "/Spacer/Spacer.jsp", - "/SuggestionBox/SuggestionBox.jsp", - "/TabPanel/TabPanel.jsp", - "/TogglePanel/TogglePanel.jsp", - "/ToolBar/ToolBar.jsp", - "/Tooltip/Tooltip.jsp", - "/Tree/Tree.jsp", - "/VirtualEarth/VirtualEarth.jsp" - }; - private String [] left = {"500px", "-480px"}; - private String [] top = {"300px", "-280px"}; - private int current = 0; - public int getCurrent() { - return current; - } + private String src; - public void setCurrent(int current) { - this.current = current; - } - public DivBean() { - + src = "/Calendar/Calendar.jsp"; } - - public String[] getSrc() { + + public String getSrc() { return src; } - public void setSrc(String[] src) { + public void setSrc(String src) { this.src = src; } - - 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; - } } Added: trunk/test-applications/jsp/src/main/java/rich/Rich.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/Rich.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/rich/Rich.java 2007-09-12 18:06:29 UTC (rev 2912) @@ -0,0 +1,7 @@ +package rich; + +import java.util.ArrayList; + +public class Rich { + +} Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -1,16 +1,10 @@ -<%@ page pageEncoding="UTF-8" %> - <%@ 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" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd"> -<f:view> -<html> - <head> - <title></title> - <style type="text/css"> + <f:subview id="calendarID"> + <style type="text/css"> .smallText { font-size: xx-small; } @@ -22,14 +16,10 @@ background-color: #0087FF; } </style> - </head> - <f:subview id="calendarID"> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> <h:form> - <br /> - <br /> <rich:calendar id="calendar" dataModel="#{calendarDataModel}" @@ -134,5 +124,3 @@ </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,10 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> <style type="text/css"> body{ @@ -52,8 +48,6 @@ </style> - -</head> <f:subview id="dfsID"> <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" @@ -135,6 +129,4 @@ </a4j:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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"%> -<f:view> - <html> - <head> - <title></title> - </head> <f:subview id="dataScrollerID"> <h:form dir="DSform"> @@ -70,6 +65,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - </html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -1,130 +1,124 @@ -<%@ 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/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:view> - <html> - <head> - <title></title> - </head> - <f:subview id="DataTableID"> - <h:form> - - <rich:dataTable id="dataTableID" var="dataTableID" - value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" - headerClass="header" footerClass="footer" - onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> - <f:facet name="caption"> - <h:outputText value="caption" /> - </f:facet> - <f:facet name="header"> - <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> - <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> - <h:outputText value="2-row head" /> - </rich:column> - <h:column rendered="#{dataTable.r2rendered}"> - <h:outputText value="head in UIColumn" /> - </h:column> - <rich:column breakBefore="true"> - <h:outputText value="2-d row head" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <f:facet name="footer"> - <h:outputText value="table foot" /> - </f:facet> - <rich:columnGroup> - <rich:column id="mounth" styleClass="column" rowspan="2" - headerClass="cheader" footerClass="cfooter"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.mounth}" /> - </rich:column> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.town}" /> - </rich:column> - </rich:columnGroup> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> - </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> - <rich:column id="name"> - <h:outputText value="#{detail.name}" /> - </rich:column> - <rich:column id="qty" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{detail.qty}" /> - </rich:column> - </rich:subTable> - <rich:column id="total" styleClass="total" colspan="2"> - <h:outputText value="#{dataTableID.total}" /> - </rich:column> - </rich:dataTable> - - <h:panelGrid columns="2"> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{dataTable.align}"> - <f:selectItem itemLabel="center" itemValue="*center" /> - <f:selectItem itemLabel="left" itemValue="*left" /> - <f:selectItem itemLabel="right " itemValue="*right" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Border: "></h:outputText> - <h:inputText value="#{dataTable.border}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Columns Width: "></h:outputText> - <h:inputText value="#{dataTable.columnsWidth}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{dataTable.width}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{dataTable.bgcolor}"> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="rendered:" /> - <h:selectBooleanCheckbox value="#{dataTable.rendered}" - onclick="submit();" /> - - <h:outputText value=" row 2 rendered" /> - <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" - onclick="submit();" /> - </h:panelGrid> - - </h:form> - </f:subview> - </html> -</f:view> +<%@ 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/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + <f:subview id="DataTableID"> + <h:form> + + <rich:dataTable id="dataTableID" var="dataTableID" + value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" + headerClass="header" footerClass="footer" + onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}" + border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> + <f:facet name="caption"> + <h:outputText value="caption" /> + </f:facet> + <f:facet name="header"> + <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> + <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> + <h:outputText value="2-row head" /> + </rich:column> + <h:column rendered="#{dataTable.r2rendered}"> + <h:outputText value="head in UIColumn" /> + </h:column> + <rich:column breakBefore="true"> + <h:outputText value="2-d row head" /> + </rich:column> + </rich:columnGroup> + </f:facet> + <f:facet name="footer"> + <h:outputText value="table foot" /> + </f:facet> + <rich:columnGroup> + <rich:column id="mounth" styleClass="column" rowspan="2" + headerClass="cheader" footerClass="cfooter"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.mounth}" /> + </rich:column> + <rich:column styleClass="column" headerClass="cheader" + footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.town}" /> + </rich:column> + </rich:columnGroup> + <rich:column styleClass="column" headerClass="cheader" + footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{dataTableID.day}" /> + </rich:column> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> + <rich:column id="name"> + <h:outputText value="#{detail.name}" /> + </rich:column> + <rich:column id="qty" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{detail.qty}" /> + </rich:column> + </rich:subTable> + <rich:column id="total" styleClass="total" colspan="2"> + <h:outputText value="#{dataTableID.total}" /> + </rich:column> + </rich:dataTable> + + <h:panelGrid columns="2"> + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{dataTable.align}"> + <f:selectItem itemLabel="center" itemValue="*center" /> + <f:selectItem itemLabel="left" itemValue="*left" /> + <f:selectItem itemLabel="right " itemValue="*right" /> + <a4j:support event="onclick" reRender="dataTableID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Border: "></h:outputText> + <h:inputText value="#{dataTable.border}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Columns Width: "></h:outputText> + <h:inputText value="#{dataTable.columnsWidth}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{dataTable.width}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Background Colour"></h:outputText> + <h:selectOneMenu value="#{dataTable.bgcolor}"> + <f:selectItem itemLabel="aqua" itemValue="aqua" /> + <f:selectItem itemLabel="blue" itemValue="blue" /> + <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> + <f:selectItem itemLabel="gray" itemValue="gray" /> + <f:selectItem itemLabel="lime" itemValue="lime" /> + <f:selectItem itemLabel="maroon" itemValue="maroon" /> + <f:selectItem itemLabel="purple" itemValue="purple" /> + <f:selectItem itemLabel="red" itemValue="red" /> + <f:selectItem itemLabel="silver" itemValue="silver" /> + <f:selectItem itemLabel="teal" itemValue="teal" /> + <f:selectItem itemLabel="yellow" itemValue="yellow" /> + <f:selectItem itemLabel="white" itemValue="white" /> + <a4j:support event="onclick" reRender="dataTableID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="rendered:" /> + <h:selectBooleanCheckbox value="#{dataTable.rendered}" + onclick="submit();" /> + + <h:outputText value=" row 2 rendered" /> + <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" + onclick="submit();" /> + </h:panelGrid> + + </h:form> + </f:subview> + Modified: trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,10 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> <style type="text/css"> .dropzoneDecoration { width: 70px; height: 70px; border: 2px dotted navy; @@ -21,7 +17,7 @@ padding: 10px; } </style> -</head> + <f:subview id="dndID"> <h:form id="form"> <h:panelGroup id="dragValueText"> @@ -186,6 +182,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> -</head> <f:subview id="ddMenuID"> <h:form> <h:panelGrid columns="3"> @@ -148,5 +143,4 @@ </h:panelGrid> </h:form> </f:subview> -</html> -</f:view> + Modified: trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -3,13 +3,6 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> - <html> - <head> - <title></title> - </head> - - <body onload="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"> <f:subview id="effectID"> <h:messages /> <h:form id="indexID"> @@ -295,6 +288,5 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</body> -</html> -</f:view> + + Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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"%> -<f:view> - <html> - <head> - <title></title> - </head> <f:subview id="gmapID"> <h:form> <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" @@ -105,5 +100,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - </html> -</f:view> \ No newline at end of file + Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<link rel="stylesheet" - href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="inputNumgerSliderID"> <h:messages></h:messages> <h:form> @@ -115,6 +109,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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" %> -<f:view> -<html> - <head> - <title></title> - <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> - </head> <f:subview id="inputNumgerSpinnerID"> <h:form> <h:messages></h:messages> @@ -80,6 +74,4 @@ </h:panelGrid> <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> - <html> - <head> - <title></title> - </head> - <f:subview id="insertID"> <h:form> <h:messages /> @@ -52,5 +46,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - </html> -</f:view> \ No newline at end of file + Modified: trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> - <html> - <head> - <link rel="stylesheet" type="text/css" href="/styles/app.css" /> - <title></title> - </head> <f:subview id="messageID"> <h:form> <rich:panel> @@ -170,6 +164,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - </html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -3,12 +3,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" - href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="modalPanel"> <h:form id="MPform"> @@ -76,6 +70,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="paint2D"> <h:form> @@ -96,5 +90,4 @@ </h:form> </f:subview> -</html> -</f:view> + Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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" %> -<f:view> -<html> - <head> - <title></title> - </head> <f:subview id="panelID"> <h:form> <h:messages></h:messages> @@ -64,6 +59,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,10 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> <style> .panel { vertical-align:top; @@ -50,7 +46,6 @@ } </style> -</head> <f:subview id="Panel2ID"> <h:panelGrid columnClasses="panel" border="0" columns="3"> @@ -150,6 +145,4 @@ <h:commandLink value="Back to Panel" action="BackP"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="panelBarID"> <h:messages></h:messages> <h:form> @@ -67,6 +61,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,10 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> <style> .sPanel { @@ -18,7 +14,6 @@ background: gray; } </style> -</head> <f:subview id="panelMenuID"> <h:form> @@ -468,5 +463,4 @@ </h:form> </f:subview> -</html> -</f:view> \ No newline at end of file + Modified: trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="separatorID"> <h:form> <h:messages></h:messages> @@ -69,6 +63,4 @@ </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,10 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> <style type="text/css"> .head { @@ -18,7 +14,6 @@ </style> <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="simpleTogglePanelID"> <h:messages></h:messages> <h:form> @@ -101,6 +96,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,10 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> <style type="text/css"> .text { @@ -16,7 +12,6 @@ background-color: aqua; } </style> -</head> <f:subview id="spacerID"> <h:messages></h:messages> @@ -59,6 +54,5 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> + Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,8 +2,6 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:view> -<html> <f:subview id="suggestionBoxID"> <h:form id="suggestionbox_form"> @@ -126,6 +124,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,16 +2,6 @@ <%@ 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"%> -<f:view> - -<html> -<head> -<title></title> -<style type="text/css"> - -</style> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="tabPanelID"> <h:form> <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}" @@ -111,6 +101,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:view> -<html> -<head> -<title></title> -</head> <f:subview id="togglePanel"> <h:messages></h:messages> @@ -180,6 +175,4 @@ <ui:debug hotkey="L"></ui:debug> </h:form> </f:subview> -</html> -</f:view> Modified: trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,12 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> <f:subview id="toolBarID"> <h:form> @@ -64,5 +58,4 @@ </h:form> </f:subview> -</html> -</f:view> + Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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"%> -<f:view> - <html> - <head> - <title></title> - </head> <f:subview id="tooltipID"> <h:form> <h:messages /> @@ -145,5 +140,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - </html> -</f:view> + Modified: trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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"%> -<f:view> -<html> -<head> -<title></title> -</head> <f:subview id="treeID"> <h:form> @@ -121,5 +116,4 @@ </h:form> </f:subview> -</html> -</f:view> + Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -2,11 +2,6 @@ <%@ 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"%> -<f:view> - <html> - <head> - <title></title> - </head> <f:subview id="virtualEarth"> <h:form> <h:panelGrid columns="2"> @@ -81,5 +76,4 @@ <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - </html> -</f:view> + Property changes on: trunk/test-applications/jsp/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.jsfdia lib Added: 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 (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-09-12 18:06:29 UTC (rev 2912) @@ -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>rich</managed-bean-name> + <managed-bean-class>rich.Rich</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-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-12 18:06:29 UTC (rev 2912) @@ -114,8 +114,12 @@ </navigation-case> <navigation-case> <from-outcome>TestDiv</from-outcome> - <to-view-id>/Div/Div.jsp</to-view-id> + <to-view-id>/pages/Div.jsp</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>RichTest</from-outcome> + <to-view-id>/pages/RichTest.jsp</to-view-id> + </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>*</from-view-id> 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-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-09-12 18:06:29 UTC (rev 2912) @@ -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</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-Div.xml,/WEB-INF/faces-config-RichTest.xml</param-value> </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> Added: trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -0,0 +1,57 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <h:form> + <h:panelGrid columns="2"> + <jsp:include page="SelectOneMenuPage.jsp" /> + <h:panelGroup> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> + <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> + <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> + <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> + </h:selectOneMenu> + </h:panelGroup> + </h:panelGrid> + </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}" /> + </div> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -0,0 +1,53 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <h:form> + <h:panelGrid columns="2"> + <jsp:include page="SelectOneMenuPage.jsp" /> + <h:panelGroup> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> + <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> + <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> + <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> + </h:selectOneMenu> + </h:panelGroup> + </h:panelGrid> + </h:form> + <jsp:include page="${divBean.src}" /> +</body> +</html> +</f:view> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -0,0 +1,28 @@ +<%@ 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/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<f:subview id="selectOneMenuPage"> + <h:selectOneMenu value="menu" style="width:900px;" > + <f:selectItem itemLabel="1" itemValue="test"/> + <f:selectItem itemLabel="2" itemValue="test"/> + <f:selectItem itemLabel="3" itemValue="test"/> + <f:selectItem itemLabel="4" itemValue="test"/> + <f:selectItem itemLabel="5" itemValue="test"/> + <f:selectItem itemLabel="6" itemValue="test"/> + <f:selectItem itemLabel="7" itemValue="test"/> + <f:selectItem itemLabel="8" itemValue="test"/> + <f:selectItem itemLabel="9" itemValue="test"/> + <f:selectItem itemLabel="10" itemValue="test"/> + <f:selectItem itemLabel="11" itemValue="test"/> + <f:selectItem itemLabel="12" itemValue="test"/> + <f:selectItem itemLabel="13" itemValue="test"/> + <f:selectItem itemLabel="14" itemValue="test"/> + <f:selectItem itemLabel="15" itemValue="test"/> + <f:selectItem itemLabel="16" itemValue="test"/> + <f:selectItem itemLabel="17" itemValue="test"/> + <f:selectItem itemLabel="18" itemValue="test"/> + <f:selectItem itemLabel="19" itemValue="test"/> + <f:selectItem itemLabel="20" itemValue="test"/> + </h:selectOneMenu> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/pages/main.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-12 17:58:02 UTC (rev 2911) +++ trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-12 18:06:29 UTC (rev 2912) @@ -19,34 +19,8 @@ value="VCP 3.1.0 Test Application (JSF 1.1 RI)" styleClass="maintext"></h:outputText></div> <rich:panel> <h:panelGrid columns="2" cellpadding="5px"> - <h:commandLink value="InputNumberSpinner" action="Spinner"></h:commandLink> - <h:commandLink value="InputNumberSlider" action="Slider"></h:commandLink> - <h:commandLink value="Panel" action="Panel"></h:commandLink> - <h:commandLink value="PanelBar" action="PanelBar"></h:commandLink> - <h:commandLink value="Gmap" action="Gmap"></h:commandLink> - <h:commandLink value="Virtual Earth" action="VirtualEarth"></h:commandLink> - <h:commandLink value="Separator" action="Separator"></h:commandLink> - <h:commandLink value="Spacer" action="Spacer"></h:commandLink> - <h:commandLink value="SimpleTogglePanel" action="sTP"></h:commandLink> - <h:commandLink value="TabPanel" action="TabPanel"></h:commandLink> - <h:commandLink value="Pain2D" action="Paint2D"></h:commandLink> - <h:commandLink value="Tree" action="Tree"></h:commandLink> - <h:commandLink value="TogglePanel" action="TogglePanel"></h:commandLink> - <h:commandLink value="ToolBar" action="ToolBar"></h:commandLink> - <h:commandLink value="ModalPanel" action="MP"></h:commandLink> - <h:commandLink value="Drop Down Menu" action="DDM"></h:commandLink> - <h:commandLink value="SuggestionBox" action="Suggest"></h:commandLink> - <h:commandLink value="Drag And Drop" action="DnD"></h:commandLink> - <h:commandLink value="Data Scroller" action="DS"></h:commandLink> - <h:commandLink value="Data Table" action="DT"></h:commandLink> - <h:commandLink value="Data Filter Slider" action="DFS"></h:commandLink> - <h:commandLink value="Panel Menu" action="PanelMenu"></h:commandLink> - <h:commandLink value="Tooltip" action="Tooltip"></h:commandLink> - <h:commandLink value="Calendar" action="Calendar"></h:commandLink> - <h:commandLink value="Message" action="Message"></h:commandLink> - <h:commandLink value="Effect" action="Effect"></h:commandLink> - <h:commandLink value="Insert" action="Insert"></h:commandLink> <h:commandLink value="Test Div" action="TestDiv"></h:commandLink> + <h:commandLink value="Rich Test" action="RichTest"></h:commandLink> </h:panelGrid> </rich:panel> </h:form>

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2911 - trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-09-12 13:58:02 -0400 (Wed, 12 Sep 2007) New Revision: 2911 Added: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java Log: JUnit tests for MediaOutputRenderer class. Added: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java (rev 0) +++ trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java 2007-09-12 17:58:02 UTC (rev 2911) @@ -0,0 +1,140 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.renderkit.html; + +import javax.faces.FacesException; +import javax.faces.component.UIForm; +import javax.faces.component.UIParameter; +import javax.faces.component.html.HtmlForm; + +import org.ajax4jsf.component.UIMediaOutput; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +public class MediaOutputRendererTest extends AbstractAjax4JsfTestCase { + UIForm form = null; + UIMediaOutput media1 = null; + UIMediaOutput media2 = null; + UIMediaOutput media3 = null; + UIMediaOutput media4 = null; + UIMediaOutput media5 = null; + + public MediaOutputRendererTest(String name) { + super(name); + } + + public void setUp() throws Exception { + super.setUp(); + + application.addComponent("org.ajax4jsf.MMedia", "org.ajax4jsf.component.html.MediaOutput"); + + form = new HtmlForm(); + form.setId("form"); + facesContext.getViewRoot().getChildren().add(form); + + media1 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); + media1.setId("media1"); + media1.setElement("a"); + media1.setUriAttribute("href"); + form.getChildren().add(media1); + + media2 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); + media2.setId("media2"); + media2.setElement("img"); + media2.setUriAttribute("src"); + form.getChildren().add(media2); + + media3 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); + media3.setId("media3"); + media3.setElement("object"); + media3.setUriAttribute("data"); + form.getChildren().add(media3); + + media4 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); + media4.setId("media4"); + media4.setElement("a"); + UIParameter param = new UIParameter(); + param.setName("name"); + param.setValue("value"); + media4.getChildren().add(param); + form.getChildren().add(media4); + + media5 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); + media5.setId("media5"); + } + + public void tearDown() throws Exception { + super.tearDown(); + + media1 = null; + media2 = null; + media3 = null; + media4 = null; + media5 = null; + form = null; + } + + public void testRender() throws Exception { + HtmlPage page = renderView(); + assertNotNull(page); + System.out.println(page.asXml()); + + HtmlElement a = page.getHtmlElementById(media1.getClientId(facesContext)); + assertNotNull(a); + assertEquals("a", a.getTagName()); + String href = a.getAttributeValue("href"); + assertNotNull(href); + + HtmlElement img = page.getHtmlElementById(media2.getClientId(facesContext)); + assertNotNull(img); + assertEquals("img", img.getTagName()); + String src = img.getAttributeValue("src"); + assertNotNull(src); + + HtmlElement object = page.getHtmlElementById(media3.getClientId(facesContext)); + assertNotNull(object); + assertEquals("object", object.getTagName()); + String data = object.getAttributeValue("data"); + assertNotNull(data); + + // Rendering without uriAttribute + HtmlElement a2 = page.getHtmlElementById(media4.getClientId(facesContext)); + assertNotNull(a2); + assertEquals("a", a2.getTagName()); + String href2 = a2.getAttributeValue("href"); + assertNotNull(href2); + assertTrue(href2.endsWith("name=value")); + } + + public void testRenderWithoutElement() throws Exception { + form.getChildren().add(media5); + try { + renderView(); + assertTrue("'element' is undefined but exception was not thrown", false); + } catch (FacesException e) { + + } + } + +}

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2910 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2007-09-12 13:42:49 -0400 (Wed, 12 Sep 2007) New Revision: 2910 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties Log: Content added. Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties 2007-09-12 17:06:02 UTC (rev 2909) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties 2007-09-12 17:42:49 UTC (rev 2910) @@ -1,6 +1,25 @@ 1=Daniel Defo 1.1=Robinson Crusoe 1.1.1=Start In Life +1.1.2=Slavery And Escape +1.1.3=Wrecked On A Desert Island +1.1.4=First Weeks On The Island +1.1.5=Builds A House - The Journal +1.1.6=Ill And Conscience-Stricken +1.1.7=Agricultural Experience +1.1.8=Surveys His Position +1.1.9=A Boat +1.1.10=Tames Goats +1.1.11=Finds Print Of Man's Foot On The Sand +1.1.12=A Cave Retreat +1.1.13=Wreck Of A Spanish Ship +1.1.14=A Dream Realised +1.1.15=Friday's Education +1.1.16=Rescue Of Prisoners From Cannibals +1.1.17=Visit Of Mutineers +1.1.18=The Ship Recovered +1.1.19=Return To England +1.1.20=Fight Between Friday And A Bear 2=Edgar Allan Poe 2.1=Plays 2.1.1=Politian @@ -24,6 +43,22 @@ 3.1.5=IV. Hiawatha and Mudjekeewis 3.1.6=V. Hiawatha's Fasting 3.1.7=VI. Hiawatha's Friends +3.1.8=VII. Hiawatha's Sailing +3.1.9=VIII. Hiawatha's Fishing +3.1.10=IX. Hiawatha and the Pearl-Feather +3.1.11=X. Hiawatha's Wooing +3.1.12=XI. Hiawatha's Wedding-Feast +3.1.13=XII. The Son of the Evening Star +3.1.14=XIII. Blessing the Cornfields +3.1.15=XIV. Picture-Writing +3.1.16=XV. Hiawatha's Lamentation +3.1.17=XVI. Pau-Puk-Keewis +3.1.18=XVII. The Hunting of Pau-Puk-Keewis +3.1.19=XVIII. The Death of Kwasind +3.1.20=XIX. The Ghosts +3.1.21=XX. The Famine +3.1.22=XXI. The White Man's Foot +3.1.23=XXII. Hiawatha's Departure 3.2=Poetry 3.2.1=A Psalm Of Life 3.2.2=Birds Of Passage

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2909 - in trunk/samples/richfaces-demo/src/main/webapp: templates/include and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2007-09-12 13:06:02 -0400 (Wed, 12 Sep 2007) New Revision: 2909 Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml Log: scrolls from navigation removed Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2007-09-12 16:45:13 UTC (rev 2908) +++ trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2007-09-12 17:06:02 UTC (rev 2909) @@ -198,7 +198,11 @@ } .ico{ cursor : pointer; - padding:1px 3px 1px 3px; + padding-top:1px; + padding-right:3px; + padding-bottom:1px; + padding-left:3px; + } .component_name{ Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-09-12 16:45:13 UTC (rev 2908) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-09-12 17:06:02 UTC (rev 2909) @@ -7,7 +7,7 @@ <ui:composition> <rich:panel styleClass="panel_menu"> -<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="530" width="100%"> +<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="550" width="100%"> <rich:panelBarItem id="ajaxSupport" label="Ajax Support"> <ui:include src="/templates/include/components-group.xhtml" > <ui:param name="components" value="#{componentNavigator.ajaxSupport}" />

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2908 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: ajaxAttributes/snippets and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2007-09-12 12:45:13 -0400 (Wed, 12 Sep 2007) New Revision: 2908 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml Log: Some visual improvements. http://jira.jboss.com/jira/secure/EditIssue!default.jspa?id=12344894 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1 @@ +<a4j:commandButton value="Update" data="#{userBean.name}" oncomplete="showTheName(data.name)" /> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,3 @@ +<h:inputText value="#{userBean.name}"> + <a4j:support event="onkeyup" eventsQueue="foo" reRender="bar" /> +</h:inputText> \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,3 @@ +<a4j:outputPanel ajaxRendered="true"> + <h:messages /> +</a4j:outputPanel> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,7 @@ +... +<a4j:commandButton value="update" reRender="infoBlock"/> + .... +<h:panelGrid id="infoBlock"> + ..... +</h:panelGrid> +..... \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,17 @@ +..... +<h:form id="form1"> + .... + <a4j:commandButton value="Usual Way" reRender="infoBlock, infoBlock2" /> + <a4j:commandButton value="Shortcut" reRender=":infoBlockl,:sv:infoBlock2" /> + ..... +</h:form> +<h:panelGrid id="infoBlock"> + ..... +</h:panelGrid> +..... +<f:subview id="sv"> + <h:panelGrid id="infoBlock2"> + ..... + </h:panelGrid> + ..... +</f:subview> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-09-12 15:35:12 UTC (rev 2907) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -7,6 +7,21 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + ol{ + font-size:12px !important; + } + </style> <p>This section overviews the attributes that are common for Ajax components such as a4j:support, a4j:commandButton, a4j:jsFunction, a4j:poll, a4j:push and so @@ -26,17 +41,9 @@ attribute is an id of the JSF component or an id list. This is a simple example: </p> - <div class="esample"> - <pre> -... -<a4j:commandButton value="update" reRender="<b>infoBlock</b>" /> -.... -<h:panelGrid id="<b>infoBlock</b>"> -..... -</h:panelGrid> -..... - </pre> - </div> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/reRender2.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> reRender uses <a target="_blank" href="http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api/javax/faces/c..."> UIComponent.findComponent()</a> algorithm (with some additional exceptions) @@ -46,28 +53,9 @@ found mentioning it more precisely. The following example shows the difference in approaches (both buttons will work successfully): </p> - <div class="esample"> - <pre> -..... -<h:form id="form1"> - .... - <a4j:commandButton value="Usual Way" reRender="<b>infoBlock</b>, <b>infoBlock2</b>" /> - <a4j:commandButton value="Shortcut" reRender="<b>:infoBlockl</b>,<b>:sv:infoBlock2</b>" /> -..... -</h:form> -<h:panelGrid id="<b>infoBlock</b>"> -..... -</h:panelGrid> -..... -<f:subview id="<b>sv</b>"> -<h:panelGrid id="<b>infoBlock2</b>"> -..... -</h:panelGrid> -..... -</f:subview> - </pre> - </div> - + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/reRender3.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> You can use JSF EL expression as a value of the reRender attribute. It might be a property of types Set, Collection, Array or simple String. The EL for reRender is resolved right before the @@ -88,14 +76,10 @@ explicitly. It might be useful if you have an area on a page that should be updated as a response on any Ajax request. For example, the following code allows to output error messages regardless of what Ajax request causes the Validation phase failed. - </p> - <div class="esample"> - <pre> -<a4j:outputPanel <b>ajaxRendered="true"</b>> - <h:messages /> -</a4j:outputPanel> - </pre> - </div> + </p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/reRender1.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> <b>limitToList</b> attribute allows to dismiss the behavior of the a4j:outputPanel ajaxRendered attribute. limitToList = "false" means to update only the area(s) that mentioned in the @@ -119,14 +103,10 @@ the requests produced by the same event. For example, according to the following code, only the newest request will be sent to the server if a user types very fast and has typed the several characters already before the previous Ajax Response is back. - </p> -<div class="esample"> - <pre> -<h:inputText value="<span>#</span>{userBean.name}"> - <a4j:support event="onkeyup" <b>eventsQueue="foo"</b> reRender="bar" /> -</h:inputText> - </pre> - </div> + </p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/eventqueue.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p><b>requestDelay</b> attribute defines the time (in ms.) that the request will be wait in the queue before it is ready to send. When the delay time is over, the request will be sent to the server or removed if the newest 'similar' request is in a queue already . @@ -200,7 +180,7 @@ the Validation phase is passed successfully, you can replace h:commandButton with a4j:commandButton and point to the action method that navigates to the next page. If Validation process fails, the partial page update will occur and a user will see an error message. Otherwize, the application - proceeds to the next page. Make sure, you define <redirect /%gt; option for the navigation rule to + proceeds to the next page. Make sure, you define <redirect /> option for the navigation rule to avoid memory leaks. </li> </ol> @@ -237,11 +217,9 @@ will be serialized in JSON format and be available on the client side. You can refer to it using the 'data' variable. For example: </p> - <div class="esample"> - <pre> -<a4j:commandButton value="Update" data="<span>#</span>{userBean.name}" oncomplete="showTheName(data.name)" /> - </pre> - </div> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/data.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> Richfaces allows to serialize not only primitive types into JSON format, but also complex types including arrays and collections. The beans should be serializable to be refered Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,7 @@ +... +<a4j:commandButton value="update" reRender="infoBlock"/> + .... +<h:panelGrid id="<b>infoBlock</b>"> + ..... +</h:panelGrid> +..... \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-09-12 15:35:12 UTC (rev 2907) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -9,6 +9,17 @@ <ui:define name="sample"> <style type="text/css"> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + input[type="button"], input[type="submit"] { background-color:#{a4jSkin.trimColor}; } @@ -30,7 +41,9 @@ when user clicks this link later. The example of problematic code is below. To fix the code, you need to replace h:form with a4j:form and h:commandLink with a4j:htmlCommandLink. - <rich:insert src="/richfaces/form/snippets/commandLinkProblem.xhtml" highlight="xhtml"/> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/form/snippets/commandLinkProblem.xhtml" highlight="xhtml"/> + </rich:panel> </p> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2007-09-12 15:35:12 UTC (rev 2907) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -7,7 +7,22 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style type="text/css"> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + input[type="button"], input[type="submit"] { + background-color:#{a4jSkin.trimColor}; + } + </style> <p>a4j:htmlCommandLink functionality is similar to the standard h:commandLink component except the additional feature. </p> @@ -22,7 +37,9 @@ then updated via Ajax. Such problems could be solved with the a4j:htmlCommandLink usage. Necessary fields are encoded even when the link is not rendered initially. Hence it may be Ajax updated and parameters work correctly. </p> - <rich:insert highlight="xhtml" src="/richfaces/htmlCommandLink/snippets/commandLinkProblem.xhtml"></rich:insert> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="xhtml" src="/richfaces/htmlCommandLink/snippets/commandLinkProblem.xhtml"></rich:insert> + </rich:panel> </ui:define> </ui:composition> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,8 @@ +<html> + <head> +  + </head> + <body> +  + </body> +</html> \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -0,0 +1,8 @@ +<f:view> + <a4j:page> + <f:facet name="head"> +  + </f:facet> +  + </a4j:page> +</f:view> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2007-09-12 15:35:12 UTC (rev 2907) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -7,6 +7,22 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style type="text/css"> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + + input[type="button"], input[type="submit"] { + background-color:#{a4jSkin.trimColor}; + } + </style> <p> <b><a4j:page></b> is a deprecated component used for solving of incompatibility problems in early Ajax4jsf and MyFaces versions. @@ -19,29 +35,15 @@ <p> This component should be defined as a child component for <f:view> For example: </p> - <p> -<pre><f:view> - <a4j:page> - <f:facet name="head"> -  - </f:facet> -  - </a4j:page> -</f:view></pre> - </p> - <p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/page/snippets/page.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> + <p> Will be rendered as: </p> - <p> -<pre><HTML> - <HEAD> -  - </HEAD> -<body > -  -</body> -</HTML></pre> - </p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/page/snippets/gen.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml 2007-09-12 15:35:12 UTC (rev 2907) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml 2007-09-12 16:45:13 UTC (rev 2908) @@ -7,6 +7,19 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + + </style> <p> The <a4j:push> periodically perform AJAX request to server, to simulate 'push' data. </p> @@ -22,16 +35,22 @@ for call push request. Simple example of usage: </p> <p> - Page code: - <rich:insert highlight="xhtml" src="/richfaces/push/snippets/page.xhtml"/> + <i>Page code:</i> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="xhtml" src="/richfaces/push/snippets/page.xhtml"/> + </rich:panel> </p> <p> - Code for registration of listener: - <rich:insert highlight="java" src="/richfaces/push/snippets/listenerReg.java"/> + <i>Code for registration of listener:</i> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="java" src="/richfaces/push/snippets/listenerReg.java"/> + </rich:panel> </p> <p> - Component can get message using current code: - <rich:insert highlight="java" src="/richfaces/push/snippets/listenermessage.java"/> + <i>Component can get message using current code:</i> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="java" src="/richfaces/push/snippets/listenermessage.java"/> + </rich:panel> </p> <p> Thus, component 'push' uses asynchronous model instead of polls.

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2907 - in trunk/samples/richfaces-demo/src/main: java/org/richfaces/demo/pmenu and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2007-09-12 11:35:12 -0400 (Wed, 12 Sep 2007) New Revision: 2907 Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml Log: Panel Mene example updated. Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-09-12 15:35:12 UTC (rev 2907) @@ -0,0 +1,38 @@ +package org.richfaces.demo.pmenu; + +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; + +import org.richfaces.component.UIPanelMenuItem; + +public class PanelMenu { + private String current; + private boolean singleMode; + public boolean isSingleMode() { + return singleMode; + } + + public void setSingleMode(boolean singleMode) { + this.singleMode = singleMode; + } + + public PanelMenu() { + } + + public String getCurrent() { + return this.current; + } + + public void setCurrent(String current) { + this.current = current; + } + public String updateCurrent() { + FacesContext context=FacesContext.getCurrentInstance(); + setCurrent(context.getExternalContext().getRequestParameterMap().get("current")); + System.out.println("fake called."); + return null; + } + public void updateCurrent(ActionEvent event) { + setCurrent(((UIPanelMenuItem)event.getComponent()).getLabel().toString()); + } +} Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-09-12 15:21:57 UTC (rev 2906) +++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-09-12 15:35:12 UTC (rev 2907) @@ -158,18 +158,18 @@ <property-class>java.lang.String</property-class> <value>Paint 2D</value> </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>simpleTreeBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.SimpleTreeBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> </managed-bean> - <managed-bean> - <managed-bean-name>library</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.Library</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> <managed-bean> + <managed-bean-name>simpleTreeBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.SimpleTreeBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>library</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.Library</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> <managed-bean-name>dndBean</managed-bean-name> <managed-bean-class>org.richfaces.demo.dnd.DndBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> @@ -234,6 +234,21 @@ <managed-bean-class>org.richfaces.datatable.UpdateBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>panelMenu</managed-bean-name> + <managed-bean-class>org.richfaces.demo.pmenu.PanelMenu</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>current</property-name> + <property-class>java.lang.String</property-class> + <value>Nothing</value> + </managed-property> + <managed-property> + <property-name>singleMode</property-name> + <property-class>java.lang.Boolean</property-class> + <value>true</value> + </managed-property> + </managed-bean> <navigation-rule> <from-view-id>/richfaces/include/examples/wstep1.xhtml</from-view-id> <navigation-case> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2007-09-12 15:21:57 UTC (rev 2906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2007-09-12 15:35:12 UTC (rev 2907) @@ -5,36 +5,74 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <a4j:status startText="start" /> - - - <rich:panelMenu style="width:200px" submitMode="ajax" + + <style> + .top{ + vertical-align:top; + } + </style> + <h:form id="form"> + <h:panelGrid columns="2" columnClasses="top"> + <rich:panelMenu style="width:200px" mode="ajax" iconExpandedGroup="disc" iconCollapsedGroup="disc" iconExpandedTopGroup="triangleUp" iconGroupTopPosition="right" iconCollapsedTopGroup="triangle" iconCollapsedTopPosition="right" > <rich:panelMenuGroup label="Group 1"> - <rich:panelMenuItem label="Item 1.1"/> - <rich:panelMenuItem label="Item 1.2"/> - <rich:panelMenuItem label="Item 1.3"/> + <rich:panelMenuItem label="Item 1.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 1.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 1.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 1.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 1.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 1.3"/> + </rich:panelMenuItem> </rich:panelMenuGroup> <rich:panelMenuGroup label="Group 2"> - <rich:panelMenuItem label="Item 2.1"/> - <rich:panelMenuItem label="Item 2.2"/> - <rich:panelMenuItem label="Item 2.3"/> + <rich:panelMenuItem label="Item 2.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.3"/> + </rich:panelMenuItem> <rich:panelMenuGroup label="Group 2.4"> - <rich:panelMenuItem label="Item 2.4.1"/> - <rich:panelMenuItem label="Item 2.4.2"/> - <rich:panelMenuItem label="Item 2.4.3"/> + <rich:panelMenuItem label="Item 2.4.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.4.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.4.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.4.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.4.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.4.3"/> + </rich:panelMenuItem> </rich:panelMenuGroup> - <rich:panelMenuItem label="Item 2.5"/> + <rich:panelMenuItem label="Item 2.5" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.5"/> + </rich:panelMenuItem> </rich:panelMenuGroup> <rich:panelMenuGroup label="Group 3"> - <rich:panelMenuItem label="Item 3.1"/> - <rich:panelMenuItem label="Item 3.2"/> - <rich:panelMenuItem label="Item 3.3"/> + <rich:panelMenuItem label="Item 3.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 3.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 3.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 3.3"/> + </rich:panelMenuItem> </rich:panelMenuGroup> - </rich:panelMenu> - - + <rich:panel> + <f:facet name="header"> + <h:outputText value="Current selection"/> + </f:facet> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText value="#{panelMenu.current} selected" id="current"/> + </a4j:outputPanel> + </rich:panel> + </h:panelGrid> + </h:form> </ui:composition> \ No newline at end of file

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r2906 - trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2007-09-12 11:21:57 -0400 (Wed, 12 Sep 2007) New Revision: 2906 Modified: trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js Log: RF-890 Modified: trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js =================================================================== --- trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-09-12 15:06:37 UTC (rev 2905) +++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-09-12 15:21:57 UTC (rev 2906) @@ -59,8 +59,10 @@ this.iframe = $(this.id + 'iframe'); } - if(!this.disabled) Event.observe(document, "mousemove", this.attachOnLoadEvents.bindAsEventListener(this), true); - //it means we have only one tooltip for elements + this.attachOnLoadEventsListner = this.attachOnLoadEvents.bindAsEventListener(this); + + if(!this.disabled) Event.observe(document, "mousemove", this.attachOnLoadEventsListner, true); + //it means we have only one tooltip for element Richfaces.tooltips[parentId] = this; }, attachOnLoadEvents: function(){ @@ -70,7 +72,7 @@ this.attachParentEvents(); this.parentAttached = true; } - Event.stopObserving(document, "mousemove", this.attachOnLoadEvents.bindAsEventListener(this), false); + Event.stopObserving(document, "mousemove", this.attachOnLoadEventsListner, true); } }, attachParentEvents: function(){ @@ -276,6 +278,12 @@ var coords = this.fitToolTip(e.clientX, e.clientY, {'x':toolTipX , 'y':toolTipY},elementDim, horizontalDirection, verticalDirection, {'x':this.horizontalOffset, 'y':this.verticalOffset}); Element.setStyle(this.toolTip, {"left": coords.x + "px", "top": coords.y + "px"}); + if(this.iframe) + { + this.iframe.style.top = (coords.y - this.toolTipBorderHeight) + 'px'; + this.iframe.style.left = (coords.x - this.toolTipBorderWidth) + 'px'; + } + this.eventCopy = null; if (this.delay>0) { @@ -404,11 +412,11 @@ this.activationTimerHandle = undefined; this.toolTip.style.display = "block"; this.toolTip.style.visibility = "visible"; - if(this.iframe){ - this.iframe.style.top = parseInt(this.toolTip.style.top) - this.toolTipBorderHeight; - this.iframe.style.left = parseInt(this.toolTip.style.left) - this.toolTipBorderWidth; - this.iframe.style.display = "block"; - } + if(this.iframe) + { + this.iframe.style.display = "block"; + } + if(runOnComplete){ this.oncomplete(window.event); }

18 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits September 2007