Author: ayanul Date: 2007-10-04 15:01:18 -0400 (Thu, 04 Oct 2007) New Revision: 3262 Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java trunk/test-applications/jsp/src/main/java/effect/Effect.java trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp Log: Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -29,17 +29,19 @@ import java.util.StringTokenizer; import java.util.TimeZone; import javax.faces.event.ValueChangeEvent; +import javax.faces.webapp.UIComponentTag; + import org.richfaces.event.CurrentDateChangeEvent; public class CalendarBean { private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|", - "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" }; + "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" }; private static final String [] WEEK_DAY = new String[] { "|>Saturday*<|", "|>Monday+<|", - "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"}; - private static final String [] MOUNT_LABELS = new String[] { "January", - "February", "March", "April", "May", "June", "July", "August", - "September", "October", "November", "December" }; + "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"}; + private static final String [] MOUNT_LABELS = new String[] { "January +", + "February +", "March +", "April +", "May +", "June +", "July +", "August +", + "September +", "October +", "November +", "December +" }; private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +", "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +", "Sep +", "Oct +", "Nov +", "Dec +" }; @@ -68,7 +70,6 @@ private String boundary; private String icon; private String toolTipMode; - private String scrollMode; private String label; private String timeZone; private String mode; @@ -145,13 +146,12 @@ rendered = true; zindex = 2; toolTipMode = "none"; - scrollMode = "client"; required = false; - weekDay = "none"; + weekDay = "long"; month = "none"; mode = "client"; timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.09.2007"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } @@ -163,11 +163,9 @@ while(st.hasMoreTokens()) { date.add(Integer.parseInt(st.nextToken())); } - cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prBegin " + cal.getTime()); return cal.getTime(); - } public Date getPrDateRangeEnd() { @@ -179,7 +177,7 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prEnd " + cal.getTime()); return cal.getTime(); } @@ -219,7 +217,7 @@ public Object getWeekDayLabels() { if(weekDay.equals("long")) return CalendarBean.WEEK_DAY; - else return null; + else return null; } public Object getWeekDayLabelsShort() { @@ -234,10 +232,6 @@ else return null; } - public void weekDay(ValueChangeEvent event) { - weekDay = (String) event.getNewValue(); - } - public Object getMonthLabelsShort() { if(month.equals("short")) return CalendarBean.MOUNT_LABELS_SHORT; @@ -245,9 +239,12 @@ } + public String getMonth() { + return month; + } - public void month(ValueChangeEvent event) { - month = (String) event.getNewValue(); + public void setMonth(String month) { + this.month = month; } public String getCurrentDateAsText() { @@ -379,14 +376,6 @@ this.toolTipMode = toolTipMode; } - public String getScrollMode() { - return scrollMode; - } - - public void setScrollMode(String scrollMode) { - this.scrollMode = scrollMode; - } - public int getZindex() { return zindex; } @@ -450,4 +439,12 @@ public void setMode(String mode) { this.mode = mode; } + + public String getWeekDay() { + return weekDay; + } + + public void setWeekDay(String weekDay) { + this.weekDay = weekDay; + } } Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -55,7 +55,6 @@ protected CalendarDataModelItem createDataModelItem(Date date) { CalendarDataModelItemImpl item = new CalendarDataModelItemImpl(); - item.setDate(date); Map data = new HashMap(); DateFormat enFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH); DateFormat frFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRENCH); Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -21,8 +21,6 @@ package calendar; -import java.util.Date; - import org.richfaces.model.CalendarDataModelItem; /** @@ -33,7 +31,6 @@ public class CalendarDataModelItemImpl implements CalendarDataModelItem { private Object data; - private Date date; private String styleClass; private Object toolTip; private boolean enabled = true; @@ -46,13 +43,6 @@ } /* (non-Javadoc) - * @see org.richfaces.component.CalendarDataModelItem#getDate() - */ - public Date getDate() { - return date; - } - - /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getStyleClass() */ public String getStyleClass() { @@ -88,13 +78,6 @@ } /** - * @param date the date to set - */ - public void setDate(Date date) { - this.date = date; - } - - /** * @param styleClass the styleClass to set */ public void setStyleClass(String styleClass) { Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -1,6 +1,3 @@ -/** - * - */ package calendar; import java.util.Calendar; Modified: trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -13,7 +13,6 @@ private List mounths = new ArrayList(); private List numbers = new ArrayList(); private String align; - private String bgcolor; private String border; private String width; private String columnsWidth; @@ -22,7 +21,6 @@ public DataTable() { align = "center"; - bgcolor = "aqua"; border = "1"; width = "400px"; columnsWidth = "200px"; @@ -109,14 +107,6 @@ this.align = align; } - public String getBgcolor() { - return bgcolor; - } - - public void setBgcolor(String bgcolor) { - this.bgcolor = bgcolor; - } - public String getBorder() { return border; } Modified: trunk/test-applications/jsp/src/main/java/effect/Effect.java =================================================================== --- trunk/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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 effect; public class Effect { @@ -35,4 +56,3 @@ this.state = state; } } - Modified: trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -2,12 +2,12 @@ public class SimpleTogglePanel { - private String switchType; // "client", "server"(default), "ajax" - private String width; - private String height; + private String switchType; // "client", "server"(default), "ajax" + private String width; + private String height; - private boolean focus; - private boolean rendered; + private boolean focus; + private boolean rendered; public SimpleTogglePanel() { // TODO Auto-generated constructor stub Modified: trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java =================================================================== --- trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-04 19:01:18 UTC (rev 3262) @@ -14,6 +14,14 @@ private String style; private String layout; + public String getLayout() { + return layout; + } + + public void setLayout(String layout) { + this.layout = layout; + } + public Tooltip() { followMouse = false; rendered = true; @@ -23,6 +31,7 @@ direction = "top-right"; horizontalOffset = 0; verticalOffset = 0; + delay = 0; style = "none"; layout = "inline"; } @@ -107,12 +116,4 @@ this.delay = delay; } - public String getLayout() { - return layout; - } - - public void setLayout(String layout) { - this.layout = layout; - } - } Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-04 19:01:18 UTC (rev 3262) @@ -20,10 +20,8 @@ <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" monthLabelsShort="#{calendarBean.monthLabelsShort}" value="#{calendarBean.selectedDate}" @@ -45,16 +43,17 @@ width="#{calendarBean.width}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" - scrollMode="#{calendarBean.scrollMode}" rendered="#{calendarBean.rendered}" focus="popupModeID" - mode="#{calendarBean.mode}" + mode="#{calendarBean.mode}" required="#{calendarBean.required}" - requiredMessage="Required Message"> + requiredMessage="Required Message" + > + <f:facet name="weekDay"> - <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</span></f:verbatim> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> </f:facet> - + <f:facet name="optionalHeader"> <h:outputText value="optionalHeader Facet" /> </f:facet> @@ -92,19 +91,19 @@ onclick="submit()" /> <h:outputText value="Custom day labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.weekDay}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.weekDay}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarID"></a4j:support> </h:selectOneRadio> <h:outputText value="Custom month labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.month}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.month}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarID"></a4j:support> </h:selectOneRadio> <h:outputText value="Select Date Pattern:" /> @@ -189,12 +188,6 @@ <f:selectItem itemLabel="single" itemValue="single"/> <f:selectItem itemLabel="batch" itemValue="batch"/> </h:selectOneRadio> - - <h:outputText value="Scroll Mode:" /> - <h:selectOneRadio value="#{calendarBean.scrollMode}" onchange="submit();"> - <f:selectItem itemLabel="client" itemValue="client"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - </h:selectOneRadio> <h:outputText value="BoundaryDatesMode:" /> <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> @@ -231,11 +224,5 @@ <f:verbatim></f:verbatim> <h:commandButton value="Submit" /> </h:panelGrid> - - <f:verbatim> - <br /> - </f:verbatim> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-04 19:01:18 UTC (rev 3262) @@ -1,108 +1,106 @@ -<%@ 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="dtStyle" - 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="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> - +<%@ 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" cellpadding="" cellspacing="" + onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + 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="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/Effect/Effect.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-04 19:01:18 UTC (rev 3262) @@ -5,42 +5,48 @@ <f:subview id="effectID"> <h:messages /> - <rich:panel id="indexID"> - <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> + <h:form> + <rich:panel id="indexID"> + <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> + <f:verbatim> + <br /> + </f:verbatim> + + <h:outputText value="Menu:" /> + <h:panelGrid columns="2" > + <h:outputText value="1." /> <f:verbatim> - <br /> + <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF + Components</font></span> </f:verbatim> - - <h:outputText value="Menu:" /> - <h:panelGrid columns="2"> - <h:outputText value="1." /> - <f:verbatim> - <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF Components</font></span> - </f:verbatim> - <h:outputText value="2." /> - <f:verbatim> - <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF Component with Event and non-jsf target</font></span> - </f:verbatim> + <h:outputText value="2." /> + <f:verbatim> + <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF + Component with Event and non-jsf target</font></span> + </f:verbatim> - <h:outputText value="3." /> - <f:verbatim> - <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF Component with Event and jsf target</font></span> - </f:verbatim> + <h:outputText value="3." /> + <f:verbatim> + <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF + Component with Event and jsf target</font></span> + </f:verbatim> - <h:outputText value="4." /> - <f:verbatim> - <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF Component with Event.</font></span> - </f:verbatim> - - <h:outputText value="5." /> - <f:verbatim> - <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace Components.</font></span> - </f:verbatim> - </h:panelGrid> - </rich:panel> + <h:outputText value="4." /> + <f:verbatim> + <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF + Component with Event.</font></span> + </f:verbatim> + <h:outputText value="5." /> + <f:verbatim> + <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace + Components.</font></span> + </f:verbatim> + </h:panelGrid> + </rich:panel> + <rich:panel id="frm1"> <h:outputText value="JSF Components:" /> @@ -86,21 +92,21 @@ <h:panelGroup id="form_1b_ID"> <h:inputText value="onmouse and onclick"> - <rich:effect event="onclick" type="Highlight" + <rich:effect event="onclick" type="Fold" params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" type="Highlight" + params="duration:0.5,from:1.0,to:0.4" /> </h:inputText> </h:panelGroup> </h:panelGrid> <rich:effect for="panel_1_ID" name="hidePanel1" type="Fade" params="duration:#{effect.time}" /> - <rich:effect for="panel_1_ID" event="" name="showPanel1" type="Appear" /> + <rich:effect for="panel_1_ID" name="showPanel1" type="Appear" /> - <rich:effect for="asusID" event="" name="hideImage1" type="Fold" + <rich:effect for="asusID" name="hideImage1" type="Fold" params="duration:#{effect.time}" /> - <rich:effect for="asusID" event="" name="showImage1" type="Grow" /> + <rich:effect for="asusID" name="showImage1" type="Grow" /> <f:verbatim> <br /> @@ -108,61 +114,61 @@ </f:verbatim> </rich:panel> - <rich:panel id="frm2"> - <h:outputText - value="JSF Component with Event and non-jsf target (onclick, onmouseout)" /> + <rich:panel id="frm2"> + <h:outputText + value="JSF Component with Event and non-jsf target (onclick, onmouseout)" /> - <h:panelGrid columns="2"> - <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" - width="100" height="50"> - <rich:effect event="onclick" targetId="divID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" type="Opacity" - params="targetId:'divID',duration:0.5,from:1.0,to:0.4" /> - </h:graphicImage> + <h:panelGrid columns="2"> + <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" width="100" + height="50"> + <rich:effect event="onclick" targetId="divID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" type="Opacity" + params="targetId:'divID',duration:0.5,from:1.0,to:0.4" /> + </h:graphicImage> - <f:verbatim> - <div id="divID" - style="width: 100px; height: 50px; background-color: red"><rich:effect - event="onclick" targetId="imageID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> <rich:effect - event="onmouseout" type="Opacity" - params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div> - </f:verbatim> - </h:panelGrid> - <f:verbatim> - <br /> - <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span> + <div id="divID" + style="width: 100px; height: 50px; background-color: red"><rich:effect + event="onclick" targetId="imageID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> <rich:effect + event="onmouseout" type="Opacity" + params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div> </f:verbatim> - </rich:panel> + </h:panelGrid> - <rich:panel id="frm3"> - <h:outputText - value="JSF Component with Event and jsf target (onclick, onmouseout)" /> + <f:verbatim> + <br /> + <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span> + </f:verbatim> + </rich:panel> - <h:panelGrid id="gridID" border="1" style="background-color:green"> - <h:outputText value="Panel Content" /> - <rich:effect event="onclick" targetId="imgID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" targetId="imgID" type="Opacity" - params="duration:0.5,from:1.0,to:0.4" /> - </h:panelGrid> + <rich:panel id="frm3"> + <h:outputText + value="JSF Component with Event and jsf target (onclick, onmouseout)" /> - <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93" - height="30px"> - <rich:effect event="onmouseout" targetId="gridID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onclick" targetId="gridID" type="Opacity" - params="duration:0.5,from:1.0,to:0.4" /> - </h:graphicImage> + <h:panelGrid id="gridID" border="1" style="background-color:green"> + <h:outputText value="Panel Content" /> + <rich:effect event="onclick" targetId="imgID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" targetId="imgID" type="Opacity" + params="duration:0.5,from:1.0,to:0.4" /> + </h:panelGrid> - <f:verbatim> - <br /> - <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span> - </f:verbatim> - </rich:panel> + <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93" + height="30px"> + <rich:effect event="onmouseout" targetId="gridID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onclick" targetId="gridID" type="Opacity" + params="duration:0.5,from:1.0,to:0.4" /> + </h:graphicImage> + <f:verbatim> + <br /> + <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span> + </f:verbatim> + </rich:panel> + <rich:panel id="frm4"> <h:outputText value="1. (Event 2)" /> <h:graphicImage id="img_1_ID" value="/pics/asus.jpg" width="200px" @@ -194,9 +200,9 @@ <span onclick="hideFrm4(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> </rich:panel> - + <rich:panel id="frm5"> - <h:panelGrid id="panGrID" columns="2"> + <h:panelGrid id="panelGrdID" columns="2"> <f:verbatim> <span onclick="hideRichPanel()"><font color="blue">Hide Panel</font> </span> @@ -270,29 +276,25 @@ </f:verbatim> </rich:panel> - <rich:effect for="indexID" event="" name="hideIndexID" type="BlindUp" /> - <rich:effect for="indexID" event="" name="showIndexID" type="BlindDown" /> - <rich:effect for="frm1" event="" name="hideFrm1" type="Fade" /> - <rich:effect for="frm1" event="" name="showFrm1" type="Appear" /> + <rich:effect for="indexID" name="hideIndexID" type="SlideUp" /> + <rich:effect for="indexID" name="showIndexID" type="SlideDown" /> - <rich:effect for="frm2" event="" name="hideFrm2" type="Fade" /> - <rich:effect for="frm2" event="" name="showFrm2" type="Appear" /> + <rich:effect for="frm1" name="hideFrm1" type="Fade" /> + <rich:effect for="frm1" name="showFrm1" type="Appear" /> - <rich:effect for="frm3" event="" name="hideFrm3" type="Fade" /> - <rich:effect for="frm3" event="" name="showFrm3" type="Appear" /> - - <rich:effect for="frm4" event="" name="hideFrm4" type="Fade" /> - <rich:effect for="frm4" event="" name="showFrm4" type="Appear" /> + <rich:effect for="frm2" name="hideFrm2" type="Fade" /> + <rich:effect for="frm2" name="showFrm2" type="Appear" /> - <rich:effect for="frm5" event="" name="hideFrm5" type="Fade" /> - <rich:effect for="frm5" event="" name="showFrm5" type="Appear" /> + <rich:effect for="frm3" name="hideFrm3" type="Fade" /> + <rich:effect for="frm3" name="showFrm3" type="Appear" /> - <rich:effect for="backFrmID" event="" name="hideBackFrm" type="Fade" /> - <rich:effect for="backFrmID" event="" name="showBackFrm" type="Appear" /> - <rich:panel id="backFrmID"> - <h:commandLink value="Back" action="main"></h:commandLink> - </rich:panel> + <rich:effect for="frm4" name="hideFrm4" type="Fade" /> + <rich:effect for="frm4" name="showFrm4" type="Appear" /> + + <rich:effect for="frm5" name="hideFrm5" type="Fade" /> + <rich:effect for="frm5" name="showFrm5" type="Appear" /> + </h:form> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-04 19:01:18 UTC (rev 3262) @@ -13,13 +13,15 @@ } </style> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> <f:subview id="simpleTogglePanelID"> <h:messages></h:messages> <h:form> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" + label="simpleTogglePanel with some text" + width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" + switchType="#{simpleTogglePanel.switchType}" opened="false"> <f:facet name="closeMarker"> <h:outputText value="Close It" /> </f:facet> @@ -27,21 +29,26 @@ <h:outputText value="Open It" /> </f:facet> <f:verbatim> - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - </f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP1" headerClass="head" + label="simpleTogglePanel wiht image" + width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" + rendered="#{simpleTogglePanel.rendered}" + switchType="#{simpleTogglePanel.switchType}" opened="false"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" + width="#{simpleTogglePanel.width}" ignoreDupResponses="true" focus="#{simpleTogglePanel.focus}"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> @@ -51,14 +58,15 @@ </f:facet> <rich:simpleTogglePanel id="INsTP"> <h:panelGrid columns="2"> - <h:graphicImage value="/pics/podb109_61.jpg"></h:graphicImage> - <h:outputText - value="Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." /> + <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage> + <f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> </h:panelGrid> </rich:simpleTogglePanel> </rich:simpleTogglePanel> @@ -87,13 +95,11 @@ </h:selectOneRadio> <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> + <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" + onclick="submit()"> </h:selectBooleanCheckbox> </h:panelGrid> - - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-04 19:01:18 UTC (rev 3262) @@ -6,36 +6,43 @@ <h:messages></h:messages> <h:form id="tooggleTest"> + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" + initialState="asus" stateOrder="asus,blank" + style="width:300px!important"> + <f:facet name="blank"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_blank" + for="tooggleTest:panel1"> + <h:outputText value="Expand" style="font-weight: bold;" /> + <h:graphicImage url="/pics/collapse.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + </rich:panel> + </f:facet> - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px" > - <f:facet name="blank"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1" > - <h:outputText value="Expand" style="font-weight: bold;" /> - <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - </rich:panel> - </f:facet> - - <f:facet name="asus"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1"> - <h:outputText value="Collapse" style="font-weight: bold;" /> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <rich:toggleControl id="toggleControl_panel1" + for="tooggleTest:panel1"> + <h:outputText value="Collapse" style="font-weight: bold;" /> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" + alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -47,30 +54,35 @@ </h:panelGroup> </h:panelGrid> </rich:panel> - </f:facet> - </rich:togglePanel> - - <f:verbatim> - <br /><br /> - </f:verbatim> + </f:facet> + </rich:togglePanel> + <br /> + <br /> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}"> - <f:facet name="asus"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" + initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}"> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_1" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" + alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -83,22 +95,28 @@ </h:panelGrid> </rich:panel> </f:facet> - - <f:facet name="benq"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;"> - <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg"/> + + <f:facet name="benq"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_2" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: yellow;"> + <h:graphicImage url="/pics/benq.jpg" height="300" width="300" + alt="benq.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="BenQ A 52" /> <f:verbatim> Processor: Core Duo T2250 (1.73GHz)<br /> RAM: 1024 Mb<br /> @@ -111,22 +129,28 @@ </h:panelGrid> </rich:panel> </f:facet> - - <f:facet name="toshiba"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;"> - <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg"/> + + <f:facet name="toshiba"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_3" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: orange;"> + <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" + alt="toshiba.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Toshiba Satellite A 100-784" /> <f:verbatim> Processor: Intel Core Duo T2250 - 1.73GHz<br /> RAM: 1024 Mb<br /> @@ -138,41 +162,41 @@ </h:panelGroup> </h:panelGrid> </rich:panel> - </f:facet> - </rich:togglePanel> - - <f:verbatim> - <br /><br /> - </f:verbatim> - - <rich:separator height="5px" width="500px" /> + </f:facet> + </rich:togglePanel> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <rich:separator height="5px" width="500px" /> - <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> - <h:outputText value="InitialState:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.initialState}"> - <f:selectItem itemLabel="Asus" itemValue="asus" /> - <f:selectItem itemLabel="Benq" itemValue="benq" /> - <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> + <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> + <h:outputText value="InitialState:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.initialState}"> + <f:selectItem itemLabel="Asus" itemValue="asus" /> + <f:selectItem itemLabel="Benq" itemValue="benq" /> + <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> - <h:outputText value="StateOrder:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.stateOrder}"> - <f:selectItem itemLabel="Asus,Benq,Toshiba" itemValue="asus,benq,toshiba" /> - <f:selectItem itemLabel="Toshiba, Asus, Benq" itemValue="toshiba,asus,benq" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> + <h:outputText value="StateOrder:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.stateOrder}"> + <f:selectItem itemLabel="Asus,Benq,Toshiba" + itemValue="asus,benq,toshiba" /> + <f:selectItem itemLabel="Toshiba, Asus, Benq" + itemValue="toshiba,asus,benq" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> - <h:outputText value="switchType:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> - </h:selectOneRadio> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - <ui:debug hotkey="L"></ui:debug> + <h:outputText value="switchType:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> + </h:selectOneRadio> + </h:panelGrid> + </h:form> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-04 16:52:49 UTC (rev 3261) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-04 19:01:18 UTC (rev 3262) @@ -4,20 +4,20 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="tooltipID"> <h:form> - <h:messages /> - + <h:messages></h:messages> + <h:outputText value="DEFAULT VALUE:"></h:outputText> - + <f:verbatim> <br /> </f:verbatim> - + <h:graphicImage value="/pics/ajax_process.gif" width="15px" height="15px"> <rich:toolTip value="ajax progress"> </rich:toolTip> </h:graphicImage> - + <h:inputText value="Text" id="inp1" size="50"> <rich:toolTip value="toolTip for input text"> <f:facet name="defaultContent"> @@ -43,10 +43,10 @@ <f:verbatim> <br /> </f:verbatim> - + <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" - mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}" + <rich:toolTip id="tooltipID" value="#{tooltip.value}" + mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" @@ -59,6 +59,7 @@ <f:verbatim> <br /> </f:verbatim> + <h:panelGrid columns="2"> <h:outputText value="Text:"></h:outputText> <h:inputText value="#{tooltip.value}"> @@ -132,12 +133,6 @@ <a4j:support event="onclick" reRender="tooltipID" /> </h:selectBooleanCheckbox> </h:panelGrid> - <!-- h:inputText value="ddd" - onclick="toolTipAttach();alert(document.getElementById('lkjl'))" /--> - - </h:form> - <h:form> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> + </h:form> </f:subview>