[richfaces-svn-commits] JBoss Rich Faces SVN: r3703 - in branches/3.1.x/test-applications/facelets/src/main: java/calendar and 53 other directories.

Author: ayanul Date: 2007-11-02 06:11:55 -0400 (Fri, 02 Nov 2007) New Revision: 3703 Added: branches/3.1.x/test-applications/facelets/src/main/java/jQuery/ branches/3.1.x/test-applications/facelets/src/main/java/util/ branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ branches/3.1.x/test-applications/facelets/src/main/java/util/phaseTracker/ branches/3.1.x/test-applications/facelets/src/main/java/util/skins/ branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/ branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/RichTest.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-jQuery.xml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/DataScroller.java branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java branches/3.1.x/test-applications/facelets/src/main/java/gmap/Gmap.java branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java branches/3.1.x/test-applications/facelets/src/main/java/message/Message.java branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java branches/3.1.x/test-applications/facelets/src/main/java/paint2D/PaintData.java branches/3.1.x/test-applications/facelets/src/main/java/panel/Panel.java branches/3.1.x/test-applications/facelets/src/main/java/panelBar/PanelBar.java branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java branches/3.1.x/test-applications/facelets/src/main/java/tabPanel/TabPanel.java branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skin.xml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css Log: add straightforward add events test fix Calendar(add mode: ajax, server, location) Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -29,6 +29,7 @@ import java.util.StringTokenizer; import java.util.TimeZone; +import javax.el.ValueExpression; import javax.faces.event.ValueChangeEvent; import org.richfaces.event.CurrentDateChangeEvent; @@ -47,6 +48,7 @@ "Sep +", "Oct +", "Nov +", "Dec +" }; private Locale locale; + private TimeZone tZone; private boolean popup; private boolean readonly; private boolean showInput; @@ -58,12 +60,12 @@ private boolean required; private Date currentDate; private Date selectedDate; + private String headerFacet; + private String mode; private String preloadDateRangeBegin; private String preloadDateRangeEnd; private String weekDay; private String month; - private String height; - private String width; private String pattern; private String jointPoint; private String direction; @@ -74,8 +76,43 @@ private String timeZone; private int zindex; private int counter; + + public CalendarBean() { + mode = "client"; + label = "Button label"; + locale = new Locale("us","US",""); + popup = true; + pattern = "MMM d, yyyy"; + jointPoint = "bottom-left"; + direction = "bottom-right"; + readonly = true; + enableManualInput = false; + showInput = true; + boundary = "inactive"; + icon = null; + disabled = false; + bypassUpdates = false; + rendered = true; + zindex = 2; + toolTipMode = "none"; + required = false; + weekDay = "long"; + month = "none"; + timeZone = "Eastern European Time"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y + preloadDateRangeEnd = "11.10.2007"; + } - + public boolean getRenderedAjax() { + if(mode.equalsIgnoreCase("ajax") && rendered) return true; + else return false; + } + + public boolean getRenderedClient() { + if(mode.equalsIgnoreCase("client") && rendered) return true; + else return false; + } + public String getTimeZone() { return timeZone; } @@ -118,32 +155,14 @@ this.pattern = pattern; } - - public CalendarBean() { - height = "400px"; - width = "400px"; - label = "Button label"; - locale = Locale.US; - popup = true; - pattern = "MMM d, yyyy"; - jointPoint = "bottom-left"; - direction = "bottom-right"; - readonly = true; - enableManualInput = false; - showInput = true; - boundary = "inactive"; - icon = null; - disabled = false; - bypassUpdates = false; - rendered = true; - zindex = 2; - toolTipMode = "none"; - required = false; - weekDay = "long"; - month = "none"; - timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.08.2007"; //d.m.y - preloadDateRangeEnd = "11.10.2007"; + + public void selectLocale(ValueChangeEvent event) { + String tLocale = (String) event.getNewValue(); + if (tLocale != null) { + String lang = tLocale.substring(0, 2); + String country = tLocale.substring(3); + locale = new Locale(lang, country, ""); + } } public Date getPrDateRangeBegin() { @@ -154,7 +173,6 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println("prBegin " + cal.getTime()); return cal.getTime(); } @@ -166,7 +184,6 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println("prEnd " + cal.getTime()); return cal.getTime(); } @@ -280,7 +297,6 @@ public void dcl(CurrentDateChangeEvent event) { System.out.println(event.getCurrentDateString()); - System.out.println("ajvhckndskncs"); } public void ddd(ValueChangeEvent event) { @@ -325,14 +341,6 @@ this.bypassUpdates = bypassUpdates; } - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - public boolean isRendered() { return rendered; } @@ -357,14 +365,6 @@ this.zindex = zindex; } - public String getWidth() { - return width; - } - - public void setWidth(String width) { - this.width = width; - } - public boolean isRequired() { return required; } @@ -383,9 +383,7 @@ public TimeZone getTmZone() { TimeZone tZone = TimeZone.getDefault(); - System.out.println("timeZone" + timeZone + " tZone " + tZone); tZone.setID(timeZone); - System.out.println("timeZone" + timeZone + " tZone " + tZone); return tZone; } @@ -412,4 +410,139 @@ public void setWeekDay(String weekDay) { this.weekDay = weekDay; } + + public void setMode(String mode) { + this.mode = mode; + } + + public String getMode() { + return mode; + } + public void bTest1() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 1"); + setLocale(new Locale("de","DE","")); + setDirection("bottom-left"); + setEnableManualInput(false); + setDisabled(false); + setJointPoint("top-right"); + setMonth("long"); + setPattern("dd-MM-yyyy"); + setPopup(true); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("11.01.2008"); + setReadonly(true); + setRequired(true); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("long"); + setZindex(3); + } + + public void bTest2() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 2"); + setLocale(new Locale("fr","FR","")); + setDirection("top-right"); + setEnableManualInput(true); + setDisabled(false); + setJointPoint("bottom-left"); + setMonth("none"); + setPattern("dd.MM.yyyy"); + setPopup(true); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("12.01.2008"); + setReadonly(true); + setRequired(true); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("none"); + setZindex(3); + } + + public void bTest3() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 3"); + setLocale(new Locale("ru","RU","")); + setDirection("bottom-left"); + setEnableManualInput(false); + setDisabled(false); + setJointPoint("top-right"); + setMonth("long"); + setPattern("dd-MM-yyyy"); + setPopup(false); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("11.01.2008"); + setReadonly(false); + setRequired(false); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("long"); + setZindex(3); + } + + public void bTest4() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 4"); + setLocale(new Locale("de","DE","")); + setDirection("bottom-left"); + setEnableManualInput(false); + setDisabled(true); + setJointPoint("top-right"); + setMonth("long"); + setPattern("dd-MM-yyyy"); + setPopup(false); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("11.01.2008"); + setReadonly(false); + setRequired(false); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("none"); + setZindex(3); + } + + public void bTest5() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 5"); + setLocale(new Locale("de","DE","")); + setDirection("bottom-right"); + setEnableManualInput(false); + setDisabled(false); + setJointPoint("bottom-left"); + setMonth("none"); + setPattern("d/M/yy"); + setPopup(true); + setPreloadDateRangeBegin("09.09.2007"); + setPreloadDateRangeEnd("10.01.2008"); + setReadonly(false); + setRequired(true); + setShowInput(true); + setToolTipMode("none"); + setWeekDay("short"); + setZindex(1); + } + + public String getHeaderFacet() { + return headerFacet; + } + + public void setHeaderFacet(String headerFacet) { + this.headerFacet = headerFacet; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/DataScroller.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -51,7 +51,7 @@ dataTable = new ArrayList(); - for(int i=0;i<40;i++) + for(int i=0;i<1000;i++) { dataTable.add(new Data("Random",i)); } @@ -129,7 +129,43 @@ this.limitToList = limitToList; } - - + public void bTest1(){ + setAlign("left"); + setFastControls("auto"); + setLimitToList(false); + setMaxPages(20); + setRenderIfSinglePage(true); + } + public void bTest2(){ + setAlign("right"); + setFastControls("show"); + setLimitToList(false); + setMaxPages(30); + setRenderIfSinglePage(false); + } + + public void bTest3(){ + setAlign("center"); + setFastControls("hide"); + setLimitToList(false); + setMaxPages(10); + setRenderIfSinglePage(true); + } + + public void bTest4(){ + setAlign("center"); + setFastControls("auto"); + setLimitToList(true); + setMaxPages(30); + setRenderIfSinglePage(false); + } + + public void bTest5(){ + setAlign("left"); + setFastControls("show"); + setLimitToList(false); + setMaxPages(40); + setRenderIfSinglePage(true); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -138,4 +138,44 @@ public void setR2rendered(boolean r2rendered) { this.r2rendered = r2rendered; } + + public void bTest1() { + setAlign("center"); + setBorder("4px"); + setC1rendered(false); + setColumnsWidth("300px"); + setWidth("500px"); + } + + public void bTest2() { + setAlign("left"); + setBorder("0px"); + setC1rendered(true); + setColumnsWidth("500px"); + setWidth("300px"); + } + + public void bTest3() { + setAlign("right"); + setBorder("5px"); + setC1rendered(true); + setColumnsWidth("100px"); + setWidth("200px"); + } + + public void bTest4() { + setAlign("center"); + setBorder("4px"); + setC1rendered(false); + setColumnsWidth("500px"); + setWidth("500px"); + } + + public void bTest5() { + setAlign("center"); + setBorder("4px"); + setC1rendered(false); + setColumnsWidth("400px"); + setWidth("800px"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -178,4 +178,79 @@ public void setMode(String mode) { this.mode = mode; } + + public void bTest1(){ + setDirection("top-right"); + setEvent("onmouseover"); + setGroupDirection("top-up"); + setHideDelay(5); + setHorizontalOffset(1); + setHorizontalOffset(1); + setVerticalOffset(1); + setJointPoint("1px"); + setMode("none"); + setPopupWidth("300px"); + setShowDelay(1); + setDisabled(false); + } + + public void bTest2(){ + setDirection("bottom-right"); + setEvent("onclick"); + setGroupDirection("bottom-left"); + setHideDelay(5); + setShowDelay(5); + setHorizontalOffset(20); + setHorizontalOffset(20); + setVerticalOffset(20); + setJointPoint("bottom-right"); + setMode("ajax"); + setPopupWidth("200px"); + setDisabled(false); + } + + public void bTest3(){ + setDirection("bottom-left"); + setEvent("onmouseover"); + setGroupDirection("top-up"); + setHideDelay(10); + setShowDelay(10); + setHorizontalOffset(5); + setHorizontalOffset(5); + setVerticalOffset(5); + setJointPoint("top-left"); + setMode("server"); + setPopupWidth("50px"); + setDisabled(false); + } + + public void bTest4(){ + setDirection("top-left"); + setEvent("onmouseover"); + setGroupDirection("auto"); + setHideDelay(0); + setShowDelay(0); + setHorizontalOffset(0); + setHorizontalOffset(0); + setVerticalOffset(0); + setJointPoint("0px"); + setMode("ajax"); + setPopupWidth("auto"); + setDisabled(true); + } + + public void bTest5(){ + setDirection("auto"); + setEvent("onmouseover"); + setGroupDirection("auto"); + setHideDelay(1); + setShowDelay(5); + setHorizontalOffset(2); + setHorizontalOffset(2); + setVerticalOffset(2); + setJointPoint("auto"); + setMode("ajax"); + setPopupWidth("auto"); + setDisabled(true); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/gmap/Gmap.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/gmap/Gmap.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/gmap/Gmap.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -44,11 +44,11 @@ } public String getDragging() { - System.out.println("aaa" + dragging); + return dragging; } public void setDragging(String dragging) { - this.dragging = dragging; + this.dragging = dragging; } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,5 +1,6 @@ package inputNumberSlider; +import javax.faces.event.ValueChangeEvent; import javax.faces.event.ValueChangeListener; public class InputNumberSlider { @@ -54,8 +55,8 @@ showBoundaryValues=true; } - public void changeListener(ValueChangeListener event) { - System.out.println(event.toString()); + public void changeListener(ValueChangeEvent event) { + System.out.println("valueChangeListener " + event.toString()); } public boolean isDisabled() { @@ -273,4 +274,70 @@ this.value = value; } + public void bTest1(){ + setMinValue("0"); + setMaxValue("9"); + setInputSize(1); + setInputPosition("right"); + setEnableManualInput(true); + setValue("3"); + setShowInput(true); + setStep("1"); + setShowToolTip(true); + setShowBoundaryValues(true); + setShowInput(true); + } + + public void bTest2(){ + setMinValue("1000"); + setMaxValue("99999"); + setInputSize(10); + setInputPosition("left"); + setEnableManualInput(false); + setValue("99999"); + setShowInput(true); + setStep("50"); + setShowToolTip(false); + setShowBoundaryValues(true); + setShowInput(true); + } + + public void bTest3(){ + setMinValue("101"); + setMaxValue("203"); + setInputSize(4); + setInputPosition("left"); + setEnableManualInput(false); + setValue("102"); + setShowInput(true); + setStep("2"); + setShowToolTip(false); + setShowBoundaryValues(true); + } + + public void bTest4(){ + setMinValue("10"); + setMaxValue("12"); + setInputSize(2); + setInputPosition("left"); + setEnableManualInput(false); + setValue("102"); + setShowInput(false); + setStep("2"); + setShowToolTip(false); + setShowBoundaryValues(true); + } + + public void bTest5(){ + setMinValue("-99999"); + setMaxValue("99999"); + setInputSize(15); + setInputPosition("right"); + setEnableManualInput(true); + setValue("103"); + setShowInput(true); + setStep("2"); + setShowToolTip(false); + setShowBoundaryValues(false); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -4,18 +4,19 @@ // private String size; // private String controlPosition; - private int inputSize; - private String max; - private String min; - private String value; - private String step; - private String inputStyle; - private String style; - private String btnLabel = "ON"; - private boolean cycled; - private boolean disabled; - private boolean manualInput; - private boolean rendered; + private int inputSize; + private int tabindex; + private String max; + private String min; + private String value; + private String step; + private String inputStyle; + private String style; + private String btnLabel = "ON"; + private boolean cycled; + private boolean disabled; + private boolean manualInput; + private boolean rendered; public InputNumberSpinner() { // size= "200"; @@ -47,9 +48,10 @@ } } + /* - * public String getControlPosition() { return controlPosition; } public void - * setControlPosition(String controlPosition) { this.controlPosition = + * public String getControlPosition() { return controlPosition; } public + * void setControlPosition(String controlPosition) { this.controlPosition = * controlPosition; } */ @@ -154,4 +156,66 @@ this.inputSize = inputSize; } + public int getTabindex() { + return tabindex; + } + + public void setTabindex(int tabindex) { + this.tabindex = tabindex; + } + + public void bTest1(){ + setCycled(true); + setManualInput(true); + setInputSize(5); + setMin("0"); + setMax("20"); + setStep("1"); + setTabindex(2); + setValue("1"); + } + + public void bTest2(){ + setCycled(false); + setManualInput(false); + setInputSize(10); + setMin("1000"); + setMax("99999"); + setStep("255"); + setTabindex(5); + setValue("5555"); + } + + public void bTest3(){ + setCycled(true); + setManualInput(false); + setInputSize(3); + setMin("101"); + setMax("202"); + setStep("2"); + setTabindex(2); + setValue("102"); + } + + public void bTest4(){ + setCycled(false); + setManualInput(true); + setInputSize(4); + setMin("33"); + setMax("66"); + setStep("11"); + setTabindex(3); + setValue("55"); + } + + public void bTest5(){ + setCycled(true); + setManualInput(true); + setInputSize(15); + setMin("-99999"); + setMax("99999"); + setStep("33"); + setTabindex(5); + setValue("101"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/message/Message.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/message/Message.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/message/Message.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -7,8 +7,12 @@ private boolean showDetail; private boolean showSummary; private boolean tooltip; + private String select1; + private String select2; + private String select3; + private String select4; + private String select5; - public Message() { msg = "select1"; layout = "table"; @@ -16,6 +20,11 @@ showDetail = true; showSummary = false; tooltip = true; + select1 = "error"; + select2 = "error"; + select3 = "error"; + select4 = "error"; + select5 = "error"; } public String getMsg() { @@ -65,4 +74,114 @@ public void setTitle(String title) { this.title = title; } + + public String getSelect1() { + return select1; + } + + public void setSelect1(String select1) { + this.select1 = select1; + } + + public String getSelect2() { + return select2; + } + + public void setSelect2(String select2) { + this.select2 = select2; + } + + public String getSelect3() { + return select3; + } + + public void setSelect3(String select3) { + this.select3 = select3; + } + + public String getSelect4() { + return select4; + } + + public void setSelect4(String select4) { + this.select4 = select4; + } + + public String getSelect5() { + return select5; + } + + public void setSelect5(String select5) { + this.select5 = select5; + } + + public void bTest1(){ + setLayout("table"); + setMsg("fatal"); + setShowDetail(true); + setShowSummary(true); + setTitle("Test1"); + setTooltip(true); + setSelect1("error"); + setSelect2("fatal"); + setSelect3("warn"); + setSelect4("info"); + setSelect5("passed"); + } + + public void bTest2(){ + setLayout("table"); + setMsg("error"); + setShowDetail(false); + setShowSummary(true); + setTitle("Test2"); + setTooltip(true); + setSelect1("error"); + setSelect2("fatal"); + setSelect3("fatal"); + setSelect4("passed"); + setSelect5("passed"); + } + + public void bTest3(){ + setLayout("table"); + setMsg("passed"); + setShowDetail(true); + setShowSummary(false); + setTitle("Test3"); + setTooltip(true); + setSelect1("error"); + setSelect2("error"); + setSelect3("passed"); + setSelect4("error"); + setSelect5("passed"); + } + + public void bTest4(){ + setLayout("table"); + setMsg("passed"); + setShowDetail(true); + setShowSummary(true); + setTitle("Test4"); + setTooltip(false); + setSelect1("warn"); + setSelect2("warn"); + setSelect3("warn"); + setSelect4("warn"); + setSelect5("warn"); + } + + public void bTest5(){ + setLayout("table"); + setMsg("warn"); + setShowDetail(false); + setShowSummary(false); + setTitle("Test5"); + setTooltip(false); + setSelect1("passed"); + setSelect2("fatal"); + setSelect3("error"); + setSelect4("passed"); + setSelect5("warn"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -71,5 +71,49 @@ public void setWidth(int width) { this.width = width; } + + public void bTest1(){ + setHeight(300); + setWidth(450); + setMinHeight(250); + setMinWidth(400); + setMoveable(false); + setResizeable(false); + } + public void bTest2(){ + setHeight(350); + setWidth(400); + setMinHeight(400); + setMinWidth(450); + setMoveable(true); + setResizeable(false); + } + + public void bTest3(){ + setHeight(400); + setWidth(300); + setMinHeight(400); + setMinWidth(300); + setMoveable(true); + setResizeable(true); + } + + public void bTest4(){ + setHeight(450); + setWidth(450); + setMinHeight(450); + setMinWidth(450); + setMoveable(false); + setResizeable(true); + } + + public void bTest5(){ + setHeight(900); + setWidth(800); + setMinHeight(700); + setMinWidth(600); + setMoveable(true); + setResizeable(true); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -15,9 +15,9 @@ public class Paint2D { - private static int size = 100; private static float location = 150; - + + PaintData data = new PaintData(); private int width; private int height; private String title; @@ -66,8 +66,8 @@ } public void paint(Graphics2D g2, Object obj) { - PaintData data = (PaintData) obj; - int testLenght = data.text.length(); + data.setText(((PaintData) obj).getText()); + int testLenght = data.getText().length(); int fontSize = testLenght < 8 ? 40 : 40 - (testLenght - 8); if (fontSize < 12) fontSize = 12; Font font = new Font("Serif", Font.HANGING_BASELINE, fontSize); @@ -78,7 +78,7 @@ g2.translate(x, y); g2.setPaint(Color.BLUE); - g2.drawString(data.text, 0, 0); + g2.drawString(data.getText(), 0, 0); } public int getHeight() { @@ -153,14 +153,6 @@ this.location = location; } - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - public boolean isRendered() { return rendered; } @@ -176,4 +168,69 @@ public void setStyle(boolean style) { this.style = style; } + + public void bTest1(){ + setAlign("top"); + setBgcolor("gray"); + setBorder("3"); + setFormat("gif"); + setHeight(300); + setWidth(300); + setVspace("15"); + setHspace("15"); + setTitle("Test1"); + //data.setText("Test1!"); + } + + public void bTest2(){ + setAlign("middle"); + setBgcolor("yellow"); + setBorder("1"); + setFormat("png"); + setHeight(400); + setWidth(300); + setVspace("0"); + setHspace("15"); + setTitle("Test2"); + //data.setText("Test2!"); + } + + public void bTest3(){ + setAlign("left"); + setBgcolor("lime"); + setBorder("10"); + setFormat("jpeg"); + setHeight(300); + setWidth(400); + setVspace("15"); + setHspace("0"); + setTitle("Test3"); + //data.setText("Test3!"); + } + + public void bTest4(){ + setAlign("right"); + setBgcolor("teal"); + setBorder("3"); + setFormat("gif"); + setHeight(400); + setWidth(600); + setVspace("0"); + setHspace("0"); + setTitle("Test4"); + //data.setText("Test4!"); + } + + public void bTest5(){ + setAlign("botton"); + setBgcolor("fuchsia"); + setBorder("3"); + setFormat("png"); + setHeight(400); + setWidth(450); + setVspace("-5"); + setHspace("-5"); + setTitle("Test5"); + //data.setText("Test5!"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/paint2D/PaintData.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/paint2D/PaintData.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/paint2D/PaintData.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -3,7 +3,7 @@ import java.io.Serializable; public class PaintData implements Serializable{ - String text; + private String text; public PaintData() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/panel/Panel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/panel/Panel.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/panel/Panel.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -57,6 +57,36 @@ else for(int i = 0; i < title.length; i++) title[i] = t + "_" + i; - } + + public void bTest1(){ + setWidth("500px"); + setHeight("300px"); + setTitle(new String [] {"Test1", "Test 1", "Test_1", "Test-1"}); + } + + public void bTest2(){ + setWidth("500px"); + setHeight("600px"); + setTitle(new String [] {"Test2", "Test 2", "Test_2", "Test-2"}); + } + + public void bTest3(){ + setWidth("50%"); + setHeight("300px"); + setTitle(new String [] {"Test3", "Test 3", "Test_3", "Test-3"}); + } + + public void bTest4(){ + setWidth("400px"); + setHeight("10%"); + setTitle(new String [] {"Test4", "Test 4", "Test_4", "Test-4"}); + } + + public void bTest5(){ + setWidth("400px"); + setHeight("400px"); + setTitle(new String [] {"Test5", "Test 5", "Test_5", "Test-5"}); + } + } Modified: branches/3.1.x/test-applications/facelets/src/main/java/panelBar/PanelBar.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/panelBar/PanelBar.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/panelBar/PanelBar.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -121,4 +121,33 @@ this.btnLabel = btnLabel; } + public void bTest1(){ + setWidth("500px"); + setHeight("300px"); + setLabel(new String [] {"Test1", "Test 1", "Test_1", "Test-1"}); + } + + public void bTest2(){ + setWidth("500px"); + setHeight("600px"); + setLabel(new String [] {"Test2", "Test 2", "Test_2", "Test-2"}); + } + + public void bTest3(){ + setWidth("50%"); + setHeight("300px"); + setLabel(new String [] {"Test3", "Test 3", "Test_3", "Test-3"}); + } + + public void bTest4(){ + setWidth("400px"); + setHeight("10%"); + setLabel(new String [] {"Test4", "Test 4", "Test_4", "Test-4"}); + } + + public void bTest5(){ + setWidth("400px"); + setHeight("400px"); + setLabel(new String [] {"Test5", "Test 5", "Test_5", "Test-5"}); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -129,4 +129,112 @@ public void setInputText(String inputText) { this.inputText = inputText; } + + public void bTest1(){ + icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); + + setWidth("400px"); + setAlign("right"); + setDisabled(false); + setExpandMode("ajax"); + setExpandSingle(false); + setIconGroupPosition("left"); + setIconGroupTopPosition("right"); + setIconItemPosition("left"); + setIconItemTopPosition("right"); + setMode("ajax"); + setTabIndex("3"); + } + + public void bTest2(){ + icon.setCollapsed(icon.iconExpand); + icon.setExpanded(icon.iconCollapse); + icon.setItem(icon.iconHeader); + icon.setIcon(icon.iconFileManagerReject); + icon.setCollapsedGroup(icon.iconAjaxStoped); + icon.setDisabledGroup(icon.iconAjaxProcess); + + setWidth("250px"); + setAlign("bottom"); + setDisabled(false); + setExpandMode("server"); + setExpandSingle(false); + setIconGroupPosition("right"); + setIconGroupTopPosition("left"); + setIconItemPosition("right"); + setIconItemTopPosition("left"); + setMode("server"); + setTabIndex("2"); + } + + public void bTest3(){ + icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); + + setWidth("400px"); + setAlign("middle"); + setDisabled(false); + setExpandMode("server"); + setExpandSingle(false); + setIconGroupPosition("right"); + setIconGroupTopPosition("right"); + setIconItemPosition("right"); + setIconItemTopPosition("left"); + setMode("none"); + setTabIndex("2"); + + } + + public void bTest4(){ + icon.setCollapsed(icon.iconExpand); + icon.setExpanded(icon.iconCollapse); + icon.setItem(icon.iconHeader); + icon.setIcon(icon.iconFileManagerReject); + icon.setCollapsedGroup(icon.iconAjaxStoped); + icon.setDisabledGroup(icon.iconAjaxProcess); + + setWidth("250px"); + setAlign("top"); + setDisabled(true); + setExpandMode("none"); + setExpandSingle(false); + setIconGroupPosition("left"); + setIconGroupTopPosition("left"); + setIconItemPosition("left"); + setIconItemTopPosition("left"); + setMode("ajax"); + setTabIndex("2"); + + } + + public void bTest5(){ + icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); + + setWidth("250px"); + setAlign("right"); + setDisabled(false); + setExpandMode("none"); + setExpandSingle(true); + setIconGroupPosition("right"); + setIconGroupTopPosition("right"); + setIconItemPosition("right"); + setIconItemTopPosition("right"); + setMode("none"); + setTabIndex("2"); + + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -5,7 +5,7 @@ private String switchType; // "client", "server"(default), "ajax" private String width; private String height; - + private String position = "right"; private boolean focus; private boolean rendered; @@ -56,4 +56,42 @@ public void setFocus(boolean focus) { this.focus = focus; } + + public void bTest1(){ + setHeight("80px"); + setWidth("300px"); + setSwitchType("ajax"); + } + + public void bTest2(){ + setHeight("10%"); + setWidth("100%"); + setSwitchType("client"); + } + + public void bTest3(){ + setHeight("80px"); + setWidth("100%"); + setSwitchType("server"); + } + + public void bTest4(){ + setHeight("10%"); + setWidth("200px"); + setSwitchType("client"); + } + + public void bTest5(){ + setHeight("400px"); + setWidth("250px"); + setSwitchType("client"); + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -25,7 +25,7 @@ private String bgColor; private String shadowDepth; private boolean focus; - private boolean check; + private boolean reRender; private static final String[] cit = { "Abba", "Abbeville", "Acworth", @@ -120,14 +120,6 @@ this.cellspacing = cellspacing; } - public boolean isCheck() { - return check; - } - - public void setCheck(boolean check) { - this.check = check; - } - public int getFirst() { return first; } @@ -265,4 +257,68 @@ this.reRender = reRender; } + public void bTest1(){ + setBorder("2"); + setCellpadding("0"); + setCellspacing("0"); + setFrequency("0"); + setHeight("150"); + setWidth("200"); + setMinchars("1"); + setShadowDepth("11"); + setShadowOpacity("3"); + setZindex("3"); + } + + public void bTest2(){ + setBorder("0"); + setCellpadding("3"); + setCellspacing("3"); + setFrequency("2"); + setHeight("200"); + setWidth("200"); + setMinchars("1"); + setShadowDepth("1"); + setShadowOpacity("7"); + setZindex("3"); + } + + public void bTest3(){ + setBorder("1"); + setCellpadding("5"); + setCellspacing("0"); + setFrequency("1"); + setHeight("150"); + setWidth("200"); + setMinchars("2"); + setShadowDepth("1"); + setShadowOpacity("7"); + setZindex("3"); + } + + public void bTest4(){ + setBorder("1"); + setCellpadding("0"); + setCellspacing("5"); + setFrequency("3"); + setHeight("150"); + setWidth("200"); + setMinchars("2"); + setShadowDepth("7"); + setShadowOpacity("1"); + setZindex("3"); + } + + public void bTest5(){ + setBorder("4"); + setCellpadding("1"); + setCellspacing("1"); + setFrequency("5"); + setHeight("200"); + setWidth("400"); + setMinchars("2"); + setShadowDepth("5"); + setShadowOpacity("5"); + setZindex("1"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -132,4 +132,43 @@ this.width = width; } + public void bTest1(){ + setAlign("left"); + setHeight("300px"); + setWidth("10px"); + setLineType("beveled"); + setTitle("Test1"); + } + + public void bTest2(){ + setAlign("center"); + setHeight("300px"); + setWidth("10px"); + setLineType("dotted"); + setTitle("Test2"); + } + + public void bTest3(){ + setAlign("right"); + setHeight("300px"); + setWidth("10px"); + setLineType("dashed"); + setTitle("Test3"); + } + + public void bTest4(){ + setAlign("left"); + setHeight("300px"); + setWidth("10px"); + setLineType("double"); + setTitle("Test4"); + } + + public void bTest5(){ + setAlign("left"); + setHeight("300px"); + setWidth("10px"); + setLineType("solid"); + setTitle("Test5"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -72,5 +72,29 @@ public void setBtn(String btn) { this.btn = btn; } + + public void bTest1(){ + setHeight("100"); + setWidth("10"); + } + public void bTest2(){ + setHeight("10"); + setWidth("100"); + } + + public void bTest3(){ + setHeight("5"); + setWidth("5"); + } + + public void bTest4(){ + setHeight("100"); + setWidth("100"); + } + + public void bTest5(){ + setHeight("400"); + setWidth("200"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/tabPanel/TabPanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/tabPanel/TabPanel.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/tabPanel/TabPanel.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -53,7 +53,7 @@ setDisabledTabStyle("disabledTabStyle"); setInactiveTabStyle("inactiveTabStyle"); } else { - setBtnLabel("OFF"); + setBtnLabel("ON"); setActiveTabStyle(null); setContentStyle(null); setDisabledTabStyle(null); @@ -196,4 +196,74 @@ this.immediate = immediate; } + public void bTest1() { + setDisabledTab(false); + setHeaderAlignment("left"); + setHeaderSpacing("10px"); + setHeight("250px"); + setImmediate(false); + setLabel("Test 1"); + setLabelWidth("10px"); + setWidth("300px"); + setSelectedTab("2"); + setSwitchType("server"); + setTitle("Title test 1"); + } + + public void bTest2() { + setDisabledTab(true); + setHeaderAlignment("right"); + setHeaderSpacing("40px"); + setHeight("400px"); + setImmediate(false); + setLabel("Test 2"); + setLabelWidth("40px"); + setWidth("40%"); + setSelectedTab("1"); + setSwitchType("ajax"); + setTitle("Title test2"); + } + + public void bTest3() { + setDisabledTab(false); + setHeaderAlignment("center"); + setHeaderSpacing("20px"); + setHeight("20%"); + setImmediate(false); + setLabel("Test 3"); + setLabelWidth("400px"); + setWidth("600px"); + setSelectedTab("3"); + setSwitchType("client"); + setTitle("Title test 3"); + } + + public void bTest4() { + setDisabledTab(true); + setHeaderAlignment("left"); + setHeaderSpacing("300px"); + setHeight("500px"); + setImmediate(false); + setLabel("Teset 4"); + setLabelWidth("500px"); + setWidth("500px"); + setSelectedTab("2"); + setSwitchType("server"); + setTitle("Title test 4"); + } + + public void bTest5() { + setDisabledTab(false); + setHeaderAlignment("left"); + setHeaderSpacing("20px"); + setHeight("40%"); + setImmediate(false); + setLabel("Test 5"); + setLabelWidth("40px"); + setWidth("10%"); + setSelectedTab("3"); + setSwitchType("client"); + setTitle("Title test 5"); + } + } Modified: branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -14,40 +14,57 @@ stateOrder="asus,benq,toshiba"; } - - public String getInitialState() { return initialState; } - - public void setInitialState(String initialState) { this.initialState = initialState; } - - public String getStateOrder() { return stateOrder; } - - public void setStateOrder(String stateOrder) { this.stateOrder = stateOrder; } - - public String getSwitchType() { return switchType; } - - public void setSwitchType(String switchType) { this.switchType = switchType; } + public void bTest1() { + setInitialState("Asus"); + setStateOrder("Asus,Benq,Toshiba"); + setSwitchType("client"); + } + + public void bTest2() { + setInitialState("Benq"); + setStateOrder("Toshiba, Asus, Benq"); + setSwitchType("client"); + } + + public void bTest3() { + setInitialState("Asus"); + setStateOrder("Asus,Benq,Toshiba"); + setSwitchType("server"); + } + + public void bTest4() { + setInitialState("Benq"); + setStateOrder("Asus,Benq,Toshiba"); + setSwitchType("ajax"); + } + + public void bTest5() { + setInitialState("toshiba"); + setStateOrder("Toshiba, Asus, Benq"); + setSwitchType("ajax"); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java 2007-11-02 10:11:55 UTC (rev 3703) @@ -116,4 +116,68 @@ this.delay = delay; } + public void bTest1(){ + setDelay(0); + setDirection("top-right"); + setDisabled(false); + setFollowMouse(false); + setHorizontalOffset(0); + setVerticalOffset(0); + setLayout("inline"); + setMode("client"); + setValue("Test1"); + setRendered(true); + } + + public void bTest2(){ + setDelay(0); + setDirection("top-left"); + setDisabled(false); + setFollowMouse(false); + setHorizontalOffset(5); + setVerticalOffset(5); + setLayout("block"); + setMode("ajax"); + setValue("Test2"); + setRendered(true); + } + + public void bTest3(){ + setDelay(0); + setDirection("bottom-right"); + setDisabled(false); + setFollowMouse(true); + setHorizontalOffset(5); + setVerticalOffset(0); + setLayout("inline"); + setMode("client"); + setValue("Test3"); + setRendered(true); + } + + public void bTest4(){ + setDelay(0); + setDirection("bottom-left"); + setDisabled(false); + setFollowMouse(true); + setHorizontalOffset(0); + setVerticalOffset(5); + setLayout("block"); + setMode("client"); + setValue("Test4"); + setRendered(true); + } + + public void bTest5(){ + setDelay(0); + setDirection("bottom-right"); + setDisabled(false); + setFollowMouse(true); + setHorizontalOffset(-5); + setVerticalOffset(-5); + setLayout("inline"); + setMode("ajax"); + setValue("Test5"); + setRendered(true); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,65 +1,44 @@ -<f:subview id="calendarSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="calendarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> -<h:form> - - <rich:messages showDetail="true"></rich:messages> - - <h:panelGrid columns="2"> - <h:outputText value="Client mode" /> - <h:outputText value="Ajax mode" /> + <h:form> + <h:messages /> + <rich:messages showDetail="true"></rich:messages> - <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" - datePattern="#{calendarBean.pattern}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" - jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" - boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" - valueChangeListener="#{calendarBean.ddd}" reRender="counter" - inputClass="ic" buttonClass="bc" - ajaxSingle="#{calendarBean.ajaxSingle}" - buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" - disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" - height="#{calendarBean.height}" - width="#{calendarBean.width}" - zindex="#{calendarBean.zindex}" - toolTipMode="#{calendarBean.toolTipMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" - mode="client" - required="#{calendarBean.required}" - requiredMessage="Required Message" - > - <f:facet name="weekDay"> - <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + <h:panelGrid columns="2"> + <h:outputText value="Client mode" rendered="#{calendarBean.renderedClient}" /> + <h:outputText value="Ajax mode" rendered="#{calendarBean.renderedAjax}"/> + + <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" + buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedClient}" + focus="popupModeID" mode="client" required="#{calendarBean.required}" requiredMessage="Required Message" + timeZone="#{calendarBean.tmZone}"> + <f:facet name="weekDay"> + <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" /> + <h:outputText value="optionalHeader Facet #{headerFacet}" /> </f:facet> - + <f:facet name="optionalFooter"> <h:outputText value="optionalFooter Facet" /> </f:facet> - + <f:validator validatorId="org.richfaces.CalendarValidator" /> - + <h:panelGrid columns="2"> <f:verbatim> <span style="padding: 2px;">{day}</span> @@ -71,51 +50,36 @@ </h:panelGrid> </h:panelGrid> </rich:calendar> - <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" - jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" - boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" - valueChangeListener="#{calendarBean.ddd}" reRender="counter" - inputClass="ic" buttonClass="bc" - ajaxSingle="#{calendarBean.ajaxSingle}" - buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" - disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" - height="#{calendarBean.height}" - width="#{calendarBean.width}" - zindex="#{calendarBean.zindex}" - toolTipMode="#{calendarBean.toolTipMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" - mode="ajax" - required="#{calendarBean.required}" - requiredMessage="Required Message"> - <f:facet name="weekDay"> - <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + + <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" showInput="#{calendarBean.showInput}" + buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" + buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedAjax}" + focus="popupModeID" mode="ajax" required="#{calendarBean.required}" requiredMessage="Required Message" + timeZone="#{calendarBean.tmZone}"> + <f:facet name="weekDay"> + <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> - + <f:facet name="optionalFooter"> <h:outputText value="optionalFooter Facet" /> </f:facet> - + <f:validator validatorId="org.richfaces.CalendarValidator" /> - + <h:panelGrid columns="2"> <f:verbatim> <span style="padding: 2px;">{day}</span> @@ -127,147 +91,160 @@ </h:panelGrid> </h:panelGrid> </rich:calendar> - </h:panelGrid> - + </h:panelGrid> + <rich:simpleTogglePanel switchType="client" opened="true" label="calendar straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{calendarBean.bTest1}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> - <h:panelGrid columns="2"> - <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" value="en/US"> - <f:selectItem itemLabel="US" itemValue="en/US" /> - <f:selectItem itemLabel="DE" itemValue="de/DE" /> - <f:selectItem itemLabel="FR" itemValue="fr/FR" /> - <f:selectItem itemLabel="RU" itemValue="ru/RU" /> - </h:selectOneRadio> - - <h:outputText value="Popup Mode:" /> - <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" - onclick="submit()" /> - - <h:outputText value="Custom day labels" /> - <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="calendarClientID,calendarAjaxID"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Custom month labels" /> - <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="calendarClientID,calendarAjaxID"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Select Date Pattern:" /> - <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> - <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> - <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> - <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> - <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> - <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> - </h:selectOneMenu> - - <h:inputText id="selectdate" /> - <h:commandButton type="button" value="Select Date" - onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - - <h:outputText value="Preload date range begin(d.m.y)" /> - <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> - - <h:outputText value="Preload date range end(d.m.y)" /> - <h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();"/> - - <h:outputText value="z-index:" /> - <h:inputText value="#{calendarBean.zindex}"> - <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{calendarBean.bTest2}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> - <h:outputText value="Height:" /> - <h:inputText value="#{calendarBean.height}"> - <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{calendarBean.bTest3}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{calendarBean.bTest4}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{calendarBean.bTest5}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="calendarPropertyID" switchType="client" opened="true" label="calendar property"> + <h:panelGrid columns="2"> + + <h:outputText value="Mode" /> + <h:selectOneRadio value="#{calendarBean.mode}" onchange="submit();"> + <f:selectItem itemLabel="client" itemValue="client"/> + <f:selectItem itemLabel="ajax" itemValue="ajax"/> + </h:selectOneRadio> - <h:outputText value="Width:" /> - <h:inputText value="#{calendarBean.width}"> - <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:inputText> - - <h:outputText value="reRender (counter):" /> - <h:outputText id="counter" value="#{calendarBean.counter}" /> - - <h:outputText value="Required" /> - <h:selectBooleanCheckbox value="#{calendarBean.required}" onclick="submit()"/> - <h:outputText value="Select Popup Joint Point:" /> - <h:selectOneRadio onchange="submit()" - value="#{calendarBean.jointPoint}"> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - </h:selectOneRadio> - - <h:outputText value="Select Popup Direction:" /> - <h:selectOneRadio onchange="submit()" - value="#{calendarBean.direction}"> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="auto" itemValue="auto" /> - </h:selectOneRadio> + <h:outputText value="Select Locale:" /> + <h:selectOneRadio onchange="submit()" valueChangeListener="#{calendarBean.selectLocale}"> + <f:selectItem itemLabel="US" itemValue="en/US" /> + <f:selectItem itemLabel="DE" itemValue="de/DE" /> + <f:selectItem itemLabel="FR" itemValue="fr/FR" /> + <f:selectItem itemLabel="RU" itemValue="ru/RU" /> + </h:selectOneRadio> - <h:outputText value="Time Zone:" /> - <h:selectOneRadio value="#{calendarBean.timeZone}" onchange="submit();"> - <f:selectItem itemLabel="Eastern European Time" itemValue="Eastern European Time"/> - <f:selectItem itemLabel="Turkmenistan Time" itemValue="Turkmenistan Time"/> - <f:selectItem itemLabel="Korea Standard Time" itemValue="Korea Standard Time"/> - </h:selectOneRadio> + <h:outputText value="Popup Mode:" /> + <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" onclick="submit()" /> - - <h:outputText value="ToolTip Mode:" /> - <h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="none"/> - <f:selectItem itemLabel="single" itemValue="single"/> - <f:selectItem itemLabel="batch" itemValue="batch"/> - </h:selectOneRadio> - - <h:outputText value="BoundaryDatesMode:" /> - <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> - <f:selectItem itemLabel="inactive" itemValue="inactive" /> - <f:selectItem itemLabel="select" itemValue="select" /> - <f:selectItem itemLabel="scroll" itemValue="scroll" /> - </h:selectOneRadio> - - <h:outputText value="EnableManualInput:"></h:outputText> - <h:selectBooleanCheckbox value="#{calendarBean.enableManualInput}" - onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="ShowInput:"></h:outputText> - <h:selectBooleanCheckbox value="#{calendarBean.showInput}" - onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="Disabled:" /> - <h:selectBooleanCheckbox value="#{calendarBean.disabled}" onclick="submit()"/> - - <h:outputText value="Rendered:" /> - <h:selectBooleanCheckbox value="#{calendarBean.rendered}" onclick="submit()"/> - - <f:verbatim></f:verbatim> - <h:commandButton action="#{calendarBean.changeIcons}" value="ChangeIcons" /> - - <h:outputText value="Current date: " /> - <h:outputText value="#{calendarBean.currentDateAsText}" /> + <h:outputText value="Custom day labels" /> + <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="calendarClientID,calendarAjaxID"></a4j:support> + </h:selectOneRadio> - <h:outputText value="Selected date: " /> - <h:outputText value="#{calendarBean.selectedDate}" /> - - <f:verbatim></f:verbatim> - <h:commandButton value="Submit" /> - </h:panelGrid> -</h:form> + <h:outputText value="Custom month labels" /> + <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="calendarClientID,calendarAjaxID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Select Date Pattern:" /> + <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> + <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> + <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> + <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> + <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> + <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> + <f:selectItem itemLabel="dd-MM-yyyy" itemValue="dd-MM-yyyy" /> + </h:selectOneMenu> + + <h:inputText id="selectdate" /> + <h:commandButton type="button" value="Select Date" + onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> + + <h:outputText value="Preload date range begin(d.m.y)" /> + <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();" /> + + <h:outputText value="Preload date range end(d.m.y)" /> + <h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();" /> + + <h:outputText value="z-index:" /> + <h:inputText value="#{calendarBean.zindex}"> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> + </h:inputText> + + <h:outputText value="reRender (counter):" /> + <h:outputText id="counter" value="#{calendarBean.counter}" /> + + <h:outputText value="Required" /> + <h:selectBooleanCheckbox value="#{calendarBean.required}" onclick="submit()" /> + + <h:outputText value="Select Popup Joint Point:" /> + <h:selectOneRadio onchange="submit()" value="#{calendarBean.jointPoint}"> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + </h:selectOneRadio> + + <h:outputText value="Select Popup Direction:" /> + <h:selectOneRadio onchange="submit()" value="#{calendarBean.direction}"> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="auto" itemValue="auto" /> + </h:selectOneRadio> + + <h:outputText value="Time Zone:" /> + <h:selectOneRadio valueChangeListener="#{calendarBean.timeZone}" onchange="submit();"> + <f:selectItem itemLabel="Eastern European Time" itemValue="Eastern European Time" /> + <f:selectItem itemLabel="Turkmenistan Time" itemValue="Turkmenistan Time" /> + <f:selectItem itemLabel="Korea Standard Time" itemValue="Korea Standard Time" /> + </h:selectOneRadio> + + + <h:outputText value="ToolTip Mode:" /> + <h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="single" itemValue="single" /> + <f:selectItem itemLabel="batch" itemValue="batch" /> + </h:selectOneRadio> + + <h:outputText value="BoundaryDatesMode:" /> + <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> + <f:selectItem itemLabel="inactive" itemValue="inactive" /> + <f:selectItem itemLabel="select" itemValue="select" /> + <f:selectItem itemLabel="scroll" itemValue="scroll" /> + </h:selectOneRadio> + + <h:outputText value="EnableManualInput:"></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.enableManualInput}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowInput:"></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.showInput}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Disabled:" /> + <h:selectBooleanCheckbox value="#{calendarBean.disabled}" onclick="submit()" /> + + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{calendarBean.rendered}" onclick="submit()" /> + + <f:verbatim></f:verbatim> + <h:commandButton action="#{calendarBean.changeIcons}" value="ChangeIcons" /> + + <h:outputText value="Current date: " /> + <h:outputText value="#{calendarBean.currentDateAsText}" /> + + <h:outputText value="Selected date: " /> + <h:outputText value="#{calendarBean.selectedDate}" /> + + <f:verbatim></f:verbatim> + <h:commandButton value="Submit" /> + </h:panelGrid> + </rich:simpleTogglePanel> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,17 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> <head> -<link rel="stylesheet" - href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" - type="text/css" /> +<link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> </head> + + <f:view> <h:form> - + </h:form> </f:view> </html> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -17,7 +17,7 @@ storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000" increment="10000" rangeStyleClass="range" trailer="true" - trailerStyleClass="trailer" handleStyleClass="handle" + trailerStyleClass="trailer" handleStyleClass="handle" handleValue="10000" id="slider_1"> </rich:dataFilterSlider> </a4j:outputPanel> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,29 +1,58 @@ -<f:subview id="DataScrollerSubviewID" +<f:subview id="DataScrollerSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> -<h:form dir="DSform"> + <h:form dir="DSform"> - <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" - var="dT" cellpadding="5px" rows="5" border="1"> - <f:facet name="header"> - <rich:datascroller fastControls="#{dataScroller.fastControls}" - align="#{dataScroller.align}" rendered="#{dataScroller.render}" - limitToList="#{dataScroller.limitToList}" - renderIfSinglePage="#{dataScroller.renderIfSinglePage}" - maxPages="#{dataScroller.maxPages}" - scrollerListener="#{dataScroller.ScrollerListener}" /> - </f:facet> - <h:column> - <h:outputText value="#{dT.data0}" /> - </h:column> - <h:column> - <h:outputText value="#{dT.data1}" /> - </h:column> + <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" + var="dT" cellpadding="5px" rows="5" border="1"> + <f:facet name="header"> + <rich:datascroller fastControls="#{dataScroller.fastControls}" + align="#{dataScroller.align}" rendered="#{dataScroller.render}" + limitToList="#{dataScroller.limitToList}" + renderIfSinglePage="#{dataScroller.renderIfSinglePage}" + maxPages="#{dataScroller.maxPages}" + scrollerListener="#{dataScroller.ScrollerListener}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> + </f:facet> + <h:column> + <h:outputText value="#{dT.data0}" /> + </h:column> + <h:column> + <h:outputText value="#{dT.data1}" /> + </h:column> + </h:dataTable> - </h:dataTable> + <rich:simpleTogglePanel switchType="client" opened="true" + label="inputNumberSlider straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dataScroller.bTest1}" value="run" reRender="dataScrollerID,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{dataScroller.bTest2}" value="run" reRender="dataScrollerID,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dataScroller.bTest3}" value="run" reRender="dataScrollerID,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dataScroller.bTest4}" value="run" reRender="dataScrollerID,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dataScroller.bTest5}" value="run" reRender="dataScrollerID,dTablePropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="dTablePropertyID" switchType="client" opened="true" + label="dataTable property"> + <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> <h:commandButton action="#{dataScroller.RestoreArray}" value="RestoreArray" /> @@ -61,8 +90,7 @@ <f:selectItem itemLabel="center" itemValue="center" /> <a4j:support event="onclick" reRender="dataTableId"></a4j:support> </h:selectOneRadio> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> + </rich:simpleTogglePanel> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,108 +1,122 @@ -<f:subview id="DataTableSubviewID" - xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="DataTableSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> -<h:form dir="DSform" > - - <rich:dataTable id="dataTableID" var="dataTableID" - value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" - headerClass="header" footerClass="footer" cellpadding="" cellspacing="" - onRowClick="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" /> + <h:form dir="DSform"> + <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" cellpadding="" + cellspacing="" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" + onRowDblClick="print('onRowDblClickInputID', 'onRowDblClick work!')" + onRowMouseDown="print('onRowMouseDownInputID', 'onRowMouseDown work!')" + onRowMouseMove="print('onRowMouseMoveInputID', 'onRowMouseMove work!')" + onRowMouseOut="print('onRowMouseOutInputID', 'onRowMouseOut work!')" + onRowMouseOver="print('onRowMouseOverInputID', 'onRowMouseOver work!')" + onRowMouseUp="print('onRowMouseUpInputID', 'onRowMouseUp work!')"> + <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"> - <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> + <h:outputText value="mounth" /> </f:facet> <f:facet name="footer"> - <h:outputText value="table foot" /> + <h:outputText value="-//-" /> </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: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> + <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dataTable.bTest1}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> - <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="Test2" /> + <a4j:commandButton action="#{dataTable.bTest2}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{dataTable.width}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dataTable.bTest3}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> - <h:outputText value="rendered:" /> - <h:selectBooleanCheckbox value="#{dataTable.rendered}" - onclick="submit();" /> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dataTable.bTest4}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> - <h:outputText value=" row 2 rendered" /> - <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" - onclick="submit();" /> - </h:panelGrid> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dataTable.bTest5}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - </h:form> + <rich:simpleTogglePanel id="dtPropertyID" switchType="client" opened="true" label="dataTable property"> + <h:panelGrid columns="2" style="top"> + <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> + </rich:simpleTogglePanel> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,13 +1,88 @@ -<f:subview id="DropDownMenuSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:c="http://java.sun.com/jsp/jstl/core"> +<f:subview id="DropDownMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> <h:form> + <h:panelGrid columns="2"> + <rich:spacer width="400px" height="400px"></rich:spacer> + <rich:panel> + <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" + direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}" + popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" + verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" + oncollapse="print('oncollapseInputID', 'oncollapse work!')" onexpand="print('onexpandInputID', 'onexpand work!')" + ongroupactivate="print('ongroupactivateInputID', 'ongroupactivate work!')" + onitemselect="print('onitemselectInputID', 'onitemselect work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')"> + <rich:menuItem icon="#{dDMenu.icon}" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('InputID', ' work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + onselect="print('onselectInputID', 'onselect work!')"> + <h:outputText value="Item1(test events)" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="#{dDMenu.icon}" onmousedown="alert('OnMouseDown')" selectClass="mousemove"> + <h:outputText value="OnMouseDown" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem> + <h:outputText value="Item2" /> + </rich:menuItem> + <rich:menuItem icon="#{dDMenu.icon}"> + <h:outputText value="Item3" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="/pics/ajax_process.gif" iconDisabled="/pics/ajax_stoped.gif" disabled="#{dDMenu.disabled}"> + <h:outputText value="Image"></h:outputText> + </rich:menuItem> + <rich:menuItem disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}"> + <h:outputText value="Image:" /> + <h:graphicImage value="/pics/ajax_process.gif" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuGroup value="Second level" direction="#{dDMenu.groupDirection}" disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}" + iconFolder="#{dDMenu.iconFolder}"> + <rich:menuItem icon="#{dDMenu.icon}"> + <h:outputText value="Item3" /> + </rich:menuItem> + <rich:menuItem value="Item4"> + <h:selectOneMenu value="#{dDMenu.selectMenu}"> + <f:selectItem itemLabel="Honda Accord" itemValue="accord" /> + <f:selectItem itemLabel="Toyota 4Runner" itemValue="4runner" /> + <f:selectItem itemLabel="Nissan Z350" itemValue="nissan-z" /> + </h:selectOneMenu> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="#{dDMenu.icon}"> + <h:outputText value="CheckBox " /> + <h:selectBooleanCheckbox value="#{dDMenu.check}" onclick="submit()" /> + </rich:menuItem> + </rich:menuGroup> + </rich:dropDownMenu> + </rich:panel> + </h:panelGrid> - <h:panelGrid columns="3"> + <rich:simpleTogglePanel id="ddMenuStraightforwardID" switchType="client" opened="true" label="dropDownMenu straightforward"> <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{dDMenu.bTest2}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dDMenu.bTest3}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dDMenu.bTest4}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dDMenu.bTest5}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="ddMenuPropertyID" switchType="client" opened="true" label="dropDownMenu property"> + <h:panelGrid columns="2"> <h:outputText value="HideDelay (ms):" /> <h:inputText value="#{dDMenu.hideDelay}"> <a4j:support event="onchange" reRender="ddmId" /> @@ -32,15 +107,15 @@ <h:inputText value="#{dDMenu.verticalOffset}"> <a4j:support event="onchange" reRender="ddmId" /> </h:inputText> - + <h:outputText value="Mode:" /> <h:selectOneRadio value="#{dDMenu.mode}"> - <f:selectItem itemLabel="none" itemValue="none"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - <f:selectItem itemLabel="server" itemValue="server"/> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <f:selectItem itemLabel="server" itemValue="server" /> <a4j:support event="onclick" reRender="ddmId" /> </h:selectOneRadio> - + <h:outputText value="Direction:" /> <h:selectOneRadio value="#{dDMenu.direction}"> <f:selectItem itemLabel="top-right" itemValue="top-right" /> @@ -79,8 +154,7 @@ </h:selectOneRadio> <h:outputText value="Rendered:" /> - <h:selectBooleanCheckbox value="#{dDMenu.rendered}" - onclick="submit()"> + <h:selectBooleanCheckbox value="#{dDMenu.rendered}" onclick="submit()"> </h:selectBooleanCheckbox> @@ -90,65 +164,8 @@ </h:selectBooleanCheckbox> <h:commandButton action="#{dDMenu.changeIcons}" value="ChangeIcons" /> </h:panelGrid> + </rich:simpleTogglePanel> - <rich:spacer width="300px"></rich:spacer> - - <rich:panel style="width:200px; height:50px;"> - <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" - hideDelay="#{dDMenu.hideDelay}" direction="#{dDMenu.direction}" - horizontalOffset="#{dDMenu.horizontalOffset}" - jointPoint="#{dDMenu.jointPoint}" popupWidth="#{dDMenu.popupWidth}" - showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" - verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}"> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Item1" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="#{dDMenu.icon}" - onmousedown="alert('OnMouseDown')" selectClass="mousemove"> - <h:outputText value="OnMouseDown" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem> - <h:outputText value="Item2" /> - </rich:menuItem> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Item3" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="/pics/ajax_process.gif" - iconDisabled="/pics/ajax_stoped.gif" disabled="#{dDMenu.disabled}"> - <h:outputText value="Image"></h:outputText> - </rich:menuItem> - <rich:menuItem disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}"> - <h:outputText value="Image:" /> - <h:graphicImage value="/pics/ajax_process.gif" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuGroup value="Second level" - direction="#{dDMenu.groupDirection}" disabled="#{dDMenu.disabled}" - icon="#{dDMenu.icon}" iconFolder="#{dDMenu.iconFolder}"> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Item3" /> - </rich:menuItem> - <rich:menuItem value="Item4"> - <h:selectOneMenu value="#{dDMenu.selectMenu}"> - <f:selectItem itemLabel="Honda Accord" itemValue="accord" /> - <f:selectItem itemLabel="Toyota 4Runner" itemValue="4runner" /> - <f:selectItem itemLabel="Nissan Z350" itemValue="nissan-z" /> - </h:selectOneMenu> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="CheckBox " /> - <h:selectBooleanCheckbox value="#{dDMenu.check}" onclick="submit()" /> - </rich:menuItem> - </rich:menuGroup> - - </rich:dropDownMenu> - </rich:panel> - </h:panelGrid> - <a4j:log></a4j:log> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -6,7 +6,12 @@ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> <h:form> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" + <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="width:500px;height:400px" enableContinuousZoom="#{gmap.continuousZoom}" @@ -48,15 +53,13 @@ <rich:panel> <h:panelGrid columns="2"> <h:outputText value="Dragging:" /> - <h:selectBooleanCheckbox value="#{gmap.dragging}" /> + <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> <h:outputText value="Continuous Zoom:" /> - <h:selectBooleanCheckbox value="#{gmap.continuousZoom}" /> + <h:selectBooleanCheckbox value="#{gmap.continuousZoom}" onclick="submit()" /> <h:outputText value="Double Click Zoom:" /> - <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" /> - - <h:commandLink value="submit" action="submit();"></h:commandLink> + <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" onclick="submit()" /> </h:panelGrid> </rich:panel> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,13 +1,94 @@ -<f:subview id="messageSubviewID" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="messageSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <h:form> <rich:panel> + <h:outputText value="Rich Message Demo:" /> + + <f:verbatim> + <br /> + </f:verbatim> + + <rich:message for="#{message.msg}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" + showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel" + infoLabelClass="infoLabel" warnLabelClass="fatalLabel" title="#{message.title}"> + + + <f:facet name="errorMarker"> + <h:graphicImage url="/pics/error.gif" /> + </f:facet> + + <f:facet name="fatalMarker"> + <h:graphicImage url="/pics/fatal.gif" /> + </f:facet> + + <f:facet name="infoMarker"> + <h:graphicImage url="/pics/info.gif" /> + </f:facet> + + <f:facet name="warnMarker"> + <h:graphicImage url="/pics/warn.gif" /> + </f:facet> + + <f:facet name="passedMarker"> + <h:graphicImage url="/pics/passed.gif" /> + </f:facet> + </rich:message> + + <rich:separator></rich:separator> + + <h:outputText value="Rich Messages Demo" /> + <rich:messages layout="#{message.layout}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" + showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel" + infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo" + errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass" + warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" var="messages" styleClass="class" title="#{message.title}"> + <f:facet name="errorMarker"> + <h:graphicImage url="/pics/error.gif" /> + </f:facet> + <f:facet name="fatalMarker"> + <h:graphicImage url="/pics/fatal.gif" /> + </f:facet> + <f:facet name="infoMarker"> + <h:graphicImage url="/pics/info.gif" /> + </f:facet> + <f:facet name="warnMarker"> + <h:graphicImage url="/pics/warn.gif" /> + </f:facet> + <f:facet name="passedMarker"> + <h:graphicImage url="/pics/passed.gif" /> + </f:facet> + <h:outputText value="#{messages.summary}"> + </h:outputText> + </rich:messages> + </rich:panel> + + <f:verbatim> + <br /> + </f:verbatim> + + <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{messages.bTest1}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{messages.bTest2}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{messages.bTest3}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{messages.bTest4}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{messages.bTest5}" value="run" onclick="submit()"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="msgPropertyID" switchType="client" opened="true" label="modalPanel property"> + <h:panelGrid columns="2"> <h:outputText value="1." /> - <h:selectOneMenu id="select1" value=""> + <h:selectOneMenu id="select1" value="#{message.select1}"> <f:selectItem itemValue="error" itemLabel="error" /> <f:selectItem itemValue="fatal" itemLabel="fatal" /> <f:selectItem itemValue="warn" itemLabel="warning" /> @@ -17,7 +98,7 @@ </h:selectOneMenu> <h:outputText value="2." /> - <h:selectOneMenu id="select2" value=""> + <h:selectOneMenu id="select2" value="#{message.select2}"> <f:selectItem itemValue="error" itemLabel="error" /> <f:selectItem itemValue="fatal" itemLabel="fatal" /> <f:selectItem itemValue="warn" itemLabel="warning" /> @@ -27,7 +108,7 @@ </h:selectOneMenu> <h:outputText value="3." /> - <h:selectOneMenu id="select3" value=""> + <h:selectOneMenu id="select3" value="#{message.select3}"> <f:selectItem itemValue="error" itemLabel="error" /> <f:selectItem itemValue="fatal" itemLabel="fatal" /> <f:selectItem itemValue="warn" itemLabel="warning" /> @@ -37,7 +118,7 @@ </h:selectOneMenu> <h:outputText value="4." /> - <h:selectOneMenu id="select4" value=""> + <h:selectOneMenu id="select4" value="#{message.select4}"> <f:selectItem itemValue="error" itemLabel="error" /> <f:selectItem itemValue="fatal" itemLabel="fatal" /> <f:selectItem itemValue="warn" itemLabel="warning" /> @@ -47,7 +128,7 @@ </h:selectOneMenu> <h:outputText value="5." /> - <h:selectOneMenu id="select5" value=""> + <h:selectOneMenu id="select5" value="#{message.select5}"> <f:selectItem itemValue="error" itemLabel="error" /> <f:selectItem itemValue="fatal" itemLabel="fatal" /> <f:selectItem itemValue="warn" itemLabel="warning" /> @@ -87,80 +168,6 @@ <h:commandButton value="submit" /> <a4j:commandButton value="submit ajax" /> </h:panelGrid> - </rich:panel> - - <rich:spacer></rich:spacer> - - <rich:panel> - <h:outputText value="Rich Message Demo:" /> - - <f:verbatim> - <br /> - </f:verbatim> - - <rich:message for="#{message.msg}" tooltip="#{message.tooltip}" - showDetail="#{message.showDetail}" - showSummary="#{message.showSummary}" passedLabel="No Error" - errorLabelClass="errorLabel" fatalLabelClass="warnLabel" - infoLabelClass="infoLabel" warnLabelClass="fatalLabel" - title="#{message.title}"> - - - <f:facet name="errorMarker"> - <h:graphicImage url="/pics/error.gif" /> - </f:facet> - - <f:facet name="fatalMarker"> - <h:graphicImage url="/pics/fatal.gif" /> - </f:facet> - - <f:facet name="infoMarker"> - <h:graphicImage url="/pics/info.gif" /> - </f:facet> - - <f:facet name="warnMarker"> - <h:graphicImage url="/pics/warn.gif" /> - </f:facet> - - <f:facet name="passedMarker"> - <h:graphicImage url="/pics/passed.gif" /> - </f:facet> - </rich:message> - - <rich:separator></rich:separator> - - <h:outputText value="Rich Messages Demo" /> - <rich:messages layout="#{message.layout}" - tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" - showSummary="#{message.showSummary}" passedLabel="No Error" - errorLabelClass="errorLabel" fatalLabelClass="warnLabel" - infoLabelClass="infoLabel" warnLabelClass="fatalLabel" - warnMarkerClass="markerWarn" infoMarkerClass="markerInfo" - errorMarkerClass="markerError" fatalMarkerClass="markerFatal" - errorClass="errorClass" fatalClass="fatalClass" - warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" - var="messages" styleClass="class" title="#{message.title}"> - <f:facet name="errorMarker"> - <h:graphicImage url="/pics/error.gif" /> - </f:facet> - <f:facet name="fatalMarker"> - <h:graphicImage url="/pics/fatal.gif" /> - </f:facet> - <f:facet name="infoMarker"> - <h:graphicImage url="/pics/info.gif" /> - </f:facet> - <f:facet name="warnMarker"> - <h:graphicImage url="/pics/warn.gif" /> - </f:facet> - <f:facet name="passedMarker"> - <h:graphicImage url="/pics/passed.gif" /> - </f:facet> - <h:outputText value="#{messages.summary}"> - </h:outputText> - </rich:messages> - </rich:panel> - <f:verbatim> - <br /> - </f:verbatim> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,68 +1,81 @@ -<f:subview id="modalPanelSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="modalPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <h:form id="MPform"> - <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" - minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" - width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" - resizeable="#{modalPanel.resizeable}" keepVisualState="" visualOptions="" > - + <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" + width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" onhide="print('onhideInputID', 'onhide work!')" + onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> + <h:outputText value="This is Modal Panel example" styleClass="text1" /> <f:verbatim> - <br /> - <br /> + <br /> + <br /> </f:verbatim> - <h:outputLink - onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" - value="Close"> + <h:outputLink onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> </rich:modalPanel> - <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show - MP</a> + <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show MP</a> <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2"> + <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> - <h:outputText value="Width:" /> - <h:inputText value="#{modalPanel.width}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{modalPanel.bTest2}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> - <h:outputText value="Height:" /> - <h:inputText value="#{modalPanel.height}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{modalPanel.bTest3}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> - <h:outputText value="minWidth:" /> - <h:inputText value="#{modalPanel.minWidth}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{modalPanel.bTest4}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> - <h:outputText value="minHeight:" /> - <h:inputText value="#{modalPanel.minHeight}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{modalPanel.bTest5}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Resizeable:" /> - <h:selectBooleanCheckbox value="#{modalPanel.resizeable}"> - <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> - </h:selectBooleanCheckbox> + <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> + <h:panelGrid columns="2"> - <h:outputText value="Moveable:" /> - <h:selectBooleanCheckbox value="#{modalPanel.moveable}"> - <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Width:" /> + <h:inputText value="#{modalPanel.width}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> - </h:panelGrid> + <h:outputText value="Height:" /> + <h:inputText value="#{modalPanel.height}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="minWidth:" /> + <h:inputText value="#{modalPanel.minWidth}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="minHeight:" /> + <h:inputText value="#{modalPanel.minHeight}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="Resizeable:" /> + <h:selectBooleanCheckbox value="#{modalPanel.resizeable}"> + <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Moveable:" /> + <h:selectBooleanCheckbox value="#{modalPanel.moveable}"> + <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,93 +1,107 @@ -<f:subview id="paint2DSubviewID" - xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="paint2DSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <h:form> - <rich:paint2D id="paint2d" paint="#{paint2D.paint}" - data="#{paintData}" width="#{paint2D.width}" - height="#{paint2D.height}" align="#{paint2D.align}" - hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" - bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" - title="#{paint2D.title}" styleClass="#{paint2D.styleString}" - border="#{paint2D.border}" rendered="#{paint2D.rendered}" /> + <rich:paint2D id="paint2dID" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" + align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" + format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}" + rendered="#{paint2D.rendered}" /> - <h:panelGrid columns="2" cellpadding="5px" border="2"> - <h:outputText value="Text"></h:outputText> - <h:inputText value="#{paintData.text}"> - <a4j:support event="onchange" reRender="paint2d" /> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="paint2D straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{paint2D.bTest1}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{paint2D.width}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{paint2D.bTest2}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> - <h:outputText value="Height: "></h:outputText> - <h:inputText value="#{paint2D.height}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{paint2D.bTest3}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> - <h:outputText value="Vertical space: "></h:outputText> - <h:inputText value="#{paint2D.vspace}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{paint2D.bTest4}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> - <h:outputText value="Horizontal space: "></h:outputText> - <h:inputText value="#{paint2D.hspace}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{paint2D.bTest5}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{paint2D.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="middle" itemValue="middle" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <f:selectItem itemLabel="bottom" itemValue="bottom" /> - <f:selectItem itemLabel="top" itemValue="top" /> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectOneMenu> + <rich:simpleTogglePanel id="paint2DPropertyID" switchType="client" opened="true" label="paint2D property"> + <h:panelGrid columns="2" cellpadding="5px" border="2"> + <h:outputText value="Text"></h:outputText> + <h:inputText value="#{paintData.text}"> + <a4j:support event="onchange" reRender="paint2dID" /> + </h:inputText> - <h:outputText value="Format:"></h:outputText> - <h:selectOneMenu value="#{paint2D.format}"> - <f:selectItem itemLabel="jpeg" itemValue="jpeg" /> - <f:selectItem itemLabel="gif" itemValue="gif" /> - <f:selectItem itemLabel="png" itemValue="png" /> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectOneMenu> + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{paint2D.width}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{paint2D.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="paint2d"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Style" /> - <h:selectBooleanCheckbox value="#{paint2D.style}" > - <a4j:support event="onclick" reRender="paint2d,borderID" /> - </h:selectBooleanCheckbox> + <h:outputText value="Height: "></h:outputText> + <h:inputText value="#{paint2D.height}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> - <h:outputText value="Border: "></h:outputText> - <h:inputText id="borderID" disabled="#{paint2D.style}" value="#{paint2D.border}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> + <h:outputText value="Vertical space: "></h:outputText> + <h:inputText value="#{paint2D.vspace}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{paint2D.rendered}"> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectBooleanCheckbox> - </h:panelGrid> + <h:outputText value="Horizontal space: "></h:outputText> + <h:inputText value="#{paint2D.hspace}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{paint2D.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="middle" itemValue="middle" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="bottom" itemValue="bottom" /> + <f:selectItem itemLabel="top" itemValue="top" /> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Format:"></h:outputText> + <h:selectOneMenu value="#{paint2D.format}"> + <f:selectItem itemLabel="jpeg" itemValue="jpeg" /> + <f:selectItem itemLabel="gif" itemValue="gif" /> + <f:selectItem itemLabel="png" itemValue="png" /> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Background Colour"></h:outputText> + <h:selectOneMenu value="#{paint2D.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="paint2dID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Style" /> + <h:selectBooleanCheckbox value="#{paint2D.style}"> + <a4j:support event="onclick" reRender="paint2dID,borderID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Border: "></h:outputText> + <h:inputText id="borderID" disabled="#{paint2D.style}" value="#{paint2D.border}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{paint2D.rendered}"> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,16 +1,10 @@ -<f:subview id="panelSubviewID" - xmlns:rich="http://richfaces.org/rich" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:c="http://java.sun.com/jstl/core"> +<f:subview id="panelSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> <h:form> - <h:outputText - value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> + <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> - <rich:panel rendered="#{!panel.rendered}" id="p1" - style="width:#{panel.width};height:#{panel.height};overflow:auto;"> + <rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;"> <f:facet name="header"> <h:outputText id="t1" value="#{panel.title[0]} (Panel 1)" /> </f:facet> @@ -40,32 +34,53 @@ </rich:panel> </rich:panel> - <rich:panel onmousedown="alert('OnMouseDown');" id="panelId" - onclick="submit()" rendered="#{panel.rendered}" - style="width:#{panel.width};height:#{panel.height}"> - <f:verbatim>This is panel 2 example...</f:verbatim> + <rich:panel id="panelId" rendered="#{panel.rendered}" + style="width:#{panel.width};height:#{panel.height}" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onclick="print('onclickInputID', 'onclick work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> </rich:panel> - <h:panelGrid columns="2" cellpadding="10px"> - <h:outputText value="Title"></h:outputText> - <h:inputText valueChangeListener="#{panel.makeTitle}"> - <a4j:support event="onchange" reRender="t1,t2,t3,o1,o2"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="panel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{panel.bTest1}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{panel.width}"> - <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{panel.bTest2}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> - <h:outputText value="Height: "></h:outputText> - <h:inputText value="#{panel.height}"> - <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{panel.bTest3}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{panel.rendered}" onclick="submit()"></h:selectBooleanCheckbox> - </h:panelGrid> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{panel.bTest4}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{panel.bTest5}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="panelPropertyID" switchType="client" opened="true" label="panel property"> + <h:panelGrid columns="2" cellpadding="10px"> + <h:outputText value="Title"></h:outputText> + <h:inputText valueChangeListener="#{panel.makeTitle}"> + <a4j:support event="onchange" reRender="t1,t2,t3,o1,o2"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{panel.width}"> + <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> + </h:inputText> + + <h:outputText value="Height: "></h:outputText> + <h:inputText value="#{panel.height}"> + <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{panel.rendered}" onclick="submit()"></h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,72 +1,81 @@ -<f:subview id="panelBarSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="panelBarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> <h:form> <h:messages></h:messages> - <rich:panelBar id="pBId" height="#{panelBar.height}" - width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" - styleClass="#{panelBar.style}" selectedPanel="pBiId4"> - <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" - label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}"> + <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" + styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="print('onclickInputID', 'onclick work!')"> + <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" + headerClass="#{panelBar.headerStyle}"> <h:outputText value="Some text..."></h:outputText> </rich:panelBarItem> - <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}" - headerClass="#{panelBar.headerStyle}"> - <h:graphicImage value="/pics/masshtaby_01.jpg" width="300" - height="200"></h:graphicImage> + <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}" headerClass="#{panelBar.headerStyle}"> + <h:graphicImage value="/pics/masshtaby_01.jpg" width="300" height="200"></h:graphicImage> </rich:panelBarItem> - <rich:panelBarItem id="pBiId3" label="#{panelBar.label[2]}" - headerClass="#{panelBar.headerStyle}"> + <rich:panelBarItem id="pBiId3" label="#{panelBar.label[2]}" headerClass="#{panelBar.headerStyle}"> <f:facet name="openMarker"> <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> </f:facet> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> </f:facet> - <h:graphicImage value="/pics/podb109_61.jpg" width="300" - height="200"></h:graphicImage> + <h:graphicImage value="/pics/podb109_61.jpg" width="300" height="200"></h:graphicImage> </rich:panelBarItem> - <rich:panelBarItem id="pBiId4" label="#{panelBar.label[3]}" - headerClass="#{panelBar.headerStyle}"> + <rich:panelBarItem id="pBiId4" label="#{panelBar.label[3]}" headerClass="#{panelBar.headerStyle}"> <h:outputText value="Select Panel"></h:outputText> </rich:panelBarItem> - </rich:panelBar> <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2" cellspacing="10px"> - <h:outputText value="Label: "></h:outputText> - <h:inputText valueChangeListener="#{panelBar.makeLabels}"> - <a4j:support event="onchange" reRender="pBId"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="panelBar straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{panelBar.bTest1}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{panelBar.width}"> - <a4j:support event="onchange" reRender="pBId"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{panelBar.bTest2}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> - <h:outputText value="Height: "></h:outputText> - <h:inputText value="#{panelBar.height}"> - <a4j:support event="onchange" reRender="pBId"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{panelBar.bTest3}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{panelBar.rendered}"> - <a4j:support event="onchange" reRender="pBId" /> - </h:selectBooleanCheckbox> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{panelBar.bTest4}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{panelBar.doStyles}" - value="#{panelBar.btnLabel}" /> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{panelBar.bTest5}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - </h:panelGrid> + <rich:simpleTogglePanel id="pbPropertyID" switchType="client" opened="true" label="panelBar property"> + <h:panelGrid columns="2" cellspacing="10px"> + <h:outputText value="Label: "></h:outputText> + <h:inputText valueChangeListener="#{panelBar.makeLabels}"> + <a4j:support event="onchange" reRender="pBId"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{panelBar.width}"> + <a4j:support event="onchange" reRender="pBId"></a4j:support> + </h:inputText> + + <h:outputText value="Height: "></h:outputText> + <h:inputText value="#{panelBar.height}"> + <a4j:support event="onchange" reRender="pBId"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{panelBar.rendered}"> + <a4j:support event="onchange" reRender="pBId" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{panelBar.doStyles}" value="#{panelBar.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,32 +1,25 @@ -<f:subview id="panelMenuSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="panelMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> <h:form> - <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" - width="#{panelMenu.width}" selectedChild="thisChild" - expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" - value="PanelMenu" rendered="#{panelMenu.rendered}" - iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" - iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" - iconDisabledGroup="#{panelMenu.icon.disabledGroup}" - iconDisabledItem="#{panelMenu.icon.disabledItem}" - iconExpandedGroup="#{panelMenu.icon.expandedGroup}" - iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" - iconItem="#{panelMenu.icon.item}" - iconTopDisabledItem="#{panelMenu.icon.disabledItem}" - iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" - iconTopItem="#{panelMenu.icon.topItem}" - iconGroupPosition="#{panelMenu.iconGroupPosition}" - iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" - iconItemPosition="#{panelMenu.iconItemPosition}" - iconItemTopPosition="#{panelMenu.iconItemTopPosition}" - styleClass="sPanel"> + <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" + expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" + iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" + iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" + iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" + iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" + iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" + iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" + iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" + onclick="" ondblclick="" ongroupcollapse="" ongroupexpand="" onitemhover="" onkeydown="" onkeypress="" onkeyup="" + onmousedown="" onmousemove="" onmouseout="" onmouseover="" onmouseup=""> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem disabled="true" - iconDisabled="/pics/ajax_stoped.gif"> + <rich:panelMenuItem label="Item 1(Test event)" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:panelMenuItem> + <rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> <h:outputText value="Disabled Item" /> </rich:panelMenuItem> <rich:panelMenuItem label="Item Image"> @@ -42,28 +35,22 @@ <h:outputText value="CheckBox 2"></h:outputText> <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> </rich:panelMenuItem> - <rich:panelMenuItem label="Action" - onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1 (align)" - align="#{panelMenu.align}"> + <rich:panelMenuGroup label="Group 1 (align)" align="#{panelMenu.align}"> <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1 (action)" - onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1 (align)" - align="#{panelMenu.align}"> + <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> <rich:panelMenuItem label="Imem 1_1"> <h:inputText value="#{panelMenu.inputText}"></h:inputText> </rich:panelMenuItem> <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1_1 (align)" - align="#{panelMenu.align}"> - <rich:panelMenuItem label="Item 1 (action)" - onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_1_1 (align)" align="#{panelMenu.align}"> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> </rich:panelMenuGroup> @@ -75,8 +62,7 @@ </rich:panelMenuGroup> </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (disabled, action)" - disabled="true" onmousedown="alert('Disabled');"> + <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> </rich:panelMenuGroup> @@ -128,39 +114,29 @@ <br /> </f:verbatim> - <rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" - disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" + <rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" styleClass="body"> - <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" - tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> - <rich:panelMenuGroup label="Group 1_1 (tabIndex)" - tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" - tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> + <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> </rich:panelMenuGroup> </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (tabIndex)" - tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" - tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" - iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" disabled="true" - icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" - iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> </rich:panelMenuGroup> <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> <rich:panelMenuItem label="Item "></rich:panelMenuItem> </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" - iconCollapsed="#{icon.iconCollapse}" + <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> @@ -170,10 +146,8 @@ <!-- triangleUp triangle triangleDown disc chevron chevronUp chevronDown grid --> <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" - iconExpanded="triangleUp" iconDisabled="triangle"> - <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" - iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> + <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> @@ -184,355 +158,313 @@ <rich:panelMenuItem label="Item "></rich:panelMenuItem> </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" - iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> </rich:panelMenuGroup> </rich:panelMenuGroup> </rich:panelMenu> + <f:verbatim> <br /> <br /> </f:verbatim> - <h:panelGrid columns="2"> + <rich:simpleTogglePanel switchType="client" opened="true" label="panelMenu straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{panelMenu.bTest1}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> - <h:outputText value="Width"></h:outputText> - <h:inputText value="#{panelMenu.width}"> - <a4j:support event="onchange" - reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{panelMenu.bTest2}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> - <h:outputText value="Tab Index"></h:outputText> - <h:inputText value="#{panelMenu.tabIndex}"> - <a4j:support event="onchange" - reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{panelMenu.bTest3}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> - <h:outputText value="Expand Single"></h:outputText> - <h:selectBooleanCheckbox value="#{panelMenu.expandSingle}"> - <a4j:support event="onchange" reRender="panelMenuID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{panelMenu.bTest4}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> - <h:outputText value="Mode"></h:outputText> - <h:selectOneRadio value="#{panelMenu.mode}" id="Mode1ID" - onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <f:selectItem itemLabel="server" itemValue="server" /> - </h:selectOneRadio> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{panelMenu.bTest5}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Expand mode"></h:outputText> - <h:selectOneRadio value="#{panelMenu.expandMode}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <f:selectItem itemLabel="server" itemValue="server" /> - </h:selectOneRadio> + <rich:simpleTogglePanel id="pmPropertyID" switchType="client" opened="true" label="panelMenu property"> + <h:panelGrid columns="2"> + <h:outputText value="Width"></h:outputText> + <h:inputText value="#{panelMenu.width}"> + <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:inputText> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{panelMenu.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="middle" itemValue="middle" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <f:selectItem itemLabel="bottom" itemValue="bottom" /> - <f:selectItem itemLabel="top" itemValue="top" /> - <a4j:support event="onclick" - reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:selectOneMenu> + <h:outputText value="Tab Index"></h:outputText> + <h:inputText value="#{panelMenu.tabIndex}"> + <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:inputText> - <h:outputText value="Disabled"></h:outputText> - <h:selectBooleanCheckbox value="#{panelMenu.disabled}"> - <a4j:support event="onchange" - reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Expand Single"></h:outputText> + <h:selectBooleanCheckbox value="#{panelMenu.expandSingle}"> + <a4j:support event="onchange" reRender="panelMenuID"></a4j:support> + </h:selectBooleanCheckbox> - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{panelMenu.rendered}" - onchange="submit();"></h:selectBooleanCheckbox> - </h:panelGrid> + <h:outputText value="Mode"></h:outputText> + <h:selectOneRadio value="#{panelMenu.mode}" id="Mode1ID" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <f:selectItem itemLabel="server" itemValue="server" /> + </h:selectOneRadio> - <h:panelGrid columns="4"> - <h:outputText value="Icon"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.icon}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - </h:selectOneMenu> + <h:outputText value="Expand mode"></h:outputText> + <h:selectOneRadio value="#{panelMenu.expandMode}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <f:selectItem itemLabel="server" itemValue="server" /> + </h:selectOneRadio> - <h:outputText value="icon Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.item}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item " itemValue="#{icon.iconItem}" /> - </h:selectOneMenu> + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{panelMenu.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="middle" itemValue="middle" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="bottom" itemValue="bottom" /> + <f:selectItem itemLabel="top" itemValue="top" /> + <a4j:support event="onclick" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Disabled"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.disabled}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="Disabled"></h:outputText> + <h:selectBooleanCheckbox value="#{panelMenu.disabled}"> + <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:selectBooleanCheckbox> - <h:outputText value="icon Disabled Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.disabledItem}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{panelMenu.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + </h:panelGrid> - <h:outputText value="icon Top Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.topItem}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:panelGrid columns="4"> + <h:outputText value="Icon"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.icon}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + </h:selectOneMenu> - <h:outputText value="icon Top Disabled Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.topDisabledItem}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.item}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item " itemValue="#{icon.iconItem}" /> + </h:selectOneMenu> - <h:outputText value="icon Expanded Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.expandedGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Disabled"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.disabled}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon CollapsedGroup"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.collapsedGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Disabled Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.disabledItem}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Disabled Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.disabledGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Top Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.topItem}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Expanded Top Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.expandedTopGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Top Disabled Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.topDisabledItem}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Collapsed Top Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.collapsedTopGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Expanded Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.expandedGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Top Disable Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.topDisableGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon CollapsedGroup"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.collapsedGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Expanded"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.expanded}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Disabled Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.disabledGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Collapsed"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.collapsed}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" - itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" - itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" - itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" - itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - </h:panelGrid> - <br /> - <h:panelGrid columns="4"> - <h:outputText value="icon Group Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconGroupPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Expanded Top Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.expandedTopGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Group Top Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconGroupTopPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Collapsed Top Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.collapsedTopGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Item Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconItemPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> + <h:outputText value="icon Top Disable Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.topDisableGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> - <h:outputText value="icon Item Top Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconItemTopPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - </h:panelGrid> + <h:outputText value="icon Expanded"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.expanded}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Collapsed"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.collapsed}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + </h:panelGrid> + <br /> + <h:panelGrid columns="4"> + <h:outputText value="icon Group Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconGroupPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Group Top Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconGroupTopPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Item Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconItemPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Item Top Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconItemTopPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/RichTest.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/RichTest.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/RichTest.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -0,0 +1,126 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:view> + <head> + <title></title> + </head> + <body> + <h:form id="richTestID"> + <ui:include src="/rich/menu.xhtml" /> + <h:panelGrid columns="2"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="panel" /> + </f:facet> + <rich:tabPanel switchType="ajax" height="200px" width="300px"> + <rich:tab label="Tab 1"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <h:outputText value="Text" /> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText value="Text" /> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText value="Text" /> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText value="Text" /> + </rich:tab> + + <rich:tab label="Tab 2"> + <h:outputText value="Image" /> + <h:graphicImage value="/pics/masshtaby_01.jpg" height="150px" + width="200px" /> + </rich:tab> + + <rich:tab label="Tab 3"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <f:verbatim> + <a + href="javascript:Richfaces.showModalPanel('mp',{width:450, top:200})">Show + this panel</a> + </f:verbatim> + <rich:modalPanel id="mp" minHeight="200" minWidth="450" + height="200" width="500" zindex="2000"> + <f:facet name="header"> + <h:outputText value="Modal Panel Title" /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" style="cursor:pointer" + onclick="Richfaces.hideModalPanel('mp')" /> + </f:facet> + <f:verbatim> + RichFaces Modal Panel is a container that blocks an operation on the base page when the modal panel is shown. + <a href="javascript:Richfaces.hideModalPanel('mp')">Hide + this panel</a> + </f:verbatim> + </rich:modalPanel> + </rich:tab> + + <rich:tab label="Tab 4"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <h:inputTextarea value="text" cols="30" rows="8"></h:inputTextarea> + </rich:tab> + + <rich:tab label="Tab 5"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Panel" /> + </f:facet> + <rich:tabPanel switchType="ajax"> + <rich:tab label="tab 1"> + <h:outputText value="text1" /> + </rich:tab> + + <rich:tab label="tab 2"> + <h:outputText value="text2" /> + </rich:tab> + </rich:tabPanel> + </rich:panel> + </rich:tab> + + <rich:tab label="Tab 6"> + <rich:dataGrid columns="3" elements="12" + value="#{dataTable.mounths}" var="dt"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="mmm"></h:outputText> + </f:facet> + <h:panelGrid columns="2"> + <h:outputText value="Mounth:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.mounth}" /> + <h:outputText value="Town:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.town}" /> + <h:outputText value="Day:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.day}" /> + <h:outputText value="Number:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.total}" /> + </h:panelGrid> + </rich:panel> + </rich:dataGrid> + </rich:tab> + </rich:tabPanel> + </rich:panel> + </h:panelGrid> + <rich:separator></rich:separator> + </h:form> + </body> +</f:view> +</html> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -0,0 +1,150 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> + + <f:subview id="menuTestID"> + <rich:toolBar itemSeparator="disc"> + <rich:dropDownMenu value="File" event="onmouseover" submitMode="ajax"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 5"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 6"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 7"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuGroup value="menu 1"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + <rich:menuGroup value="menu 1_1"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + </rich:menuGroup> + </rich:menuGroup> + <rich:menuGroup value="menu 2"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + </rich:menuGroup> + </rich:dropDownMenu> + + <rich:dropDownMenu value="Edit" event="onmouseover"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 5"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuSeparator /> + <rich:menuItem value="Item 6"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 7"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 8"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 9"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 10"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 11"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 12"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 13"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 14"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 15"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuGroup value="menu 1"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuGroup value="menu 1_1"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + </rich:menuGroup> + </rich:menuGroup> + <rich:menuGroup value="menu 2"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem value="Item 4"></rich:menuItem> + </rich:menuGroup> + </rich:dropDownMenu> + + <rich:toolBarGroup> + <rich:dropDownMenu value="Navigate" event="onmouseover"> + <rich:menuGroup value="menu 1"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuItem value="Item 4"></rich:menuItem> + <rich:menuGroup value="menu 1_1"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuItem value="Item 4"></rich:menuItem> + </rich:menuGroup> + </rich:menuGroup> + <rich:menuGroup value="menu 2"> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuItem value="Item 4"></rich:menuItem> + </rich:menuGroup> + <rich:menuItem value="Item 1" ></rich:menuItem> + <rich:menuItem value="Item 2"></rich:menuItem> + <rich:menuItem value="Item 3"></rich:menuItem> + <rich:menuItem value="Item 4"></rich:menuItem> + <rich:menuItem value="Item 5"></rich:menuItem> + <rich:menuItem value="Item 6"></rich:menuItem> + <rich:menuItem value="Item 7"></rich:menuItem> + <rich:menuItem value="Item 8"></rich:menuItem> + <rich:menuItem value="Item 9"></rich:menuItem> + <rich:menuItem value="Item 10"></rich:menuItem> + </rich:dropDownMenu> + <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> + </rich:toolBarGroup> + </rich:toolBar> + </f:subview> +</html> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -4,7 +4,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <h:form> - <rich:scrollableDataTable var="sdt" value="#{scrollableDT.data}" rows="30" width="400px" > + <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="30" width="400px" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" onselectionchange="print('onselectionchangeInputID', 'onselectionchange work!')"> <rich:column width="100px" sortable="false"> <f:facet name="header"> <h:outputText value="Number" /> @@ -33,5 +34,7 @@ <h:outputText value="#{sdt.data3}" /> </rich:column> </rich:scrollableDataTable> - </h:form> + + <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,66 +1,78 @@ -<f:subview id="separatorSubviewID" - xmlns:rich="http://richfaces.org/rich" - xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:c="http://java.sun.com/jstl/core"> +<f:subview id="separatorSubviewID" xmlns:rich="http://richfaces.org/rich" + xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> <h:form> - <h:messages></h:messages> - <h:outputText value="Event:"></h:outputText> - <rich:separator height="20px" width="300px" - onmousedown="alert('mouse click')"></rich:separator> - - <h:outputText value="Some text one..." styleClass="text"></h:outputText> - <rich:separator id="separatorId" rendered="#{separator.rendered}" - width="#{separator.width}" height="#{separator.height}" - title="#{separator.title}" lineType="#{separator.lineType}" - align="#{separator.align}" styleClass="#{separator.style}"></rich:separator> + <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" + title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" + onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2"> - <h:outputText value="Width (px or %): "></h:outputText> - <h:inputText value="#{separator.width}"> - <a4j:support event="onchange" reRender="separatorId"></a4j:support> - </h:inputText> - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{separator.height}"> - <a4j:support event="onchange" reRender="separatorId"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="separator straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{separator.bTest1}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> - <h:outputText value="LineType:"></h:outputText> - <h:selectOneRadio value="#{separator.lineType}" - layout="pageDirection"> - <f:selectItem itemLabel="beveled" itemValue="beveled" /> - <f:selectItem itemLabel="dotted" itemValue="dotted" /> - <f:selectItem itemLabel="dashed" itemValue="dashed" /> - <f:selectItem itemLabel="double" itemValue="double" /> - <f:selectItem itemLabel="solid" itemValue="solid" /> - <a4j:support event="onclick" reRender="separatorId"></a4j:support> - </h:selectOneRadio> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{separator.bTest2}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> - <h:outputText value="Align:"></h:outputText> - <h:selectOneRadio value="#{separator.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="center" itemValue="center" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="separatorId"></a4j:support> - </h:selectOneRadio> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{separator.bTest3}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> - <h:outputText value="Title:"></h:outputText> - <h:inputText value="#{separator.title}"> - <a4j:support event="onchange" reRender="separatorId"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{separator.bTest4}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{separator.rendered}" - onclick="submit()"></h:selectBooleanCheckbox> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{separator.bTest5}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{separator.doStyles}" - value="#{separator.btnLabel}" /> - </h:panelGrid> + <rich:simpleTogglePanel id="separatorPropertyID" switchType="client" opened="true" label="separator property"> + <h:panelGrid columns="2"> + <h:outputText value="Width (px or %): "></h:outputText> + <h:inputText value="#{separator.width}"> + <a4j:support event="onchange" reRender="separatorId"></a4j:support> + </h:inputText> + + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{separator.height}"> + <a4j:support event="onchange" reRender="separatorId"></a4j:support> + </h:inputText> + + <h:outputText value="LineType:"></h:outputText> + <h:selectOneRadio value="#{separator.lineType}" layout="pageDirection"> + <f:selectItem itemLabel="beveled" itemValue="beveled" /> + <f:selectItem itemLabel="dotted" itemValue="dotted" /> + <f:selectItem itemLabel="dashed" itemValue="dashed" /> + <f:selectItem itemLabel="double" itemValue="double" /> + <f:selectItem itemLabel="solid" itemValue="solid" /> + <a4j:support event="onclick" reRender="separatorId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Align:"></h:outputText> + <h:selectOneRadio value="#{separator.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="separatorId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Title:"></h:outputText> + <h:inputText value="#{separator.title}"> + <a4j:support event="onchange" reRender="separatorId"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{separator.rendered}" onclick="submit()"></h:selectBooleanCheckbox> + + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{separator.doStyles}" value="#{separator.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,15 +1,15 @@ -<f:subview id="simpleTogglePanelSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="simpleTogglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <h:form> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" - label="simpleTogglePanel with some text" - width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" - switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" + width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" + opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="closeMarker"> <h:outputText value="Close It" /> </f:facet> @@ -26,18 +26,24 @@ </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" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <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" - focus="#{simpleTogglePanel.focus}"> + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + focus="#{simpleTogglePanel.focus}" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> </f:facet> @@ -61,33 +67,51 @@ <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2" border="1"> - <h:outputText value="Width:"> - </h:outputText> - <h:inputText value="#{simpleTogglePanel.width}"> - <a4j:support event="onchange" reRender="sTP, sTP1"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest1}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> - <h:outputText value="Height:"> - </h:outputText> - <h:inputText value="#{simpleTogglePanel.height}"> - <a4j:support event="onchange" reRender="sTP, sTP1"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest2}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> - <h:outputText value="Switch Type:"></h:outputText> - <h:selectOneRadio value="#{simpleTogglePanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="sTP, sTP1, sTP2"></a4j:support> - </h:selectOneRadio> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest3}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest4}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> - </h:panelGrid> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest5}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + <rich:simpleTogglePanel id="stpPropertyID" switchType="client" opened="true" label="spacer property"> + <h:panelGrid columns="2" border="1"> + <h:outputText value="Width:"> + </h:outputText> + <h:inputText value="#{simpleTogglePanel.width}"> + <a4j:support event="onchange" reRender="sTP,sTP1"></a4j:support> + </h:inputText> + + <h:outputText value="Height:"> + </h:outputText> + <h:inputText value="#{simpleTogglePanel.height}"> + <a4j:support event="onchange" reRender="sTP,sTP1"></a4j:support> + </h:inputText> + + <h:outputText value="Switch Type:"></h:outputText> + <h:selectOneRadio value="#{simpleTogglePanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="sTP,sTP1,sTP2"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,57 +1,64 @@ -<f:subview id="spacerSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:sql="http://java.sun.com/jsp/jstl/sql"> +<f:subview id="spacerSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:sql="http://java.sun.com/jsp/jstl/sql"> <h:form> -<style type="text/css"> -.text -{ -font-size:20px; + <style type="text/css"> +.text { + font-size: 20px; } -.spacer -{ -background-color: aqua; + +.spacer { + background-color: aqua; } </style> - <h:outputText value="Event:"></h:outputText> - <rich:spacer id="spacerIdEven" rendered="#{spacer.rendered}" - style="border: 3px solid red; background: blue;" - styleClass="#{spacer.style}" width="#{spacer.width}" - height="#{spacer.height}" onmousedown="alert('onmousedown')" - title="title"></rich:spacer> - <f:verbatim> - <br /> - </f:verbatim> <h:outputText value="Some text one..." styleClass="text"></h:outputText> - <rich:spacer id="spacerId" width="#{spacer.width}" - height="#{spacer.height}" rendered="#{spacer.rendered}" - styleClass="#{spacer.style}"> + <rich:spacer id="spacerId" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" + styleClass="#{spacer.style}" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> - <h:panelGrid columns="2"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{spacer.width}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{spacer.bTest1}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{spacer.height}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{spacer.bTest2}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{spacer.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{spacer.bTest3}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> - </h:panelGrid> - <a4j:commandButton id="btn" action="#{spacer.doStyle}" - value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> - <f:verbatim> - <br /> - </f:verbatim> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{spacer.bTest4}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{spacer.bTest5}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="spacerPropertyID" switchType="client" opened="true" label="spacer property"> + <h:panelGrid columns="2"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{spacer.width}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> + + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{spacer.height}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Style" /> + <a4j:commandButton id="btn" action="#{spacer.doStyle}" value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> -<h:form id="suggestionbox_form"> + <h:form id="suggestionbox_form"> <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter <br /> </f:verbatim> @@ -17,111 +17,141 @@ bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}" shadowDepth="#{sb.shadowDepth}" reRender="#{sb.reRender}" - selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="fdsf"> + selectValueClass="mousemove" frequency="#{sb.frequency}" + nothingLabel="fdsf" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + onselect="print('onselectInputID', 'onselect work!')" onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <h:column> <h:outputText value="#{result.text}" /> </h:column> </rich:suggestionbox> - <div style="position:relative; font-size:50px; z-index:2; color: navy">z-index</div> + <div + style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> <f:verbatim> <br /> <br /> </f:verbatim> - <h:panelGrid columns="2" cellpadding="5px"> + <rich:simpleTogglePanel switchType="client" opened="true" + label="suggestionBox straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{sb.bTest1}" value="run" + reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> - <h:outputText value="z-index"></h:outputText> - <h:selectOneRadio value="#{sb.zindex}"> - <f:selectItem itemLabel="1" itemValue="1" /> - <f:selectItem itemLabel="3" itemValue="3" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneRadio> - - <f:verbatim>Frequency</f:verbatim> - <h:inputText value="#{sb.frequency}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - - <f:verbatim>Border</f:verbatim> - <h:inputText value="#{sb.border}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{sb.bTest2}" value="run" + reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> - <f:verbatim>Width</f:verbatim> - <h:inputText value="#{sb.width}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{sb.bTest3}" value="run" + reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> - <f:verbatim>Height</f:verbatim> - <h:inputText value="#{sb.height}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{sb.bTest4}" value="run" + reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> - <f:verbatim>Cellpadding</f:verbatim> - <h:inputText value="#{sb.cellpadding}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{sb.bTest5}" value="run" + reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <f:verbatim>Cellspacing</f:verbatim> - <h:inputText value="#{sb.cellspacing}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel id="sbPropertyID" switchType="client" + opened="true" label="suggestionBox property"> + <h:panelGrid columns="2" cellpadding="5px"> - <f:verbatim>First</f:verbatim> - <h:inputText value="#{sb.first}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <h:outputText value="z-index"></h:outputText> + <h:selectOneRadio value="#{sb.zindex}"> + <f:selectItem itemLabel="1" itemValue="1" /> + <f:selectItem itemLabel="3" itemValue="3" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneRadio> - <f:verbatim>MinChars</f:verbatim> - <h:inputText value="#{sb.minchars}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> + <f:verbatim>Frequency</f:verbatim> + <h:inputText value="#{sb.frequency}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{sb.bgColor}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <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="suggestionBoxId"></a4j:support> - </h:selectOneMenu> + <f:verbatim>Border</f:verbatim> + <h:inputText value="#{sb.border}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> - <h:outputText value="Shadow Opacity"></h:outputText> - <h:selectOneRadio value="#{sb.shadowOpacity}"> - <f:selectItem itemLabel="1" itemValue="1" /> - <f:selectItem itemLabel="3" itemValue="2" /> - <f:selectItem itemLabel="5" itemValue="3" /> - <f:selectItem itemLabel="7" itemValue="4" /> - <f:selectItem itemLabel="9" itemValue="5" /> - <f:selectItem itemLabel="11" itemValue="6" /> - <f:selectItem itemLabel="13" itemValue="7" /> - <f:selectItem itemLabel="15" itemValue="8" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneRadio> + <f:verbatim>Width</f:verbatim> + <h:inputText value="#{sb.width}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> - <h:outputText value="Shadow Depth"></h:outputText> - <h:selectOneRadio value="#{sb.shadowDepth}"> - <f:selectItem itemLabel="3" itemValue="3" /> - <f:selectItem itemLabel="4" itemValue="4" /> - <f:selectItem itemLabel="5" itemValue="5" /> - <f:selectItem itemLabel="6" itemValue="6" /> - <f:selectItem itemLabel="7" itemValue="6" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneRadio> + <f:verbatim>Height</f:verbatim> + <h:inputText value="#{sb.height}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> - <h:outputText value="reRender"></h:outputText> - <h:selectBooleanCheckbox value="#{sb.reRender}"></h:selectBooleanCheckbox> - </h:panelGrid> + <f:verbatim>Cellpadding</f:verbatim> + <h:inputText value="#{sb.cellpadding}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>Cellspacing</f:verbatim> + <h:inputText value="#{sb.cellspacing}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>First</f:verbatim> + <h:inputText value="#{sb.first}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>MinChars</f:verbatim> + <h:inputText value="#{sb.minchars}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <h:outputText value="Background Colour"></h:outputText> + <h:selectOneMenu value="#{sb.bgColor}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <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="suggestionBoxId"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Shadow Opacity"></h:outputText> + <h:selectOneRadio value="#{sb.shadowOpacity}"> + <f:selectItem itemLabel="1" itemValue="1" /> + <f:selectItem itemLabel="3" itemValue="2" /> + <f:selectItem itemLabel="5" itemValue="3" /> + <f:selectItem itemLabel="7" itemValue="4" /> + <f:selectItem itemLabel="9" itemValue="5" /> + <f:selectItem itemLabel="11" itemValue="6" /> + <f:selectItem itemLabel="13" itemValue="7" /> + <f:selectItem itemLabel="15" itemValue="8" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Shadow Depth"></h:outputText> + <h:selectOneRadio value="#{sb.shadowDepth}"> + <f:selectItem itemLabel="3" itemValue="3" /> + <f:selectItem itemLabel="4" itemValue="4" /> + <f:selectItem itemLabel="5" itemValue="5" /> + <f:selectItem itemLabel="6" itemValue="6" /> + <f:selectItem itemLabel="7" itemValue="6" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="reRender"></h:outputText> + <h:selectBooleanCheckbox value="#{sb.reRender}"></h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,112 +1,135 @@ -<f:subview id="tabPanelSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:c="http://java.sun.com/jsp/jstl/core"> -<h:form> - <rich:tabPanel id="tabPanelId" - headerAlignment="#{tabPanel.headerAlignment}" - width="#{tabPanel.width}" height="#{tabPanel.height}" - rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" - switchType="#{tabPanel.switchType}" - headerSpacing="#{tabPanel.headerSpacing}" - selectedTab="#{tabPanel.selectedTab}" - activeTabClass="#{tabPanel.activeTabStyle}" - disabledTabClass="#{tabPanel.disabledTabStyle}" - inactiveTabClass="#{tabPanel.inactiveTabStyle}" - contentClass="#{tabPanel.contentStyle}"> +<f:subview id="tabPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> + <h:form> + <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" + height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" + headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" + disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" + contentClass="#{tabPanel.contentStyle}" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> - <rich:tab id="tabOne" onmousedown="alert('OnMouseDown');" - labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}"> - <h:outputText value="This is tab panel test example" - styleClass="text1"></h:outputText> - </rich:tab> - <rich:tab id="tabTwo" label="Tab with image" - disabled="#{tabPanel.disabledTab}"> - <f:facet name="header"> - <h:outputText value="client switchType from facet" /> - </f:facet> - <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" - height="383"></h:graphicImage> - </rich:tab> - <rich:tab id="tabThree" label="Tab with some text" - disabled="#{tabPanel.disabledTab}"> - <h:outputText - value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> + </rich:tab> + <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + <f:facet name="header"> + <h:outputText value="client switchType from facet" /> + </f:facet> + <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> + </rich:tab> + <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + <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..." /> - </rich:tab> - </rich:tabPanel> + </rich:tab> + </rich:tabPanel> - <rich:spacer height="20px"></rich:spacer> + <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2" cellspacing="10px"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{tabPanel.width}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{tabPanel.height}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{tabPanel.bTest2}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> - <h:outputText value="Title:"></h:outputText> - <h:inputText value="#{tabPanel.title}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{tabPanel.bTest3}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> - <h:outputText value="LabelWidth:"></h:outputText> - <h:inputText value="#{tabPanel.labelWidth}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{tabPanel.bTest4}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> - <h:outputText value="SwitchType:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{tabPanel.bTest5}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Header Alignment:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.headerAlignment}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="center" itemValue="center" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> + <rich:simpleTogglePanel id="tpPropertyID" switchType="client" opened="true" label="tabPanel property"> + <h:panelGrid columns="2" cellspacing="10px"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{tabPanel.width}" onchange="submit();" /> - <h:outputText value="Header Spacing:"></h:outputText> - <h:inputText value="#{tabPanel.headerSpacing}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{tabPanel.height}" onchange="submit();" /> - <h:outputText value="Selected Tab:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.selectedTab}" onchange="submit();"> - <f:selectItem itemLabel="1" itemValue="tabOne" /> - <f:selectItem itemLabel="2" itemValue="tabTwo" /> - <f:selectItem itemLabel="3" itemValue="tabThr" /> - </h:selectOneRadio> + <h:outputText value="Title:"></h:outputText> + <h:inputText value="#{tabPanel.title}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:inputText> - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{tabPanel.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> + <h:outputText value="LabelWidth:"></h:outputText> + <h:inputText value="#{tabPanel.labelWidth}" onchange="submit();" /> - <h:outputText value="Disable Tab"></h:outputText> - <h:selectBooleanCheckbox value="#{tabPanel.disabledTab}" - onclick="submit()"> - </h:selectBooleanCheckbox> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{tabPanel.doStyles}" - value="#{tabPanel.btnLabel}" /> + <h:outputText value="SwitchType:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectOneRadio> + <h:outputText value="Header Alignment:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.headerAlignment}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectOneRadio> - </h:panelGrid> -</h:form> + <h:outputText value="Header Spacing:"></h:outputText> + <h:inputText value="#{tabPanel.headerSpacing}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:inputText> + + <h:outputText value="Selected Tab:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.selectedTab}" onchange="submit();"> + <f:selectItem itemLabel="1" itemValue="tabOne" /> + <f:selectItem itemLabel="2" itemValue="tabTwo" /> + <f:selectItem itemLabel="3" itemValue="tabThr" /> + </h:selectOneRadio> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{tabPanel.immediate}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{tabPanel.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Disable Tab"></h:outputText> + <h:selectBooleanCheckbox value="#{tabPanel.disabledTab}" onclick="submit()"> + </h:selectBooleanCheckbox> + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{tabPanel.doStyles}" value="#{tabPanel.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,22 +1,21 @@ -<f:subview id="togglePanelSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:subview id="togglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <h:form id="tooggleTest"> - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" - initialState="asus" stateOrder="asus,blank" - style="width:300px!important"> + + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" + style="width:300px!important; overflow: hidden;" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="blank"> <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" - for="tooggleTest:panel1"> + <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;" /> + <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> @@ -27,21 +26,16 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" - for="tooggleTest:panel1"> + <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;" /> + <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: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" /> + <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 /> @@ -55,36 +49,34 @@ </rich:panel> </f:facet> </rich:togglePanel> - + <f:verbatim> <br /> <br /> </f:verbatim> - - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" - initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}"> + + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <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="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;" /> + <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: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" /> + <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 /> @@ -102,23 +94,17 @@ <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="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;" /> + <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: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" /> + <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 /> @@ -136,23 +122,17 @@ <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="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;" /> + <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: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" /> + <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 /> @@ -166,38 +146,57 @@ </rich:panel> </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> + <rich:simpleTogglePanel switchType="client" opened="true" label="tooglePanel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{togglePanel.bTest1}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> - <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="Test2" /> + <a4j:commandButton action="#{togglePanel.bTest2}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> - <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:outputText value="Test3" /> + <a4j:commandButton action="#{togglePanel.bTest3}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{togglePanel.bTest4}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{togglePanel.bTest5}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="tPanelPropertyID" switchType="client" opened="true" label="tooglePanel property"> + <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="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> + </rich:simpleTogglePanel> <ui:debug hotkey="L"></ui:debug> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,8 +1,5 @@ -<f:subview id="tooltipSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="tooltipSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <h:form> <h:messages></h:messages> @@ -13,14 +10,14 @@ <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"> + <rich:toolTip value="toolTip for input text" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="defaultContent"> <f:verbatim>DEFAULT VALUE</f:verbatim> </f:facet> @@ -28,7 +25,13 @@ </h:inputText> <h:selectOneListbox value="1" id="ddl"> - <rich:toolTip value="1231231"> + <rich:toolTip value="1231231" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="defaultContent"> <f:verbatim>DEFAULT VALUE DropDown</f:verbatim> </f:facet> @@ -46,13 +49,16 @@ </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}" - horizontalOffset="#{tooltip.horizontalOffset}" - verticalOffset="#{tooltip.verticalOffset}" - followMouse="#{tooltip.followMouse}" - direction="#{tooltip.direction}" style="#{tooltip.style}" - disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}"> + <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}" direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" + rendered="#{tooltip.rendered}" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> </rich:toolTip> </rich:panel> @@ -60,80 +66,96 @@ <f:verbatim> <br /> </f:verbatim> - - <h:panelGrid columns="2"> - <h:outputText value="Text:"></h:outputText> - <h:inputText value="#{tooltip.value}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Delay"></h:outputText> - <h:inputText value="#{tooltip.delay}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Layout:"></h:outputText> - <h:selectOneRadio value="#{tooltip.layout}"> - <f:selectItem itemLabel="inline" itemValue="inline" /> - <f:selectItem itemLabel="block" itemValue="block" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - - <h:outputText value="Mode:"></h:outputText> - <h:selectOneRadio value="#{tooltip.mode}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> - <h:outputText value="Horizontal offset:"></h:outputText> - <h:inputText value="#{tooltip.horizontalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{dDMenu.bTest2}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> - <h:outputText value="Vertical offset:"></h:outputText> - <h:inputText value="#{tooltip.verticalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dDMenu.bTest3}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> - <h:outputText value="Follow mouse:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dDMenu.bTest4}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> - <h:outputText value="Direction:" /> - <h:selectOneRadio value="#{tooltip.direction}"> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dDMenu.bTest5}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Style:"></h:outputText> - <h:selectOneRadio value="#{tooltip.style}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="border:3px; font:bold 14px;" - itemValue="border:3px; font:bold 14px;" /> - <f:selectItem - itemLabel="border:green 3px solid; background-color:yellow;" - itemValue="border:green 3px solid; background-color:yellow;" /> - <f:selectItem - itemLabel="border:green 2px solid; font-family:monospace;" - itemValue="border:green 2px solid; font-family:monospace;" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <rich:simpleTogglePanel id="toolTipPropertyID" switchType="client" opened="true" label="toolTip property"> + <h:panelGrid columns="2"> + <h:outputText value="Text:"></h:outputText> + <h:inputText value="#{tooltip.value}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Disambled:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.disabled}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> + <h:outputText value="Delay"></h:outputText> + <h:inputText value="#{tooltip.delay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.rendered}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - </h:panelGrid> + <h:outputText value="Layout:"></h:outputText> + <h:selectOneRadio value="#{tooltip.layout}"> + <f:selectItem itemLabel="inline" itemValue="inline" /> + <f:selectItem itemLabel="block" itemValue="block" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + <h:outputText value="Mode:"></h:outputText> + <h:selectOneRadio value="#{tooltip.mode}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Horizontal offset:"></h:outputText> + <h:inputText value="#{tooltip.horizontalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Vertical offset:"></h:outputText> + <h:inputText value="#{tooltip.verticalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Follow mouse:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Direction:" /> + <h:selectOneRadio value="#{tooltip.direction}"> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Style:"></h:outputText> + <h:selectOneRadio value="#{tooltip.style}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="border:3px; font:bold 14px;" itemValue="border:3px; font:bold 14px;" /> + <f:selectItem itemLabel="border:green 3px solid; background-color:yellow;" + itemValue="border:green 3px solid; background-color:yellow;" /> + <f:selectItem itemLabel="border:green 2px solid; font-family:monospace;" + itemValue="border:green 2px solid; font-family:monospace;" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Disambled:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.disabled}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.rendered}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,29 +1,26 @@ -<f:subview id="treeSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:dnd="http://richfaces.ajax4jsf.org/drag-drop"> +<f:subview id="treeSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:dnd="http://richfaces.ajax4jsf.org/drag-drop"> <h:form> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> - - <rich:tree id="tree" switchType="#{bean.switchType}" - value="#{bean.data}" var="data" - nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" - changeExpandListener="#{bean.onExpand}" - nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" - onselected="window.status='selectedNode: '+event.selectedNode;" - onexpand="window.status='expandedNode: '+event.expandedNode" - oncollapse="window.status='collapsedNode: '+ event.collapsedNode" - ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" - preserveModel="none" dragIndicator="treeIndicator" immediate="false" - acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" - iconCollapsed="#{bean.iconCollapsed}" - iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" - icon="#{bean.icon}" dropListener="#{bean.processDrop}"> + <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" + nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" changeExpandListener="#{bean.onExpand}" + nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;" + onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode" + onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')" + ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" + immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}" + iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}"> + <f:facet name="icon"> <h:outputText value="icon" rendered="#{bean.renderFacets}" /> </f:facet> @@ -44,27 +41,24 @@ oncollapse="Element.removeClassName(event['treeItem'].getElement(), 'colored')" onexpand="Element.addClassName(event['treeItem'].getElement(), 'colored')"> <h:outputText value="#{data} : " /> - <h:inputText value="#{data.name}" required="true" - styleClass="inputs"> + <h:inputText value="#{data.name}" required="true" styleClass="inputs"> </h:inputText> <dnd:dndParam name="nodeParam" value="Node Parameter" /> </rich:treeNode> - <rich:treeNode type="text" nodeClass="customNode" - acceptedTypes="file2" onselected="return false;"> + <rich:treeNode type="text" nodeClass="customNode" acceptedTypes="file2" onselected="return false;"> <h:outputText value="#{data}" /> </rich:treeNode> </rich:tree> - + <f:verbatim> <br /> </f:verbatim> <h:outputText value="Enter path to expand:" /> <h:inputText value="#{bean.pathToExpand}"> - <a4j:support event="onchange" reRender="tree" - action="#{bean.expandNode}" /> + <a4j:support event="onchange" reRender="tree" action="#{bean.expandNode}" /> </h:inputText> <rich:separator></rich:separator> @@ -81,11 +75,9 @@ <h:selectBooleanCheckbox value="#{bean.dragOn}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="Render facets:" /> - <h:selectBooleanCheckbox value="#{bean.renderFacets}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{bean.renderFacets}" onchange="submit();"></h:selectBooleanCheckbox> - <h:commandButton value="#{bean.commandButtonCaption}" - actionListener="#{bean.changeIcons}" /> + <h:commandButton value="#{bean.commandButtonCaption}" actionListener="#{bean.changeIcons}" /> </h:panelGrid> <f:verbatim> @@ -93,8 +85,7 @@ <br /> </f:verbatim> - <rich:tree id="testTree" var="_data" switchType="ajax" - ajaxSubmitSelection="true" preserveModel="none" value="#{bean.data1}" + <rich:tree id="testTree" var="_data" switchType="ajax" ajaxSubmitSelection="true" preserveModel="none" value="#{bean.data1}" nodeSelectListener="#{bean.onSelectInc}" nodeFace="node"> <rich:treeNode type="node"> <h:outputText value="#{_data}" /> @@ -104,11 +95,10 @@ <h:outputText value="Tree without treeNode:"></h:outputText> <rich:separator></rich:separator> - <rich:tree switchType="client" style="width:300px" - value="#{pathwayBean.pathwayTree}" var="item" nodeFace="#{item.type}"> + <rich:tree switchType="client" style="width:300px" value="#{pathwayBean.pathwayTree}" var="item" nodeFace="#{item.type}"> <rich:treeNode type="library"> <h:outputText value="#{item.type}" /> - </rich:treeNode> + </rich:treeNode> <rich:treeNode type="pathway"> <h:outputText value="#{item.name}" /> </rich:treeNode> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,59 +1,51 @@ -<f:subview id="virtualEarthSubviewID" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:rich="http://richfaces.org/rich" +<f:subview id="virtualEarthSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> <h:form> - <h:panelGrid columns="2"> - <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" - dashboardSize="Normal" zoom="#{virtualEarth.zoom}" mapStyle="Hybrid" - var="map" /> + <h:panelGrid columns="2"> + <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" + mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onLoadMap="print('onLoadMapInputID', 'onLoadMap work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> - <h:panelGroup> - <f:verbatim> + <h:panelGroup> + <f:verbatim> Dashboard:<br /> - <a href="javascript:void(0);" - onclick="map.HideDashboard();return false;">Remove</a> - <a href="javascript:void(0);" - onclick="map.ShowDashboard();return false;">Show</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show - Exadel Office</a> - <br /> - <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in - Belarus</a> - </f:verbatim> - </h:panelGroup> - - </h:panelGrid> - <a4j:outputPanel id="zoomer"> - <script> + <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> + + </h:panelGrid> + <a4j:outputPanel id="zoomer"> + <script> function zoomIt() { map.setZoom(#{virtualEarth.zoom}); } </script> - </a4j:outputPanel> - <a4j:outputPanel> - <script> + </a4j:outputPanel> + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); GEvent.addListener(marker, "click", function() { @@ -72,6 +64,6 @@ map.SetMapStyle(VEMapStyle.Birdseye); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </h:form> -</f:subview> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml 2007-11-02 10:11:55 UTC (rev 3703) @@ -7,4 +7,4 @@ <managed-bean-class>dnd.DndBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> -</faces-config> + </faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skin.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skin.xml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skin.xml 2007-11-02 10:11:55 UTC (rev 3703) @@ -2,9 +2,9 @@ <!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>skinBean</managed-bean-name> - <managed-bean-class>skins.Skins</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> + <managed-bean> + <managed-bean-name>skinBean</managed-bean-name> + <managed-bean-class>util.skins.Skins</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> </faces-config> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-jQuery.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-jQuery.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-jQuery.xml 2007-11-02 10:11:55 UTC (rev 3703) @@ -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>jQuery</managed-bean-name> + <managed-bean-class>jQuery.JQuery</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-11-02 10:11:55 UTC (rev 3703) @@ -66,7 +66,7 @@ </navigation-case> <navigation-case> <from-outcome>dnd</from-outcome> - <to-view-id>/DragAndDrop/DragAndDrop.xhtml</to-view-id> + <to-view-id>/DradAndDrop/DragAndDrop.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>DS</from-outcome> @@ -121,21 +121,21 @@ <to-view-id>/pages/Rich/Rich.xhtml</to-view-id> </navigation-case> <navigation-case> - <from-outcome>RichPanels</from-outcome> - <to-view-id>/pages/RichPanels/RichPanels.xhtml</to-view-id> - </navigation-case> - <navigation-case> <from-outcome>Map</from-outcome> <to-view-id>/pages/Select/Map.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>RichTest</from-outcome> - <to-view-id>/Rich/RichTest.xhtml</to-view-id> + <to-view-id>/RichTest/RichTest.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>CustomizePage</from-outcome> <to-view-id>/CustomizePage/CustomizePage.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>jQuery</from-outcome> + <to-view-id>/jQuery/jQuery.xhtml</to-view-id> + </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>/Panel/Panel.xhtml</from-view-id> @@ -162,6 +162,6 @@ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> </application> <lifecycle> - <phase-listener id="phaseTracker">demo.PhaseTracker</phase-listener> + <phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener> </lifecycle> </faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - <description>Vcp Test app.</description> - <display-name>vcp-ComponentsTesting_3_0(1.1_F)</display-name> + <description>Vcp Test-Application</description> + <display-name>test-application</display-name> <context-param> <param-name>org.ajax4jsf.SKIN</param-name> <param-value>#{skinBean.skin}</param-value> @@ -33,12 +33,19 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/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-ModalPanel.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-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Messa! ge.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value> + <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, + /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-ModalPanel.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-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, + /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, + /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, + /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, + /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml</param-value> </context-param> - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,146 +1,150 @@ -<f:subview id="inputNumberSliderSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<f:subview id="inputNumberSliderSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <h:form> - <h:panelGrid columns="1"> - <!--a4j:log level="ALL" popup="false" width="400" height="200"/--> - <h:outputText value="Event:"></h:outputText> - <rich:inputNumberSlider minValue="0" maxValue="100" width="300px" - onmousedown="alert('OnMouseDown');" onblur="" onchange="" onclick="" ondblclick="" onerror="" onfocus="" onselect="" onkeydown="" - onkeypress="" onkeyup="" onmousemove="" onmouseout="" onmouseover="" onmouseup=""></rich:inputNumberSlider> + <h:panelGrid columns="1"> + <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" + inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" + tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="key" + required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}" + disabled="#{inputNumberSlider.disabled}" enableManualInput="#{inputNumberSlider.enableManualInput}" + inputSize="#{inputNumberSlider.inputSize}" maxValue="#{inputNumberSlider.maxValue}" minValue="#{inputNumberSlider.minValue}" + rendered="#{inputNumberSlider.rendered}" showBoundaryValues="#{inputNumberSlider.showBoundaryValues}" + step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}" + barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}" + handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}" + maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onblur="print('onblurInputID', 'onblur work!')" onchange="print('onchangeInputID', 'onchange work!')" + onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onerror="print('ondblclickInputID', 'ondblclick work!')" onfocus="print('onfocusInputID', 'onfocus work!')" + onselect="print('onselectInputID', 'onselect work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + <a4j:support event="onchange" reRender="valueID,work" /> + </rich:inputNumberSlider> - <rich:spacer height="15px" width="300px"></rich:spacer> + <h:outputText id="work" value="#{key}" /> + </h:panelGrid> - <rich:inputNumberSlider id="SliderId" - immediate="#{inputNumberSlider.immediate}" - required="#{inputNumberSlider.rendered}" - requiredMessage="#{inputNumberSlider.requiredMessage}" - inputPosition="#{inputNumberSlider.inputPosition}" - showToolTip="#{inputNumberSlider.showToolTip}" - tabindex="#{inputNumberSlider.tabindex}" - value="#{inputNumberSlider.value}" - valueChangeListener="#{inputNumberSlider.changeListener}" - disabled="#{inputNumberSlider.disabled}" - enableManualInput="#{inputNumberSlider.enableManualInput}" - inputSize="#{inputNumberSlider.inputSize}" - maxValue="#{inputNumberSlider.maxValue}" - minValue="#{inputNumberSlider.minValue}" - rendered="#{inputNumberSlider.rendered}" - showBoundaryValues="#{inputNumberSlider.showBoundaryValues}" - step="#{inputNumberSlider.step}" - showInput="#{inputNumberSlider.showInput}" - width="#{inputNumberSlider.width}" - barClass="#{inputNumberSlider.barStyle}" - tipClass="#{inputNumberSlider.tipStyle}" - inputClass="#{inputNumberSlider.inputStyle}" - handleClass="#{inputNumberSlider.handleStyle}" - styleClass="#{inputNumberSlider.tipStyle}" - maxlength="#{inputNumberSlider.maxlength}"></rich:inputNumberSlider> - <rich:spacer height="20px"></rich:spacer> - </h:panelGrid> - - <h:panelGrid columns="2" cellspacing="10px" border="1"> - - <h:outputText value="value" /> - <h:outputText value="#{inputNumberSlider.value}" /> - - - - <h:outputText value="inputPosition"></h:outputText> - <h:selectOneRadio value="#{inputNumberSlider.inputPosition}"> - <f:selectItem itemLabel="right" itemValue="right"/> - <f:selectItem itemLabel="left" itemValue="left"/> - </h:selectOneRadio> - - <h:outputText value="Width:"></h:outputText> - <h:inputText value="#{inputNumberSlider.width}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - <h:outputText value="Max Value:"></h:outputText> - <h:inputText value="#{inputNumberSlider.maxValue}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSlider straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{inputNumberSlider.bTest1}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> - <h:outputText value="Min Value:"></h:outputText> - <h:inputText value="#{inputNumberSlider.minValue}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{inputNumberSlider.bTest2}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> - <h:outputText value="Input Size:"></h:outputText> - <h:inputText value="#{inputNumberSlider.inputSize}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{inputNumberSlider.bTest3}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> - <h:outputText value="Input MaxLength:"></h:outputText> - <h:inputText value="#{inputNumberSlider.maxlength}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{inputNumberSlider.bTest4}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> - <h:outputText value="Step:"></h:outputText> - <h:inputText value="#{inputNumberSlider.step}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="tabindex" /> - <h:inputText value="#{inputNumberSlider.tabindex}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{inputNumberSlider.bTest5}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> - <h:outputText value="Disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSlider.disabled}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> + <rich:simpleTogglePanel id="iNSliderPropertyID" switchType="client" opened="true" label="inputNumberSlider property"> + <h:panelGrid columns="2" cellspacing="10px" border="1"> + <h:outputText value="value" /> + <h:inputText value="#{inputNumberSlider.value}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSlider.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> + <h:outputText value="inputPosition"></h:outputText> + <h:selectOneRadio value="#{inputNumberSlider.inputPosition}"> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="left" itemValue="left" /> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectOneRadio> - <h:outputText value="Manual Input:"></h:outputText> - <h:selectBooleanCheckbox - value="#{inputNumberSlider.enableManualInput}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Width:"></h:outputText> + <h:inputText value="#{inputNumberSlider.width}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> - <h:outputText value="Boundary Values:"></h:outputText> - <h:selectBooleanCheckbox - value="#{inputNumberSlider.showBoundaryValues}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Max Value:"></h:outputText> + <h:inputText value="#{inputNumberSlider.maxValue}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> - <h:outputText value="Show Input:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSlider.showInput}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="showToolTip" /> - <h:selectBooleanCheckbox value="#{inputNumberSlider.showToolTip}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Min Value:"></h:outputText> + <h:inputText value="#{inputNumberSlider.minValue}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> - <h:outputText value="required" /> - <h:selectBooleanCheckbox value="#{inputNumberSlider.required}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="requiredMessage" /> - <h:inputText value="#{inputNumberSlider.requiredMessage}" > - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="immediate" /> - <h:selectBooleanCheckbox value="#{inputNumberSlider.immediate}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Input Size:"></h:outputText> + <h:inputText value="#{inputNumberSlider.inputSize}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> - <h:outputText value="Switch Styles" /> - <a4j:commandButton id="slBtn" value="#{inputNumberSlider.btnLabel}" - action="#{inputNumberSlider.doStyles}" reRender="SliderId,slBtn"> - </a4j:commandButton> - </h:panelGrid> + <h:outputText value="Input MaxLength:"></h:outputText> + <h:inputText value="#{inputNumberSlider.maxlength}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Step:"></h:outputText> + <h:inputText value="#{inputNumberSlider.step}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="tabindex" /> + <h:inputText value="#{inputNumberSlider.tabindex}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Disabled:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.disabled}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Manual Input:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.enableManualInput}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Boundary Values:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showBoundaryValues}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Show Input:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showInput}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="showToolTip" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showToolTip}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="required" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.required}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage" /> + <h:inputText value="#{inputNumberSlider.requiredMessage}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.immediate}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Switch Styles" /> + <a4j:commandButton id="slBtn" value="#{inputNumberSlider.btnLabel}" action="#{inputNumberSlider.doStyles}" + reRender="SliderId,slBtn"> + </a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,82 +1,93 @@ -<f:subview id="inputNumberSpinnerSubviewID" - xmlns:rich="http://richfaces.org/rich" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:h="http://java.sun.com/jsf/html" +<f:subview id="inputNumberSpinnerSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... <h:form> <h:messages></h:messages> - <h:outputText value="Event:"></h:outputText> - <rich:inputNumberSpinner minValue="0" maxValue="10" - onchange="alert('mouse down');"></rich:inputNumberSpinner> - <rich:spacer height="15px"></rich:spacer> - - <rich:inputNumberSpinner id="SpinnerID" - cycled="#{inputNumberSpinner.cycled}" - disabled="#{inputNumberSpinner.disabled}" - maxValue="#{inputNumberSpinner.max}" - minValue="#{inputNumberSpinner.min}" - step="#{inputNumberSpinner.step}" - rendered="#{inputNumberSpinner.rendered}" - value="#{inputNumberSpinner.value}" - inputClass="#{inputNumberSpinner.inputStyle}" - styleClass="#{inputNumberSpinner.style}" - enableManualInput="#{inputNumberSpinner.manualInput}" - inputSize="#{inputNumberSpinner.inputSize}"></rich:inputNumberSpinner> + <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" + disabled="#{inputNumberSpinner.disabled}" maxValue="#{inputNumberSpinner.max}" minValue="#{inputNumberSpinner.min}" + step="#{inputNumberSpinner.step}" rendered="#{inputNumberSpinner.rendered}" value="#{inputNumberSpinner.value}" + inputClass="#{inputNumberSpinner.inputStyle}" styleClass="#{inputNumberSpinner.style}" + enableManualInput="#{inputNumberSpinner.manualInput}" inputSize="#{inputNumberSpinner.inputSize}" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onblur="print('onblurInputID', 'onblur work!')" + onchange="print('onchangeInputID', 'onchange work!')" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onerror="print('ondblclickInputID', 'ondblclick work!')" + onfocus="print('onfocusInputID', 'onfocus work!')" onselect="print('onselectInputID', 'onselect work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" + onupclick="print('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> + <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSpinner straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest1}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> - <h:panelGrid columns="2" cellpadding="10px" border="1"> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest2}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> - <h:outputText value="Max: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.max}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest3}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> - <h:outputText value="Min: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.min}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest4}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> - <h:outputText value="Step: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.step}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest5}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + </h:panelGrid> - <h:outputText value="Size: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.inputSize}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> + </rich:simpleTogglePanel> - <h:outputText value="Value: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.value}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> + <rich:simpleTogglePanel id="iNSpinnerPropertyID" switchType="client" opened="true" label="inputNumberSpinner property"> + <h:panelGrid columns="2" cellpadding="10px" border="1"> + <h:outputText value="Max: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.max}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> - <h:outputText value="Cycled:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.cycled}"> - <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Min: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.min}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> - <h:outputText value="Manual Input:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.manualInput}"> - <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Step: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.step}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> - <h:outputText value="Disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.disabled}"> - <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="Size: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.inputSize}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{inputNumberSpinner.doStyles}" - value="#{inputNumberSpinner.btnLabel}" /> - </h:panelGrid> + <h:outputText value="Value: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.value}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> + + <h:outputText value="Cycled:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.cycled}"> + <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Manual Input:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.manualInput}"> + <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Disabled:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.disabled}"> + <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{inputNumberSpinner.doStyles}" value="#{inputNumberSpinner.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> </h:form> </f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -0,0 +1,137 @@ +<f:subview id="EventInfoSubview" xmlns="http://www.w3.org/1999/xhtml" + xmlns:rich="http://richfaces.org/rich" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + <f:verbatim><div style="position: relative"> + <input id="ontableaveInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onLoadMapInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onselectionchangeInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondownclickInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onupclickInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="oninitInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ongroupactivateInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onitemselectInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onsubmitInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowClickInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowDblClickInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseDownInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseMoveInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseOutInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseOverInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseUpInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onselectInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onchangeInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onfocusInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onblurInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onclickInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="oncollapseInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="oncompleteInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondblclickInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragendInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragenterInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragexitInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragstartInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondropInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondropendInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onexpandInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onkeydownInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onkeypressInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onkeyupInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmousedownInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmousemoveInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseoutInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseoverInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseupInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onselectedInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onhideInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseoverInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseupInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onshowInputID" type="hidden" value="" size="42" /> + </div></f:verbatim> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -8,16 +8,36 @@ <f:view> <head> <title></title> + + <script type="text/javascript"> + function print(info, text){ + window.document.getElementById(info).value = text; + window.document.getElementById(info).type = "text"; + } + </script> <link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> </head> <body> <div id="divOpthID" align="right" style="z-index: 200"> - <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + <ui:include src="/pages/RichMenu/RichMenu.xhtml" /> </div> <ui:include src="${richBean.src}" /> + + <rich:modalPanel id="eventInfoID" autosize="true" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> + <ui:include src="/pages/Action/EventInfo.xhtml" /> + + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> + </body> </f:view> </html> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,20 +1,25 @@ -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> +<h:form id="forvDivOpthID" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + <rich:toolBar itemSeparator="none" > + <rich:toolBarGroup location="right"> + <h:panelGrid columns="1"> + <h:outputText value="Select skin: " /> + <h:selectOneMenu binding="#{skinBean.component}" onblur="submit();"> + <a4j:support action="#{skinBean.change}" event="onchange"/> + + </h:selectOneMenu> + </h:panelGrid> + </rich:toolBarGroup> - <h:form id="forvDivOpthID"> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - + <rich:toolBarGroup location="right"> + <h:panelGrid columns="1"> <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" /> <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" /> <f:selectItem itemValue="/DataTable/DT.xhtml" itemLabel="Date Table" /> - <f:selectItem itemValue="/DragAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" /> <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" /> <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" /> @@ -39,8 +44,10 @@ <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" /> <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" /> <f:selectItem itemValue="/ScrollableDataTable/ScrollableDataTable.xhtml" itemLabel="ScrollableDataTable" /> + <f:selectItem itemValue="/jQuery/jQuery.xhtml" itemLabel="jQuery" /> </h:selectOneMenu> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> -</html> \ No newline at end of file + </rich:toolBarGroup> + </rich:toolBar> + <h:commandLink value="Back" action="main"></h:commandLink> +</h:form> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-11-02 10:11:55 UTC (rev 3703) @@ -10,18 +10,22 @@ </head> <body> <h:form> - <div align="center"><h:outputText - value="VCP Test Application (JSF 1.1RI(1.2RI) with Facelets)" - style="font-size: 30px"></h:outputText></div> + <rich:panel> + <f:verbatim><div align="center"><font size="15px" color="#191970">RichFaces Test Application (JSF 1.1RI(1.2RI) with Facelets)</font></div></f:verbatim> + </rich:panel> + <rich:spacer></rich:spacer> <rich:panel> <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> <h:commandLink value="RichFaces" action="Test"></h:commandLink> <h:commandLink value="Div" action="TestDiv"></h:commandLink> <h:commandLink value="Select" action="Map"></h:commandLink> <h:commandLink value="Customize page" action="CustomizePage"></h:commandLink> - <h:commandLink value="RichPanels" action="RichPanels"></h:commandLink> </h:panelGrid> </rich:panel> + <rich:spacer></rich:spacer> + <rich:panel> + <div align="right"><font size="4px" color="#000000">RichFace: #{a4j.version}</font></div> + </rich:panel> </h:form> </body> </f:view> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css 2007-11-02 04:01:42 UTC (rev 3702) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css 2007-11-02 10:11:55 UTC (rev 3703) @@ -1,3 +1,7 @@ +/*simple toggle panel (icon position)*/ +.dr-stglpanel-marker { + float: right; +} /* Message and messages */ .rich-message-label { padding: 0px 10px; @@ -25,6 +29,7 @@ .infoLabel { color: #00FF00; +width: inherit; } .fatalLabel {