Author: ayanul Date: 2007-10-22 08:55:14 -0400 (Mon, 22 Oct 2007) New Revision: 3464 Added: branches/3.1.x/test-applications/jsp/src/main/java/jQuery/ branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/jsp/src/main/java/util/ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/ branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java branches/3.1.x/test-applications/jsp/src/main/java/util/skins/ branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/ branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Div/ branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/ branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Select/ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/ branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp Log: Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -21,7 +21,6 @@ package calendar; -import java.lang.reflect.Array; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -30,21 +29,19 @@ import java.util.StringTokenizer; import java.util.TimeZone; -import javax.faces.component.UIComponent; import javax.faces.event.ValueChangeEvent; -import javax.faces.webapp.UIComponentTag; import org.richfaces.event.CurrentDateChangeEvent; public class CalendarBean { - private static final String [] WEEK_DAY_SHORT = new String[] { "Sun *", - "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *" }; - private static final String [] WEEK_DAY = new String[] { "Monday", - "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" }; - private static final String [] MOUNT_LABELS = new String[] { "January", - "February", "March", "April", "May", "June", "July", "August", - "September", "October", "November", "December" }; + private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|", + "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" }; + private static final String [] WEEK_DAY = new String[] { "|>Saturday*<|", "|>Monday+<|", + "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"}; + private static final String [] MOUNT_LABELS = new String[] { "January +", + "February +", "March +", "April +", "May +", "June +", "July +", "August +", + "September +", "October +", "November +", "December +" }; private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +", "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +", "Sep +", "Oct +", "Nov +", "Dec +" }; @@ -73,7 +70,6 @@ private String boundary; private String icon; private String toolTipMode; - private String scrollMode; private String label; private String timeZone; private int zindex; @@ -123,13 +119,6 @@ this.pattern = pattern; } - public void selectPattern(ValueChangeEvent event) { - String tPatern = (String) event.getNewValue(); - if (tPatern != null) { - pattern = tPatern; - } - } - public CalendarBean() { height = "400px"; width = "400px"; @@ -149,12 +138,11 @@ rendered = true; zindex = 2; toolTipMode = "none"; - scrollMode = "client"; required = false; - weekDay = "none"; + weekDay = "long"; month = "none"; timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.09.2007"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } @@ -166,9 +154,8 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prBegin " + cal.getTime()); return cal.getTime(); - } public Date getPrDateRangeEnd() { @@ -179,7 +166,7 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prEnd " + cal.getTime()); return cal.getTime(); } @@ -207,19 +194,10 @@ this.readonly = readonly; } - 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 Object getWeekDayLabels() { if(weekDay.equals("long")) return CalendarBean.WEEK_DAY; - else return null; + else return null; } public Object getWeekDayLabelsShort() { @@ -234,10 +212,6 @@ else return null; } - public void weekDay(ValueChangeEvent event) { - weekDay = (String) event.getNewValue(); - } - public Object getMonthLabelsShort() { if(month.equals("short")) return CalendarBean.MOUNT_LABELS_SHORT; @@ -245,9 +219,12 @@ } + public String getMonth() { + return month; + } - public void month(ValueChangeEvent event) { - month = (String) event.getNewValue(); + public void setMonth(String month) { + this.month = month; } public String getCurrentDateAsText() { @@ -284,9 +261,6 @@ this.jointPoint = jointPoint; } - public void selectJointPoint(ValueChangeEvent event) { - jointPoint = (String) event.getNewValue(); - } public String getDirection() { return direction; @@ -296,10 +270,6 @@ this.direction = direction; } - public void selectDirection(ValueChangeEvent event) { - direction = (String) event.getNewValue(); - } - public String getBoundary() { return boundary; } @@ -379,14 +349,6 @@ this.toolTipMode = toolTipMode; } - public String getScrollMode() { - return scrollMode; - } - - public void setScrollMode(String scrollMode) { - this.scrollMode = scrollMode; - } - public int getZindex() { return zindex; } @@ -442,4 +404,12 @@ public void setPreloadDateRangeEnd(String preloadDateRangeEnd) { this.preloadDateRangeEnd = preloadDateRangeEnd; } + + public String getWeekDay() { + return weekDay; + } + + public void setWeekDay(String weekDay) { + this.weekDay = weekDay; + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -22,10 +22,12 @@ package calendar; import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Random; import org.richfaces.model.CalendarDataModel; import org.richfaces.model.CalendarDataModelItem; @@ -55,7 +57,6 @@ protected CalendarDataModelItem createDataModelItem(Date date) { CalendarDataModelItemImpl item = new CalendarDataModelItemImpl(); - item.setDate(date); Map data = new HashMap(); DateFormat enFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH); DateFormat frFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRENCH); @@ -63,8 +64,20 @@ data.put("enLabel", enFormatter.format(date)); data.put("frLabel", frFormatter.format(date)); data.put("deLabel", deFormatter.format(date)); + /*Calendar c = Calendar.getInstance(); + c.setTime(date); + item.setDay(c.get(Calendar.DAY_OF_MONTH));*/ + + if (new Random().nextInt(10) > 5) { + item.setEnabled(true); + } else { + item.setEnabled(false); + } + item.setData(data); - + + System.out.println(item.getData() + " " + item.isEnabled()); + return item; } @@ -73,12 +86,7 @@ */ public Object getToolTip(Date date) { - // TODO Auto-generated method stub return null; } - public int getDay() { - // TODO Auto-generated method stub - return 0; - } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -21,8 +21,6 @@ package calendar; -import java.util.Date; - import org.richfaces.model.CalendarDataModelItem; /** @@ -33,11 +31,20 @@ public class CalendarDataModelItemImpl implements CalendarDataModelItem { private Object data; - private Date date; private String styleClass; private Object toolTip; + private int day; private boolean enabled = true; + + public int getDay() { + return day; + } + + public void setDay(int day) { + this.day = day; + } + /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getData() */ @@ -46,13 +53,6 @@ } /* (non-Javadoc) - * @see org.richfaces.component.CalendarDataModelItem#getDate() - */ - public Date getDate() { - return date; - } - - /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getStyleClass() */ public String getStyleClass() { @@ -88,13 +88,6 @@ } /** - * @param date the date to set - */ - public void setDate(Date date) { - this.date = date; - } - - /** * @param styleClass the styleClass to set */ public void setStyleClass(String styleClass) { @@ -114,9 +107,5 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - public int getDay() { - // TODO Auto-generated method stub - return 0; - } - + } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -6,11 +6,18 @@ public String data0; public int data1; + public String data2; + public String data3; - public Data(String str,int a) { - this.data0 =str+"_"+a; - this.data1 = new Random().nextInt(10+a); + public Data(String data0, int data1) { + this.data0 = data0; + this.data1 = data1; + } + public Data(String data0, int data1, String data2, String data3) { + this(data0, data1); + this.data2 = data2; + this.data3 = data3; } public String getData0() { @@ -25,6 +32,22 @@ return data1; } + public String getData2() { + return data2; + } + + public void setData2(String data2) { + this.data2 = data2; + } + + public String getData3() { + return data3; + } + + public void setData3(String data3) { + this.data3 = data3; + } + public void setData1(int data1) { this.data1 = data1; } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -19,7 +19,6 @@ * */ public Data() { - // TODO Auto-generated constructor stub } /** Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -13,7 +13,6 @@ private List mounths = new ArrayList(); private List numbers = new ArrayList(); private String align; - private String bgcolor; private String border; private String width; private String columnsWidth; @@ -22,7 +21,6 @@ public DataTable() { align = "center"; - bgcolor = "aqua"; border = "1"; width = "400px"; columnsWidth = "200px"; @@ -109,14 +107,6 @@ this.align = align; } - public String getBgcolor() { - return bgcolor; - } - - public void setBgcolor(String bgcolor) { - this.bgcolor = bgcolor; - } - public String getBorder() { return border; } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -28,34 +28,14 @@ * @author $Autor$ * */ - - - public class DemoSliderBean { - private boolean manualInput; - private boolean onSlide; - private boolean storeResults; - private boolean trailer; - private String width; - private int increment; - private int handleValue; - private int startRange; - private int endRange; - + private boolean rendered; DemoInventoryList demoInventoryList; public DemoSliderBean() { - manualInput = true; - onSlide = true; - storeResults = true; - width="400px"; - startRange = 10000; - endRange = 60000; - increment = 10000; - trailer = true; - handleValue = 10000; + rendered = true; } - + public void setDemoInventoryList(DemoInventoryList demoInventoryList) { this.demoInventoryList = demoInventoryList; } @@ -69,4 +49,23 @@ } + public void doRendered() + { + if(rendered) + rendered = false; + else rendered = true; + } + + public String getRenderedName() { + if(rendered) return "Rendered on"; + else return "Rendered off"; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } } \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + package effect; public class Effect { @@ -35,4 +56,3 @@ this.state = state; } } - Modified: branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -22,7 +22,6 @@ private boolean showBoundaryValues; public InputNumberSlider() { - // TODO Auto-generated constructor stub inputSize = 5; maxlength = 3; Modified: branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -18,7 +18,6 @@ private boolean rendered; public InputNumberSpinner() { - // TODO Auto-generated constructor stub // size= "200"; inputSize = 2; cycled = false; Added: branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,5 @@ +package jQuery; + +public class JQuery { + +} Modified: branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -20,8 +20,6 @@ moveable=true; resizeable=true; - - // TODO Auto-generated constructor stub } public int getHeight() { Added: branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,20 @@ +package rich; + +import java.util.ArrayList; + +public class RichBean { + + private String src; + + public RichBean() { + src = ""; + } + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } +} Modified: branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -2,15 +2,14 @@ public class SimpleTogglePanel { - private String switchType; // "client", "server"(default), "ajax" - private String width; - private String height; + private String switchType; // "client", "server"(default), "ajax" + private String width; + private String height; - private boolean focus; - private boolean rendered; + private boolean focus; + private boolean rendered; public SimpleTogglePanel() { - // TODO Auto-generated constructor stub width = "75%"; height = "100%"; switchType = "server"; Modified: branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -50,7 +50,7 @@ frequency = "0"; rules = "none"; setCities(getAllData()); - // TODO Auto-generated constructor stub + } public List autocomplete(Object event) { Modified: branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -13,7 +13,6 @@ private boolean rendered; public Spacer() { - // TODO Auto-generated constructor stub height = "50px"; width = "300px"; Modified: branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -23,8 +23,6 @@ private boolean disabledTab; public TabPanel() { - // TODO Auto-generated constructor stub - width="75%"; height="200px"; title="title goes here..."; Modified: branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -9,7 +9,6 @@ public TogglePanel() { - // TODO Auto-generated constructor stub initialState="asus"; switchType="server"; stateOrder="asus,benq,toshiba"; Modified: branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -22,7 +22,6 @@ location="left"; contentStyle=null; separatorStyle=null; - // TODO Auto-generated constructor stub } Modified: branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -14,6 +14,14 @@ private String style; private String layout; + public String getLayout() { + return layout; + } + + public void setLayout(String layout) { + this.layout = layout; + } + public Tooltip() { followMouse = false; rendered = true; @@ -23,6 +31,7 @@ direction = "top-right"; horizontalOffset = 0; verticalOffset = 0; + delay = 0; style = "none"; layout = "inline"; } @@ -107,12 +116,4 @@ this.delay = delay; } - public String getLayout() { - return layout; - } - - public void setLayout(String layout) { - this.layout = layout; - } - } Modified: branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -222,7 +222,6 @@ try { tree.queueNodeExpand(new ListRowKey(expandPath)); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -255,7 +254,6 @@ try { this.tree.queueExpandAll(); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } return null; Added: branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,32 @@ +package util.componentInfo; + +public class ComponentInfo { + private String attribute; + private String property; + + public ComponentInfo() { + + } + + public ComponentInfo(String attribute, String property) { + this.attribute = attribute; + this.property = property; + System.out.println(); + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getProperty() { + return property; + } + + public void setProperty(String property) { + this.property = property; + } +} Added: branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,37 @@ +/** + * + */ +package util.phaseTracker; + +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +/** + * @author AYanul + * + */ +public class PhaseTracker implements PhaseListener { + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) + */ + public void afterPhase(PhaseEvent arg0) { + System.out.println("PhaseTracker.afterPhase()" + arg0.getPhaseId()); + } + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent) + */ + public void beforePhase(PhaseEvent arg0) { + System.out.println("PhaseTracker.beforePhase()" + arg0.getPhaseId()); + } + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#getPhaseId() + */ + public PhaseId getPhaseId() { + return PhaseId.ANY_PHASE; + } + +} Added: branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,71 @@ +package util.skins; + +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.component.UISelectItem; +import javax.faces.component.UISelectOne; +import javax.faces.component.html.HtmlSelectOneRadio; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com created 09.02.2007 + * + */ +public class Skins { + + private String[] skinsArray = new String[] { "blueSky", "classic", + "deepMarine", "DEFAULT", "emeraldTown", "japanCherry", "ruby", + "wine", "plain" }; + + private String defaultSkin = "blueSky"; + + private String skin = defaultSkin; + + private UISelectOne createComponent() { + UISelectOne selectOne = new HtmlSelectOneRadio(); + selectOne.setValue(skin); + + for (int i = 0; i < skinsArray.length; i++) { + String skinName = skinsArray[i]; + + UISelectItem item = new UISelectItem(); + item.setItemLabel(skinName); + item.setItemValue(skinName); + item.setId("skinSelectionFor_" + skinName); + + selectOne.getChildren().add(item); + } + + return selectOne; + } + + public String getSkin() { + return skin; + } + + public UIComponent getComponent() { + FacesContext facesContext = FacesContext.getCurrentInstance(); + Map requestMap = facesContext.getExternalContext().getRequestMap(); + Object object = requestMap.get("SkinBean"); + if (object != null) { + return (UISelectOne) object; + } + + UISelectOne selectOne = createComponent(); + requestMap.put("SkinBean", selectOne); + return selectOne; + } + + public void setComponent(UIComponent component) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + Map requestMap = facesContext.getExternalContext().getRequestMap(); + requestMap.put("SkinBean", component); + } + + public String change() { + UISelectOne selectOne = (UISelectOne) getComponent(); + skin = (String) selectOne.getValue(); + return null; + } +} Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -17,64 +17,79 @@ } </style> <h:form> - <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - 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}" - scrollMode="#{calendarBean.scrollMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" - timeZone="#{calendarBean.tmZone}" - required="#{calendarBean.required}" - requiredMessage="Required Message"> - <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" /> + <rich:messages showDetail="true"></rich:messages> + + <h:panelGrid columns="2"> + <h:outputText value="Client mode" /> + <h:outputText value="Ajax mode" /> + + <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> + </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> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> - <h:panelGrid columns="2"> - <f:verbatim> - <span style="padding: 2px;">{day}</span> - </f:verbatim> - <h:panelGrid> - <h:outputText styleClass="smallText" value="{data.enLabel}" /> - <h:outputText styleClass="smallText" value="{data.frLabel}" /> - <h:outputText styleClass="smallText" value="{data.deLabel}" /> - </h:panelGrid> - </h:panelGrid> - </rich:calendar> + </h:panelGrid> + - <h:panelGrid columns="2"> + + <h:panelGrid columns="2"> <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" value="en/US" - valueChangeListener="#{calendarBean.selectLocale}"> + <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" /> @@ -86,27 +101,27 @@ onclick="submit()" /> <h:outputText value="Custom day labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.weekDay}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.weekDay}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Custom month labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.month}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.month}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Select Date Pattern:" /> - <h:selectOneMenu value="MMM d, yyyy" onchange="submit()" - valueChangeListener="#{calendarBean.selectPattern}"> + <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> @@ -114,7 +129,7 @@ <h:commandButton type="button" value="Select Date" onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - <h:outputText value="Preload date range begin(d.m.y)" /> + <h:outputText value="Preload date range begin(d.m.y)" /> <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> <h:outputText value="Preload date range end(d.m.y)" /> @@ -122,17 +137,17 @@ <h:outputText value="z-index:" /> <h:inputText value="#{calendarBean.zindex}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Height:" /> <h:inputText value="#{calendarBean.height}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Width:" /> <h:inputText value="#{calendarBean.width}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="reRender (counter):" /> @@ -143,8 +158,7 @@ <h:outputText value="Select Popup Joint Point:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.jointPoint}" - valueChangeListener="#{calendarBean.selectJointPoint}"> + 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" /> @@ -153,8 +167,7 @@ <h:outputText value="Select Popup Direction:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.direction}" - valueChangeListener="#{calendarBean.selectDirection}"> + 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" /> @@ -176,12 +189,6 @@ <f:selectItem itemLabel="single" itemValue="single"/> <f:selectItem itemLabel="batch" itemValue="batch"/> </h:selectOneRadio> - - <h:outputText value="Scroll Mode:" /> - <h:selectOneRadio value="#{calendarBean.scrollMode}" onchange="submit();"> - <f:selectItem itemLabel="client" itemValue="client"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - </h:selectOneRadio> <h:outputText value="BoundaryDatesMode:" /> <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> @@ -217,14 +224,6 @@ <f:verbatim></f:verbatim> <h:commandButton value="Submit" /> - - <rich:messages showDetail="true"></rich:messages> </h:panelGrid> - - <f:verbatim> - <br /> - </f:verbatim> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,18 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <h:form> + <rich:messages showDetail="true"></rich:messages> + + </h:form> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,131 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<style type="text/css"> +body { + font: normal 11px tahoma, sans-serif; +} + +.column { + width: 75px; + font: normal 11px tahoma, sans-serif; + text-align: center; +} + +.column-index { + width: 75px; + font: normal 11px tahoma, sans-serif; + text-align: left; +} + +.list-row3 { + background-color: #ececec; +} + +.list-row1 { + background-color: #f1f6fd; +} + +.list-row2 { + background-color: #fff; +} + +.list-header { + font: bold 11px tahoma, sans-serif; + text-align: center; +} + +.list-table1 { + border: 1px solid #bed6f8; +} + +.list-table2 { + border: 1px solid #bed6f8; +} +</style> + +<f:subview id="dfsID"> + + <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" + ignoreDupResponses="true" requestDelay="100"> + <a4j:region id="stat1"> + <a4j:outputPanel id="p1"> + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" + binding="#{inventoryList.dataFilterSlider}" for="carList" + forValRef="inventoryList.carInventory" filterBy="getMileage" + manualInput="true" onSlide="true" onChange="true" + storeResults="true" trackStyleClass="track" width="400px" + styleClass="slider-container" startRange="10000" endRange="60000" + increment="10000" rangeStyleClass="range" trailer="true" + trailerStyleClass="trailer" handleStyleClass="handle" + handleValue="10000" id="slider_1"> + </rich:dataFilterSlider> + </a4j:outputPanel> + + + + <a4j:outputPanel id="list-body" style="border: 1px"> + <h:dataTable id="carIndex" rows="10" + binding="#{inventoryList.carMakeIndexUIData}" + value="#{inventoryList.carMakeIndex}" var="category" + styleClass="list-table1" columnClasses="column-index" + rowClasses="list-row3"> + + <h:column> + <a4j:commandLink actionListener="#{inventoryList.filterCarList}" + reRender="carList"> + <h:outputText value="#{category}" /> + <f:attribute name="filterRule" value="showTable" /> + + </a4j:commandLink> + </h:column> + + </h:dataTable> + + <h:dataTable id="carList" rows="10" + value="#{inventoryList.carInventory}" var="category" + rowClasses="list-row1, list-row2" columnClasses="column" + headerClass="list-header" styleClass="list-table2"> + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Make" /> + </f:facet> + <h:outputText value="#{category.make}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Model" /> + </f:facet> + <h:outputText value="#{category.model}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" + value="#{inventoryList.priceColumnName}" /> + </f:facet> + <h:outputText value="#{category.price}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" + value="#{inventoryList.mileageColumnName}" /> + </f:facet> + <h:outputText value="#{category.mileage}" /> + </h:column> + </h:dataTable> + </a4j:outputPanel> + </a4j:region> + <h:panelGrid columns="2"> + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{dfs.rendered}" > + <a4j:support event="onclick" reRender="p1"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> + </a4j:form> + +</f:subview> + Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -1,124 +1,106 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> - <f:subview id="DataTableID"> - <h:form> - - <rich:dataTable id="dataTableID" var="dataTableID" - value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" - headerClass="header" footerClass="footer" - onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> - <f:facet name="caption"> - <h:outputText value="caption" /> - </f:facet> - <f:facet name="header"> - <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> - <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> - <h:outputText value="2-row head" /> - </rich:column> - <h:column rendered="#{dataTable.r2rendered}"> - <h:outputText value="head in UIColumn" /> - </h:column> - <rich:column breakBefore="true"> - <h:outputText value="2-d row head" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <f:facet name="footer"> - <h:outputText value="table foot" /> - </f:facet> - <rich:columnGroup> - <rich:column id="mounth" styleClass="column" rowspan="2" - headerClass="cheader" footerClass="cfooter"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.mounth}" /> - </rich:column> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.town}" /> - </rich:column> - </rich:columnGroup> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> - </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> - <rich:column id="name"> - <h:outputText value="#{detail.name}" /> - </rich:column> - <rich:column id="qty" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{detail.qty}" /> - </rich:column> - </rich:subTable> - <rich:column id="total" styleClass="total" colspan="2"> - <h:outputText value="#{dataTableID.total}" /> - </rich:column> - </rich:dataTable> - - <h:panelGrid columns="2"> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{dataTable.align}"> - <f:selectItem itemLabel="center" itemValue="*center" /> - <f:selectItem itemLabel="left" itemValue="*left" /> - <f:selectItem itemLabel="right " itemValue="*right" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Border: "></h:outputText> - <h:inputText value="#{dataTable.border}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Columns Width: "></h:outputText> - <h:inputText value="#{dataTable.columnsWidth}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{dataTable.width}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{dataTable.bgcolor}"> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="rendered:" /> - <h:selectBooleanCheckbox value="#{dataTable.rendered}" - onclick="submit();" /> - - <h:outputText value=" row 2 rendered" /> - <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" - onclick="submit();" /> - </h:panelGrid> - - </h:form> - </f:subview> - +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + <f:subview id="DataTableID"> + <h:form> + <rich:dataTable id="dataTableID" var="dataTableID" + value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" + headerClass="header" footerClass="footer" cellpadding="" cellspacing="" + onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> + <f:facet name="caption"> + <h:outputText value="caption" /> + </f:facet> + <f:facet name="header"> + <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> + <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> + <h:outputText value="2-row head" /> + </rich:column> + <h:column rendered="#{dataTable.r2rendered}"> + <h:outputText value="head in UIColumn" /> + </h:column> + <rich:column breakBefore="true"> + <h:outputText value="2-d row head" /> + </rich:column> + </rich:columnGroup> + </f:facet> + <f:facet name="footer"> + <h:outputText value="table foot" /> + </f:facet> + <rich:columnGroup> + <rich:column id="mounth" styleClass="column" rowspan="2" + headerClass="cheader" footerClass="cfooter"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.mounth}" /> + </rich:column> + <rich:column styleClass="column" headerClass="cheader" + footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.town}" /> + </rich:column> + </rich:columnGroup> + <rich:column styleClass="column" headerClass="cheader" + footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{dataTableID.day}" /> + </rich:column> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> + <rich:column id="name"> + <h:outputText value="#{detail.name}" /> + </rich:column> + <rich:column id="qty" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{detail.qty}" /> + </rich:column> + </rich:subTable> + <rich:column id="total" styleClass="total" colspan="2"> + <h:outputText value="#{dataTableID.total}" /> + </rich:column> + </rich:dataTable> + + <h:panelGrid columns="2"> + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{dataTable.align}"> + <f:selectItem itemLabel="center" itemValue="*center" /> + <f:selectItem itemLabel="left" itemValue="*left" /> + <f:selectItem itemLabel="right " itemValue="*right" /> + <a4j:support event="onclick" reRender="dataTableID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Border: "></h:outputText> + <h:inputText value="#{dataTable.border}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Columns Width: "></h:outputText> + <h:inputText value="#{dataTable.columnsWidth}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{dataTable.width}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="rendered:" /> + <h:selectBooleanCheckbox value="#{dataTable.rendered}" + onclick="submit();" /> + + <h:outputText value=" row 2 rendered" /> + <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" + onclick="submit();" /> + </h:panelGrid> + + </h:form> + </f:subview> + Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,21 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> + <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> + <jsp:include page="${richBean.src}" /> + </div> + </div> +</body> +</html> +</f:view> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -5,37 +5,49 @@ <f:subview id="effectID"> <h:messages /> - <h:form id="indexID"> - <h:outputText value="Menu:" /> - <h:panelGrid columns="2"> - <h:outputText value="1." /> - <f:verbatim> - <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF Components</font></span> - </f:verbatim> + <h:form> + <rich:panel id="indexID"> + <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> + + <f:verbatim> + <br /> + </f:verbatim> + + <h:outputText value="Menu:" /> + <h:panelGrid columns="2" > + <h:outputText value="1." /> + <f:verbatim> + <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF + Components</font></span> + </f:verbatim> - <h:outputText value="2." /> - <f:verbatim> - <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF Component with Event and non-jsf target</font></span> - </f:verbatim> + <h:outputText value="2." /> + <f:verbatim> + <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF + Component with Event and non-jsf target</font></span> + </f:verbatim> - <h:outputText value="3." /> - <f:verbatim> - <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF Component with Event and jsf target</font></span> - </f:verbatim> + <h:outputText value="3." /> + <f:verbatim> + <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF + Component with Event and jsf target</font></span> + </f:verbatim> - <h:outputText value="4." /> - <f:verbatim> - <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF Component with Event.</font></span> - </f:verbatim> - - <h:outputText value="5." /> - <f:verbatim> - <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace Components.</font></span> - </f:verbatim> - </h:panelGrid> - </h:form> + <h:outputText value="4." /> + <f:verbatim> + <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF + Component with Event.</font></span> + </f:verbatim> - <h:form id="frm1"> + <h:outputText value="5." /> + <f:verbatim> + <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace + Components.</font></span> + </f:verbatim> + </h:panelGrid> + </rich:panel> + + <rich:panel id="frm1"> <h:outputText value="JSF Components:" /> <h:panelGrid id="panGrID" columns="2"> @@ -43,7 +55,7 @@ <h:inputText value="#{effect.time}" /> <f:verbatim> - <span onclick="hidePanel1(), hedeImage1()"><font color="blue">Hide Panel</font> + <span onclick="hidePanel1(), hideImage1()"><font color="blue">Hide Panel</font> </span> </f:verbatim> <h:graphicImage value="/pics/fatal.gif" @@ -80,84 +92,84 @@ <h:panelGroup id="form_1b_ID"> <h:inputText value="onmouse and onclick"> - <rich:effect event="onclick" type="Highlight" + <rich:effect event="onclick" type="Fold" params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" type="Highlight" + params="duration:0.5,from:1.0,to:0.4" /> </h:inputText> </h:panelGroup> </h:panelGrid> <rich:effect for="panel_1_ID" name="hidePanel1" type="Fade" params="duration:#{effect.time}" /> - <rich:effect for="panel_1_ID" event="" name="showPanel1" type="Appear" /> + <rich:effect for="panel_1_ID" name="showPanel1" type="Appear" /> - <rich:effect for="asusID" event="" name="hideImage1" type="Fold" + <rich:effect for="asusID" name="hideImage1" type="Fold" params="duration:#{effect.time}" /> - <rich:effect for="asusID" event="" name="showImage1" type="Grow" /> + <rich:effect for="asusID" name="showImage1" type="Grow" /> <f:verbatim> <br /> <span onclick="hideFrm1(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> - </h:form> + </rich:panel> - <h:form id="frm2"> - <h:outputText - value="JSF Component with Event and non-jsf target (onclick, onmouseout)" /> + <rich:panel id="frm2"> + <h:outputText + value="JSF Component with Event and non-jsf target (onclick, onmouseout)" /> - <h:panelGrid columns="2"> - <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" - width="100" height="50"> - <rich:effect event="onclick" targetId="divID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" type="Opacity" - params="targetId:'divID',duration:0.5,from:1.0,to:0.4" /> - </h:graphicImage> + <h:panelGrid columns="2"> + <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" width="100" + height="50"> + <rich:effect event="onclick" targetId="divID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" type="Opacity" + params="targetId:'divID',duration:0.5,from:1.0,to:0.4" /> + </h:graphicImage> - <f:verbatim> - <div id="divID" - style="width: 100px; height: 50px; background-color: red"><rich:effect - event="onclick" targetId="imageID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> <rich:effect - event="onmouseout" type="Opacity" - params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div> - </f:verbatim> - </h:panelGrid> - <f:verbatim> - <br /> - <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span> + <div id="divID" + style="width: 100px; height: 50px; background-color: red"><rich:effect + event="onclick" targetId="imageID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> <rich:effect + event="onmouseout" type="Opacity" + params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div> </f:verbatim> - </h:form> + </h:panelGrid> - <h:form id="frm3"> - <h:outputText - value="JSF Component with Event and jsf target (onclick, onmouseout)" /> + <f:verbatim> + <br /> + <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span> + </f:verbatim> + </rich:panel> - <h:panelGrid id="gridID" border="1" style="background-color:green"> - <h:outputText value="Panel Content" /> - <rich:effect event="onclick" targetId="imgID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" targetId="imgID" type="Opacity" - params="duration:0.5,from:1.0,to:0.4" /> - </h:panelGrid> + <rich:panel id="frm3"> + <h:outputText + value="JSF Component with Event and jsf target (onclick, onmouseout)" /> - <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93" - height="30px"> - <rich:effect event="onmouseout" targetId="gridID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onclick" targetId="gridID" type="Opacity" - params="duration:0.5,from:1.0,to:0.4" /> - </h:graphicImage> + <h:panelGrid id="gridID" border="1" style="background-color:green"> + <h:outputText value="Panel Content" /> + <rich:effect event="onclick" targetId="imgID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" targetId="imgID" type="Opacity" + params="duration:0.5,from:1.0,to:0.4" /> + </h:panelGrid> - <f:verbatim> - <br /> - <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span> - </f:verbatim> - </h:form> + <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93" + height="30px"> + <rich:effect event="onmouseout" targetId="gridID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onclick" targetId="gridID" type="Opacity" + params="duration:0.5,from:1.0,to:0.4" /> + </h:graphicImage> - <h:form id="frm4"> + <f:verbatim> + <br /> + <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span> + </f:verbatim> + </rich:panel> + + <rich:panel id="frm4"> <h:outputText value="1. (Event 2)" /> <h:graphicImage id="img_1_ID" value="/pics/asus.jpg" width="200px" height="150px" /> @@ -187,10 +199,10 @@ <br /> <span onclick="hideFrm4(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> - </h:form> - - <h:form id="frm5"> - <h:panelGrid id="panGrID" columns="2"> + </rich:panel> + + <rich:panel id="frm5"> + <h:panelGrid id="panelGrdID" columns="2"> <f:verbatim> <span onclick="hideRichPanel()"><font color="blue">Hide Panel</font> </span> @@ -262,30 +274,26 @@ <br /> <span onclick="hideFrm5(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> - </h:form> + </rich:panel> - <rich:effect for="indexID" event="" name="hideIndexID" type="BlindUp" /> - <rich:effect for="indexID" event="" name="showIndexID" type="BlindDown" /> - <rich:effect for="frm1" event="" name="hideFrm1" type="Fade" /> - <rich:effect for="frm1" event="" name="showFrm1" type="Appear" /> + <rich:effect for="indexID" name="hideIndexID" type="SlideUp" /> + <rich:effect for="indexID" name="showIndexID" type="SlideDown" /> - <rich:effect for="frm2" event="" name="hideFrm2" type="Fade" /> - <rich:effect for="frm2" event="" name="showFrm2" type="Appear" /> + <rich:effect for="frm1" name="hideFrm1" type="Fade" /> + <rich:effect for="frm1" name="showFrm1" type="Appear" /> - <rich:effect for="frm3" event="" name="hideFrm3" type="Fade" /> - <rich:effect for="frm3" event="" name="showFrm3" type="Appear" /> - - <rich:effect for="frm4" event="" name="hideFrm4" type="Fade" /> - <rich:effect for="frm4" event="" name="showFrm4" type="Appear" /> + <rich:effect for="frm2" name="hideFrm2" type="Fade" /> + <rich:effect for="frm2" name="showFrm2" type="Appear" /> - <rich:effect for="frm5" event="" name="hideFrm5" type="Fade" /> - <rich:effect for="frm5" event="" name="showFrm5" type="Appear" /> + <rich:effect for="frm3" name="hideFrm3" type="Fade" /> + <rich:effect for="frm3" name="showFrm3" type="Appear" /> - <rich:effect for="backFrmID" event="" name="hideBackFrm" type="Fade" /> - <rich:effect for="backFrmID" event="" name="showBackFrm" type="Appear" /> - <h:form id="backFrmID"> - <h:commandLink value="Back" action="main"></h:commandLink> + <rich:effect for="frm4" name="hideFrm4" type="Fade" /> + <rich:effect for="frm4" name="showFrm4" type="Appear" /> + + <rich:effect for="frm5" name="hideFrm5" type="Fade" /> + <rich:effect for="frm5" name="showFrm5" type="Appear" /> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -2,7 +2,6 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:view> <f:subview id="modalPanel"> <h:form id="MPform"> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -120,15 +120,15 @@ </rich:panel> </h:panelGrid> + <rich:panel style="position: absolute; top: 116px; right: 100px; " styleClass="top"> <f:facet name="header"> <h:outputText value="Header of the Panel" /> </f:facet> <h:outputText escape="false" value=" This is a panel with absolute position on the screen.<br /> Resize the browser's window for fun." /> + </rich:panel> - </rich:panel> - </rich:panel> <rich:panel style="width:#{panel.width};height:#{panel.height}"> <f:facet name="header"> <f:verbatim> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,16 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + <jsp:include page="${richBean.src}" /> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,22 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="SelectOneMenuPage.jsp" /> + </div> + <div id="divPageID" style="position: absolute; top:110px; left: 10px;"> + <jsp:include page="${richBean.src}" /> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,176 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + +<f:subview id="selectOneMenuPage"> + <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -13,13 +13,15 @@ } </style> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> <f:subview id="simpleTogglePanelID"> <h:messages></h:messages> <h:form> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" + label="simpleTogglePanel with some text" + width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" + switchType="#{simpleTogglePanel.switchType}" opened="false"> <f:facet name="closeMarker"> <h:outputText value="Close It" /> </f:facet> @@ -27,21 +29,26 @@ <h:outputText value="Open It" /> </f:facet> <f:verbatim> - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - </f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP1" headerClass="head" + label="simpleTogglePanel wiht image" + width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" + rendered="#{simpleTogglePanel.rendered}" + switchType="#{simpleTogglePanel.switchType}" opened="false"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" + width="#{simpleTogglePanel.width}" ignoreDupResponses="true" focus="#{simpleTogglePanel.focus}"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> @@ -51,14 +58,15 @@ </f:facet> <rich:simpleTogglePanel id="INsTP"> <h:panelGrid columns="2"> - <h:graphicImage value="/pics/podb109_61.jpg"></h:graphicImage> - <h:outputText - value="Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." /> + <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage> + <f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> </h:panelGrid> </rich:simpleTogglePanel> </rich:simpleTogglePanel> @@ -87,13 +95,11 @@ </h:selectOneRadio> <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> + <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" + onclick="submit()"> </h:selectBooleanCheckbox> </h:panelGrid> - - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -6,36 +6,43 @@ <h:messages></h:messages> <h:form id="tooggleTest"> + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" + initialState="asus" stateOrder="asus,blank" + style="width:300px!important"> + <f:facet name="blank"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_blank" + for="tooggleTest:panel1"> + <h:outputText value="Expand" style="font-weight: bold;" /> + <h:graphicImage url="/pics/collapse.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + </rich:panel> + </f:facet> - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px" > - <f:facet name="blank"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1" > - <h:outputText value="Expand" style="font-weight: bold;" /> - <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - </rich:panel> - </f:facet> - - <f:facet name="asus"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1"> - <h:outputText value="Collapse" style="font-weight: bold;" /> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <rich:toggleControl id="toggleControl_panel1" + for="tooggleTest:panel1"> + <h:outputText value="Collapse" style="font-weight: bold;" /> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" + alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -47,30 +54,35 @@ </h:panelGroup> </h:panelGrid> </rich:panel> - </f:facet> - </rich:togglePanel> - - <f:verbatim> - <br /><br /> - </f:verbatim> + </f:facet> + </rich:togglePanel> + <br /> + <br /> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}"> - <f:facet name="asus"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" + initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}"> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_1" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" + alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -83,22 +95,28 @@ </h:panelGrid> </rich:panel> </f:facet> - - <f:facet name="benq"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;"> - <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg"/> + + <f:facet name="benq"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_2" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: yellow;"> + <h:graphicImage url="/pics/benq.jpg" height="300" width="300" + alt="benq.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="BenQ A 52" /> <f:verbatim> Processor: Core Duo T2250 (1.73GHz)<br /> RAM: 1024 Mb<br /> @@ -111,22 +129,28 @@ </h:panelGrid> </rich:panel> </f:facet> - - <f:facet name="toshiba"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;"> - <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg"/> + + <f:facet name="toshiba"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_3" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: orange;"> + <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" + alt="toshiba.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Toshiba Satellite A 100-784" /> <f:verbatim> Processor: Intel Core Duo T2250 - 1.73GHz<br /> RAM: 1024 Mb<br /> @@ -138,41 +162,41 @@ </h:panelGroup> </h:panelGrid> </rich:panel> - </f:facet> - </rich:togglePanel> - - <f:verbatim> - <br /><br /> - </f:verbatim> - - <rich:separator height="5px" width="500px" /> + </f:facet> + </rich:togglePanel> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <rich:separator height="5px" width="500px" /> - <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> - <h:outputText value="InitialState:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.initialState}"> - <f:selectItem itemLabel="Asus" itemValue="asus" /> - <f:selectItem itemLabel="Benq" itemValue="benq" /> - <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> + <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> + <h:outputText value="InitialState:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.initialState}"> + <f:selectItem itemLabel="Asus" itemValue="asus" /> + <f:selectItem itemLabel="Benq" itemValue="benq" /> + <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> - <h:outputText value="StateOrder:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.stateOrder}"> - <f:selectItem itemLabel="Asus,Benq,Toshiba" itemValue="asus,benq,toshiba" /> - <f:selectItem itemLabel="Toshiba, Asus, Benq" itemValue="toshiba,asus,benq" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> + <h:outputText value="StateOrder:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.stateOrder}"> + <f:selectItem itemLabel="Asus,Benq,Toshiba" + itemValue="asus,benq,toshiba" /> + <f:selectItem itemLabel="Toshiba, Asus, Benq" + itemValue="toshiba,asus,benq" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> - <h:outputText value="switchType:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> - </h:selectOneRadio> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - <ui:debug hotkey="L"></ui:debug> + <h:outputText value="switchType:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> + </h:selectOneRadio> + </h:panelGrid> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -4,20 +4,20 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="tooltipID"> <h:form> - <h:messages /> - + <h:messages></h:messages> + <h:outputText value="DEFAULT VALUE:"></h:outputText> - + <f:verbatim> <br /> </f:verbatim> - + <h:graphicImage value="/pics/ajax_process.gif" width="15px" height="15px"> <rich:toolTip value="ajax progress"> </rich:toolTip> </h:graphicImage> - + <h:inputText value="Text" id="inp1" size="50"> <rich:toolTip value="toolTip for input text"> <f:facet name="defaultContent"> @@ -43,10 +43,10 @@ <f:verbatim> <br /> </f:verbatim> - + <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" - mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}" + <rich:toolTip id="tooltipID" value="#{tooltip.value}" + mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" @@ -59,6 +59,7 @@ <f:verbatim> <br /> </f:verbatim> + <h:panelGrid columns="2"> <h:outputText value="Text:"></h:outputText> <h:inputText value="#{tooltip.value}"> @@ -132,12 +133,6 @@ <a4j:support event="onclick" reRender="tooltipID" /> </h:selectBooleanCheckbox> </h:panelGrid> - <!-- h:inputText value="ddd" - onclick="toolTipAttach();alert(document.getElementById('lkjl'))" /--> - - </h:form> - <h:form> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -3,7 +3,7 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>mybean</managed-bean-name> + <managed-bean-name>dfs</managed-bean-name> <managed-bean-class>dfs.DemoSliderBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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>richBean</managed-bean-name> + <managed-bean-class>rich.RichBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -3,8 +3,8 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>rich</managed-bean-name> - <managed-bean-class>rich.Rich</managed-bean-class> + <managed-bean-name>richBean</managed-bean-name> + <managed-bean-class>rich.RichBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> </faces-config> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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>scrollableDT</managed-bean-name> + <managed-bean-class>scrollableDataTable.ScrollableDataTable</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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/jsp/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -74,7 +74,7 @@ </navigation-case> <navigation-case> <from-outcome>DFS</from-outcome> - <to-view-id>/DataFilterSlider/DFS.jsp</to-view-id> + <to-view-id>/DataFilterSlider/DataFilterSlider.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>DDM</from-outcome> @@ -114,16 +114,20 @@ </navigation-case> <navigation-case> <from-outcome>TestDiv</from-outcome> - <to-view-id>/pages/Div.jsp</to-view-id> + <to-view-id>/pages/Div/Div.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>RichTest</from-outcome> - <to-view-id>/pages/RichTest.jsp</to-view-id> + <to-view-id>/pages/Rich/Rich.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>Map</from-outcome> - <to-view-id>/pages/Map.jsp</to-view-id> + <to-view-id>/pages/Select/Map.jsp</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>CustomizePage</from-outcome> + <to-view-id>/CustomizePage/CustomizePage.jsp</to-view-id> + </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>*</from-view-id> @@ -146,4 +150,7 @@ <to-view-id>/Panel/Panel.jsp</to-view-id> </navigation-case> </navigation-rule> + <lifecycle> + <phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener> + </lifecycle> </faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -12,8 +12,23 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message! .xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-RichTest.xml</param-value> + <param-value>/WEB-INF/faces-config-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-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-jQuery.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> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,97 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="jQuerySubviewID"> + <h:form id="form"> +<style> +.divSize_1 { + width: 150px; + height: 90px; + margin: 10px; + border: 2px solid #DAA520; +} + +.divColor_1 { + + background-color: #1E90FF; +} + +.divTextSize_1 { + font-size: xx-large; +} +.divSize_2 { + width: 90px; + height: 150px; + margin: 10px; + border: 2px solid #FF0000; +} + +.divColor_2 { + background-color: #7FFF00; +} + +.oddTable{ + background-color: #FFE4C4; +} +.activeTable{ + background-color: #AFEEEE; +} +.fontColor { + font-style: italic; + color: #228B22; +} +</style> + + <h:messages /> + <h:panelGrid id="panelGridID" columns="2" border="1"> + <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> + <h:panelGroup> + <f:verbatim> + <ol type="A" title="li"> + <li>one </li> + <li>two </li> + <li>three</li> + </ol> + </f:verbatim> + </h:panelGroup> + + <h:outputText value="green text: add text3 " /> + <f:verbatim> <p><span>Text1 </span>text2</p> </f:verbatim> + + <h:panelGroup> + <f:verbatim> + Rectangle: size: "150 x 90"; bgcolor: "dodgerblue"; + <br /> + Table: bgcolor: "bisque" + </f:verbatim> + </h:panelGroup> + <f:verbatim><div id="div_1_ID">xx-large <br /> text </div></f:verbatim> + + <h:panelGroup> + <f:verbatim> + Rectangle: size: "90 x 150"; border-color: "red" + <br /> + effect(mouseover) + </f:verbatim> + </h:panelGroup> + <f:verbatim><div id="div_2_ID"> normal text</div></f:verbatim> + </h:panelGrid> + + + <rich:jQuery selector="li" timing="onload" query="find('ol').end().append('[li],work!')" /> + + + <rich:jQuery selector="tr:nth-child(odd)" timing="onload" query="addClass('oddTable')" /> + <rich:jQuery selector="#panelGridID tr" query="mouseover(function(){jQuery(this).addClass('activeTable')})"/> + <rich:jQuery selector="#panelGridID tr" query="mouseout(function(){jQuery(this).removeClass('activeTable')})"/> + + <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class='fontColor'>add text3<p>')"/> + <rich:jQuery selector="#div_1_ID" timing="onload" query="addClass('divSize_1')" /> + <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> + <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> + <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> + + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,21 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> + <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> + <jsp:include page="${richBean.src}" /> + </div> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,16 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + <jsp:include page="${richBean.src}" /> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,47 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview id="richMenuID"> + <h:form> + <h:panelGrid columns="3"> + <rich:spacer width="750px"></rich:spacer> + <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + + <rich:spacer width="750px"></rich:spacer> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="" itemLabel="none" /> + <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> + <f:selectItem itemValue="/DragAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> + <f:selectItem itemValue="/InputNumberSlider/InputNumberSlider.jsp" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/InputNumberSpinner/InputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/Panel2.jsp" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> + </h:selectOneMenu> + + </h:panelGrid> + </h:form> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,22 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="SelectOneMenuPage.jsp" /> + </div> + <div id="divPageID" style="position: absolute; top:110px; left: 10px;"> + <jsp:include page="${richBean.src}" /> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,176 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + +<f:subview id="selectOneMenuPage"> + <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -11,12 +11,13 @@ <f:view> <h:form> <div align="center"><h:outputText - value="VCP 3.2.0 Test Application (JSF 1.1RI(1.2RI))" styleClass="maintext"></h:outputText></div> + value="VCP Test Application (JSF 1.1RI(1.2RI))" styleClass="maintext"></h:outputText></div> <rich:panel> <h:panelGrid columns="2" cellpadding="5px"> <h:commandLink value="RichFaces" action="RichTest"></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:panelGrid> </rich:panel> </h:form>