JBoss Rich Faces SVN: r3045 - trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-21 09:27:14 -0400 (Fri, 21 Sep 2007)
New Revision: 3045
Modified:
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
Log:
escape script in the context of RF-981
Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-09-21 13:13:23 UTC (rev 3044)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-09-21 13:27:14 UTC (rev 3045)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -36,6 +35,7 @@
import javax.faces.event.PhaseId;
import org.ajax4jsf.Messages;
+import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.ComponentVariables;
import org.ajax4jsf.renderkit.ComponentsVariableResolver;
@@ -106,11 +106,11 @@
}
Object value = param.getValue();
- buff.append("params['");
- buff.append(name);
- buff.append("'] = '");
- buff.append(value);
- buff.append("';");
+ buff.append("params[");
+ buff.append(ScriptUtils.toScript(name));
+ buff.append("] = ");
+ buff.append(ScriptUtils.toScript(value));
+ buff.append(";");
params.add(buff.toString());
}
}
@@ -151,36 +151,39 @@
menuItem, context).toString());
} else if (mode.equalsIgnoreCase(MenuComponent.MODE_SERVER)) {
- String id = menuItem.getClientId(context);
+
+ String id = menuItem.getClientId(context);
scriptValue.append('{');
scriptValue.append("var form = A4J.findForm(this);");
scriptValue.append("var params = new Object();");
- scriptValue.append("params['");
- scriptValue.append(id + ":hidden");
- scriptValue.append("'] = '");
- scriptValue.append(id);
- scriptValue.append("';");
+ scriptValue.append("params[");
+ scriptValue.append(ScriptUtils.toScript(id + ":hidden"));
+ scriptValue.append("] = ");
+ scriptValue.append(ScriptUtils.toScript(id));
+ scriptValue.append(";");
List params = encodeParams(context, menuItem);
-
if(!params.isEmpty()){
for (Iterator iterator = params.iterator(); iterator.hasNext();) {
- scriptValue.append((String) iterator.next());
+ scriptValue.append(iterator.next());
}
}
-
- scriptValue.append("Richfaces.jsFormSubmit('");
- scriptValue.append(id);
- scriptValue.append("', ");
- scriptValue.append("form.id, ");
+
+ scriptValue.append("Richfaces.jsFormSubmit(");
+ scriptValue.append(ScriptUtils.toScript(id)).append(",");
+
+ scriptValue.append("form.id").append(",");
Object target = menuItem.getAttributes().get("target");
-
+
if (null != target) {
- scriptValue.append("'"+(String) target+"', ");
- } else {
- scriptValue.append("'', ");
+ scriptValue.append(ScriptUtils.toScript(target));
+ } else {
+ scriptValue.append("''");
}
+
+ scriptValue.append(",");
scriptValue.append("params);}; return false;");
+
} else {
scriptValue.append(getStringAttributeOrEmptyString(menuItem, "onclick"));
}
@@ -233,23 +236,27 @@
protected String processInlineStyles(FacesContext context,
UIMenuItem menuItem,
boolean isOnmouseover) {
- StringBuffer buffer = new StringBuffer();
+
+ StringBuffer buffer = new StringBuffer();
Object style = menuItem.getAttributes().get("style");
Object selectStyle = menuItem.getAttributes().get("selectStyle");
+
if (null == selectStyle) {
return "";
}
+
+ buffer.append("$('" + menuItem.getClientId(context) + "').style.cssText='");
- buffer.append("$('" + menuItem.getClientId(context)
- + "').style.cssText='");
if (null != style) {
- buffer.append(style.toString() + "; ");
- }
+ buffer.append(style.toString() + "; ");
+ }
+
if (isOnmouseover) {
- buffer.append(selectStyle.toString() + ";';");
+ buffer.append(selectStyle.toString() + ";';");
} else {
- buffer.append("';");
+ buffer.append("';");
}
+
return buffer.toString();
}
}
18 years, 7 months
JBoss Rich Faces SVN: r3044 - branches/3.1.x.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-09-21 09:13:23 -0400 (Fri, 21 Sep 2007)
New Revision: 3044
Removed:
branches/3.1.x/el-api-1.0.jar
Log:
Deleted: branches/3.1.x/el-api-1.0.jar
===================================================================
(Binary files differ)
18 years, 7 months
JBoss Rich Faces SVN: r3043 - trunk/ui/calendar/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-09-21 07:55:58 -0400 (Fri, 21 Sep 2007)
New Revision: 3043
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
RF-988
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-21 11:41:55 UTC (rev 3042)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-21 11:55:58 UTC (rev 3043)
@@ -38,12 +38,15 @@
import javax.faces.el.MethodBinding;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
import javax.faces.event.ValueChangeEvent;
import org.ajax4jsf.component.AjaxComponent;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
+import org.ajax4jsf.event.AjaxSingleEvent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.richfaces.event.CurrentDateChangeEvent;
@@ -150,6 +153,14 @@
public abstract void setMode(String mode);
+ public abstract int getVerticalOffset();
+
+ public abstract void setVerticalOffset(int verticalOffset);
+
+ public abstract int getHorizontalOffset();
+
+ public abstract void setHorizontalOffset(int horizontalOffset);
+
//TODO onclick add users onclick
18 years, 7 months
JBoss Rich Faces SVN: r3042 - in trunk/ui/calendar/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-09-21 07:41:55 -0400 (Fri, 21 Sep 2007)
New Revision: 3042
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-988
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-21 10:39:25 UTC (rev 3041)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-21 11:41:55 UTC (rev 3042)
@@ -466,6 +466,24 @@
<description>Valid values = ajax or client</description>
</property>
+ <property>
+ <name>horizontalOffset</name>
+ <classname>int</classname>
+ <description>
+ Sets the horizontal offset between button and calendar element conjunction point
+ </description>
+ <defaultvalue>0</defaultvalue>
+ </property>
+
+ <property>
+ <name>verticalOffset</name>
+ <classname>int</classname>
+ <description>
+ Sets the vertical offset between button and calendar element conjunction point
+ </description>
+ <defaultvalue>0</defaultvalue>
+ </property>
+
</component>
&listeners;
</components>
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-21 10:39:25 UTC (rev 3041)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-21 11:41:55 UTC (rev 3042)
@@ -46,6 +46,9 @@
enableManualInput: #{component.attributes['enableManualInput']},
showInput: #{component.attributes['showInput']},
disabled: #{component.disabled},
+ ajaxSingle: #{component.attributes['ajaxSingle']},
+ verticalOffset:'#{component.verticalOffset}',
+ horizontalOffset: '#{component.horizontalOffset}',
<f:call name="writeSymbols" />,
firstWeekDay: #{this:getFirstWeekDay(context, component)},
minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)}
18 years, 7 months
JBoss Rich Faces SVN: r3041 - trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-21 06:39:25 -0400 (Fri, 21 Sep 2007)
New Revision: 3041
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
Log:
http://jira.jboss.com/jira/browse/RF-523 - corrected links for effect component
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-09-21 09:38:05 UTC (rev 3040)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-09-21 10:39:25 UTC (rev 3041)
@@ -26,7 +26,7 @@
panelBar= richOutputs, Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, RichFacesComponentsLibrary.html#panelBar, jbossrichfaces/freezone/docs/tlddoc/rich/panelBar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelBar.html, /richfaces/panelBar.jsf
modalPanel= richOutputs, Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, RichFacesComponentsLibrary.html#modalPanel, jbossrichfaces/freezone/docs/tlddoc/rich/modalPanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIModalPanel.html, /richfaces/modalPanel.jsf
togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, RichFacesComponentsLibrary.html#togglePanel, jbossrichfaces/freezone/docs/tlddoc/rich/togglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf
-panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, RichFacesComponentsLibrary.html#panelMenu, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf
+panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, RichFacesComponentsLibrary.html#panelMenu, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf
suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, RichFacesComponentsLibrary.html#suggestionbox, jbossrichfaces/freezone/docs/tlddoc/rich/suggestionbox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf
dataTableScroller= richDataIterators, Data Table Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, RichFacesComponentsLibrary.html#datascroller, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf
dropDownMenu= richMenu, Drop Down Menu, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, RichFacesComponentsLibrary.html#dropDownMenu, jbossrichfaces/freezone/docs/tlddoc/rich/dropDownMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf
@@ -37,11 +37,11 @@
message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, RichFacesComponentsLibrary.html#message, jbossrichfaces/freezone/docs/tlddoc/rich/message.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessage.html, /richfaces/message.jsf
messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, RichFacesComponentsLibrary.html#messages, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessages.html, /richfaces/messages.jsf
virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, RichFacesComponentsLibrary.html#virtualEarth, jbossrichfaces/freezone/docs/tlddoc/rich/virtualEarth.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIVirtualEarth.html, /richfaces/virtualEarth.jsf
-insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, RichFacesComponentsLibrary.html#insert, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInsert.html, /richfaces/insert.jsf
-scrollableDataTable= richDataIterators, Scrollable Data Table, /images/ico_common.gif, /images/cn_ScrollableDataTable.gif, RichFacesComponentsLibrary.html#scrollableDataTable, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf
-tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, RichFacesComponentsLibrary.html#tree, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf
-treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, RichFacesComponentsLibrary.html#treeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/treeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
-recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor, /images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif, RichFacesComponentsLibrary.html#recursiveTreeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
+insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, RichFacesComponentsLibrary.html#insert, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInsert.html, /richfaces/insert.jsf
+scrollableDataTable= richDataIterators, Scrollable Data Table,/images/ico_common.gif, /images/cn_ScrollableDataTable.gif, RichFacesComponentsLibrary.html#scrollableDataTable, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable.html,jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf
+tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, RichFacesComponentsLibrary.html#tree, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf
+treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, RichFacesComponentsLibrary.html#treeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/treeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
+recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor,/images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif,RichFacesComponentsLibrary.html#recursiveTreeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, ArchitectureOverview.html, jbossajax4jsf/freezone/docs/tlddoc/overview-summary.html, jbossajax4jsf/freezone/docs/apidoc/overview-summary.html, /richfaces/ajaxAttributes.jsf
actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, RichFacesComponentsLibrary.html#actionparam, jbossajax4jsf/freezone/docs/tlddoc/a4j/actionparam.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIActionParameter.html, /richfaces/actionparam.jsf
commandButton= ajaxSupport, Command Button, /images/ico_common.gif, /images/cn_commandButton.gif, RichFacesComponentsLibrary.html#commandButton, jbossajax4jsf/freezone/docs/tlddoc/a4j/commandButton.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxCommandButton.html, /richfaces/commandButton.jsf
@@ -66,4 +66,4 @@
log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/log.jsf
page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, RichFacesComponentsLibrary.html#page, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/page.jsf
portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, RichFacesComponentsLibrary.html#portlet, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf
-effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIeffect.html, /richfaces/effect.jsf
+effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
18 years, 7 months
JBoss Rich Faces SVN: r3040 - trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-21 05:38:05 -0400 (Fri, 21 Sep 2007)
New Revision: 3040
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java
Log:
fix updateCurrent
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-09-21 09:07:07 UTC (rev 3039)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-09-21 09:38:05 UTC (rev 3040)
@@ -28,7 +28,7 @@
}
public String updateCurrent() {
FacesContext context=FacesContext.getCurrentInstance();
- setCurrent(context.getExternalContext().getRequestParameterMap().get("current"));
+ setCurrent((String)context.getExternalContext().getRequestParameterMap().get("current"));
System.out.println("fake called.");
return null;
}
18 years, 7 months
JBoss Rich Faces SVN: r3036 - in trunk/test-applications/jsp/src/main: java/rich and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-21 05:04:38 -0400 (Fri, 21 Sep 2007)
New Revision: 3036
Added:
trunk/test-applications/jsp/src/main/java/rich/RichBean.java
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
Removed:
trunk/test-applications/jsp/src/main/java/rich/Rich.java
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp
trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp
trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-21 09:04:38 UTC (rev 3036)
@@ -21,7 +21,6 @@
package calendar;
-import java.lang.reflect.Array;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -29,11 +28,7 @@
import java.util.Locale;
import java.util.StringTokenizer;
import java.util.TimeZone;
-
-import javax.faces.component.UIComponent;
import javax.faces.event.ValueChangeEvent;
-import javax.faces.webapp.UIComponentTag;
-
import org.richfaces.event.CurrentDateChangeEvent;
public class CalendarBean {
@@ -76,6 +71,7 @@
private String scrollMode;
private String label;
private String timeZone;
+ private String mode;
private int zindex;
private int counter;
@@ -153,18 +149,21 @@
required = false;
weekDay = "none";
month = "none";
+ mode = "client";
timeZone = "Eastern European Time";
preloadDateRangeBegin = "10.09.2007";
preloadDateRangeEnd = "11.10.2007";
}
public Date getPrDateRangeBegin() {
+ if("ajax".equals(mode)) return null;
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,".");
ArrayList<Integer> date = new ArrayList<Integer>();
while(st.hasMoreTokens()) {
date.add(Integer.parseInt(st.nextToken()));
}
+
cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
System.out.println(cal.getTime());
return cal.getTime();
@@ -172,6 +171,7 @@
}
public Date getPrDateRangeEnd() {
+ if("ajax".equals(mode)) return null;
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, ".");
ArrayList<Integer> date = new ArrayList<Integer>();
@@ -442,4 +442,12 @@
public void setPreloadDateRangeEnd(String preloadDateRangeEnd) {
this.preloadDateRangeEnd = preloadDateRangeEnd;
}
+
+ public String getMode() {
+ return mode;
+ }
+
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
}
Deleted: trunk/test-applications/jsp/src/main/java/rich/Rich.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/Rich.java 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/java/rich/Rich.java 2007-09-21 09:04:38 UTC (rev 3036)
@@ -1,7 +0,0 @@
-package rich;
-
-import java.util.ArrayList;
-
-public class Rich {
-
-}
Copied: trunk/test-applications/jsp/src/main/java/rich/RichBean.java (from rev 2912, trunk/test-applications/jsp/src/main/java/rich/Rich.java)
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/RichBean.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2007-09-21 09:04:38 UTC (rev 3036)
@@ -0,0 +1,20 @@
+package rich;
+
+import java.util.ArrayList;
+
+public class RichBean {
+
+ private String src;
+
+ public RichBean() {
+ src = "";
+ }
+
+ public String getSrc() {
+ return src;
+ }
+
+ public void setSrc(String src) {
+ this.src = src;
+ }
+}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -47,16 +47,22 @@
toolTipMode="#{calendarBean.toolTipMode}"
scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
- focus="popupModeID"
- timeZone="#{calendarBean.tmZone}"
+ focus="popupModeID"
+ mode="#{calendarBean.mode}"
required="#{calendarBean.required}"
requiredMessage="Required Message">
+ <f:facet name="weekDay">
+ <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</span></f:verbatim>
+ </f:facet>
+
<f:facet name="optionalHeader">
<h:outputText value="optionalHeader Facet" />
</f:facet>
+
<f:facet name="optionalFooter">
<h:outputText value="optionalFooter Facet" />
</f:facet>
+
<f:validator validatorId="org.richfaces.CalendarValidator" />
<h:panelGrid columns="2">
@@ -114,7 +120,13 @@
<h:commandButton type="button" value="Select Date"
onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" />
- <h:outputText value="Preload date range begin(d.m.y)" />
+ <h:outputText value="Mode:" />
+ <h:selectOneRadio value="#{calendarBean.mode}" onclick="submit();">
+ <f:selectItem itemLabel="client" itemValue="client"/>
+ <f:selectItem itemLabel="ajax" itemValue="ajax"/>
+ </h:selectOneRadio>
+
+ <h:outputText value="Preload date range begin(d.m.y)" />
<h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/>
<h:outputText value="Preload date range end(d.m.y)" />
@@ -217,14 +229,12 @@
<f:verbatim></f:verbatim>
<h:commandButton value="Submit" />
-
- <rich:messages showDetail="true"></rich:messages>
</h:panelGrid>
<f:verbatim>
<br />
</f:verbatim>
-
+
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:subview>
Deleted: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -1,132 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<style type="text/css">
-
- body{
- font: normal 11px tahoma, sans-serif;
- }
-
- .column{
- width:75px;
- font: normal 11px tahoma, sans-serif;
- text-align:center;
- }
-
- .column-index{
- width:75px;
- font: normal 11px tahoma, sans-serif;
- text-align:left;
- }
-
- .list-row3{
- background-color:#ececec;
- }
-
- .list-row1{
- background-color:#f1f6fd;
- }
-
- .list-row2{
- background-color:#fff;
- }
-
- .list-header{
- font: bold 11px tahoma, sans-serif;
- text-align:center;
- }
-
- .list-table1{
- border:1px solid #bed6f8;
- }
-
- .list-table2{
- border:1px solid #bed6f8;
- }
-
-
-
- </style>
-<f:subview id="dfsID">
-
- <a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
- ignoreDupResponses="true" requestDelay="100">
-
- <a4j:region id="stat1">
- <a4j:outputPanel id="slider-body">
-
- <rich:dataFilterSlider sliderListener="#{mybean.doSlide}"
- binding="#{inventoryList.dataFilterSlider}" for="carList"
- forValRef="inventoryList.carInventory" filterBy="getMileage"
- manualInput="true" onSlide="true"
- storeResults="true" trackStyleClass="track" width="400px"
- styleClass="slider-container" startRange="10000" endRange="60000"
- increment="10000" rangeStyleClass="range" trailer="true"
- trailerStyleClass="trailer" handleStyleClass="handle"
- handleValue="10000" id="slider_1">
- </rich:dataFilterSlider>
-
- </a4j:outputPanel>
-
-
- <a4j:outputPanel id="list-body">
- <f:verbatim>
-
- </f:verbatim>
- <h:dataTable id="carIndex" rows="10"
- binding="#{inventoryList.carMakeIndexUIData}"
- value="#{inventoryList.carMakeIndex}" var="category"
- styleClass="list-table1" columnClasses="column-index"
- rowClasses="list-row3">
-
- <h:column>
- <a4j:commandLink actionListener="#{inventoryList.filterCarList}"
- reRender="carList">
- <h:outputText value="#{category}" />
- <f:attribute name="filterRule" value="showTable" />
-
- </a4j:commandLink>
- </h:column>
-
- </h:dataTable>
-
- <h:dataTable id="carList" rows="10"
- value="#{inventoryList.carInventory}" var="category"
- rowClasses="list-row1, list-row2" columnClasses="column"
- headerClass="list-header" styleClass="list-table2">
-
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Make" />
- </f:facet>
- <h:outputText value="#{category.make}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Model" />
- </f:facet>
- <h:outputText value="#{category.model}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText"
- value="#{inventoryList.priceColumnName}" />
- </f:facet>
- <h:outputText value="#{category.price}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText"
- value="#{inventoryList.mileageColumnName}" />
- </f:facet>
- <h:outputText value="#{category.mileage}" />
- </h:column>
- </h:dataTable>
- </a4j:outputPanel>
- </a4j:region>
- <h:commandLink value="Back" action="main"></h:commandLink>
- </a4j:form>
-
-</f:subview>
-
Copied: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp (from rev 2912, trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp)
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -0,0 +1,133 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<style type="text/css">
+
+ body{
+ font: normal 11px tahoma, sans-serif;
+ }
+
+ .column{
+ width:75px;
+ font: normal 11px tahoma, sans-serif;
+ text-align:center;
+ }
+
+ .column-index{
+ width:75px;
+ font: normal 11px tahoma, sans-serif;
+ text-align:left;
+ }
+
+ .list-row3{
+ background-color:#ececec;
+ }
+
+ .list-row1{
+ background-color:#f1f6fd;
+ }
+
+ .list-row2{
+ background-color:#fff;
+ }
+
+ .list-header{
+ font: bold 11px tahoma, sans-serif;
+ text-align:center;
+ }
+
+ .list-table1{
+ border:1px solid #bed6f8;
+ }
+
+ .list-table2{
+ border:1px solid #bed6f8;
+ }
+
+
+
+ </style>
+
+<f:subview id="dfsID">
+
+ <a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
+ ignoreDupResponses="true" requestDelay="100">
+
+ <a4j:region id="stat1">
+ <a4j:outputPanel id="slider-body">
+
+ <rich:dataFilterSlider sliderListener="#{mybean.doSlide}"
+ binding="#{inventoryList.dataFilterSlider}" for="carList"
+ forValRef="inventoryList.carInventory" filterBy="getMileage"
+ manualInput="true" onSlide="true"
+ storeResults="true" trackStyleClass="track" width="400px"
+ styleClass="slider-container" startRange="10000" endRange="60000"
+ increment="10000" rangeStyleClass="range" trailer="true"
+ trailerStyleClass="trailer" handleStyleClass="handle"
+ handleValue="10000" id="slider_1">
+ </rich:dataFilterSlider>
+
+ </a4j:outputPanel>
+
+
+ <a4j:outputPanel id="list-body">
+ <f:verbatim>
+
+ </f:verbatim>
+ <h:dataTable id="carIndex" rows="10"
+ binding="#{inventoryList.carMakeIndexUIData}"
+ value="#{inventoryList.carMakeIndex}" var="category"
+ styleClass="list-table1" columnClasses="column-index"
+ rowClasses="list-row3">
+
+ <h:column>
+ <a4j:commandLink actionListener="#{inventoryList.filterCarList}"
+ reRender="carList">
+ <h:outputText value="#{category}" />
+ <f:attribute name="filterRule" value="showTable" />
+
+ </a4j:commandLink>
+ </h:column>
+
+ </h:dataTable>
+
+ <h:dataTable id="carList" rows="10"
+ value="#{inventoryList.carInventory}" var="category"
+ rowClasses="list-row1, list-row2" columnClasses="column"
+ headerClass="list-header" styleClass="list-table2">
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Make" />
+ </f:facet>
+ <h:outputText value="#{category.make}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Model" />
+ </f:facet>
+ <h:outputText value="#{category.model}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
+ value="#{inventoryList.priceColumnName}" />
+ </f:facet>
+ <h:outputText value="#{category.price}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
+ value="#{inventoryList.mileageColumnName}" />
+ </f:facet>
+ <h:outputText value="#{category.mileage}" />
+ </h:column>
+ </h:dataTable>
+ </a4j:outputPanel>
+ </a4j:region>
+ <h:commandLink value="Back" action="main"></h:commandLink>
+ </a4j:form>
+
+</f:subview>
+
Modified: trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -12,8 +12,6 @@
<h:form>
<rich:messages showDetail="true"></rich:messages>
- <h:outputText value="#{emptyPage.text}" />
-
</h:form>
</body>
</html>
Deleted: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:04:38 UTC (rev 3036)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config>
- <managed-bean>
- <managed-bean-name>divBean</managed-bean-name>
- <managed-bean-class>div.DivBean</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-</faces-config>
Deleted: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:04:38 UTC (rev 3036)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config>
- <managed-bean>
- <managed-bean-name>emptyPage</managed-bean-name>
- <managed-bean-class>emptyPage.EmptyPage</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-09-21 09:04:38 UTC (rev 3036)
@@ -3,8 +3,8 @@
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
<faces-config>
<managed-bean>
- <managed-bean-name>rich</managed-bean-name>
- <managed-bean-class>rich.Rich</managed-bean-class>
+ <managed-bean-name>richBean</managed-bean-name>
+ <managed-bean-class>rich.RichBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 09:04:38 UTC (rev 3036)
@@ -74,7 +74,7 @@
</navigation-case>
<navigation-case>
<from-outcome>DFS</from-outcome>
- <to-view-id>/DataFilterSlider/DFS.jsp</to-view-id>
+ <to-view-id>/DataFilterSlider/DataFilterSlider.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>DDM</from-outcome>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:04:38 UTC (rev 3036)
@@ -12,7 +12,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
+ <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -15,7 +15,8 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
+ <f:selectItem itemValue="" itemLabel="none" />
<f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
@@ -49,7 +50,7 @@
</h:form>
<div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;">
<div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;">
- <jsp:include page="${divBean.src}" />
+ <jsp:include page="${richBean.src}" />
</div>
</div>
</body>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -9,12 +9,14 @@
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
<body>
+<div id="divOptionID" align="right" style="position: static; z-index: 200">
<h:form>
<h:panelGrid columns="2">
<h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
+ <f:selectItem itemValue="" itemLabel="none" />
<f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
@@ -46,10 +48,11 @@
</h:selectOneMenu>
</h:panelGrid>
</h:form>
+ </div>
<div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
<jsp:include page="SelectOneMenuPage.jsp" />
</div>
- <jsp:include page="${divBean.src}" />
+ <jsp:include page="${richBean.src}" />
</body>
</html>
</f:view>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-21 09:04:24 UTC (rev 3035)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-21 09:04:38 UTC (rev 3036)
@@ -15,7 +15,8 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
+ <f:selectItem itemValue="" itemLabel="none" />
<f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
@@ -47,7 +48,7 @@
</h:selectOneMenu>
</h:panelGrid>
</h:form>
- <jsp:include page="${divBean.src}" />
+ <jsp:include page="${richBean.src}" />
</body>
</html>
</f:view>
\ No newline at end of file
18 years, 7 months