February 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r6448 - trunk/docs/userguide/en/src/main/docbook/included.

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

Author: smukhina Date: 2008-02-29 08:33:28 -0500 (Fri, 29 Feb 2008) New Revision: 6448 Modified: trunk/docs/userguide/en/src/main/docbook/included/pickList.xml Log: http://jira.jboss.com/jira/browse/RF-2174 Modified: trunk/docs/userguide/en/src/main/docbook/included/pickList.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-02-29 12:56:39 UTC (rev 6447) +++ trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-02-29 13:33:28 UTC (rev 6448) @@ -48,7 +48,7 @@ </table> <section> <title>Creating the Component with a Page Tag</title> - <para>Here is a simple example as it could be used on a page: </para> + <para>To create the simplest variant on a page use the following syntax:</para> <para> <emphasis role="bold">Example:</emphasis> @@ -109,7 +109,7 @@ <para> The <emphasis role="bold"> <property><rich:pickList></property></emphasis> - component provides changing sizes of lists by using such attributes as: + component provides resizing of lists by using such attributes as: <itemizedlist> <listitem> <emphasis> @@ -751,10 +751,10 @@ </mediaobject> </figure> - <para>In the example the background color for lists was changed.</para> + <para>In the example the background color for lists is changed.</para> <para>Also it’s possible to change styles of particular <emphasis role="bold" - ><property><rich:pickList></property></emphasis> component. In this case you should create own style classes and use them in corresponding <emphasis role="bold" + ><property><rich:pickList></property></emphasis> component. In this case you should create own style classes and use them in the corresponding <emphasis role="bold" ><property><rich:pickList></property></emphasis> <property>styleClass</property> attributes. An example is placed below:</para> <para> @@ -785,7 +785,7 @@ </mediaobject> </figure> - <para>As it could be seen on the picture above, the font style for buttons was changed.</para> + <para>As it could be seen on the picture above, the font style for buttons is changed.</para> </section>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6447 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.

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

Author: sergeyhalipov Date: 2008-02-29 07:56:39 -0500 (Fri, 29 Feb 2008) New Revision: 6447 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: Rendering of table headers. Some optimization. Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-29 12:44:05 UTC (rev 6446) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-29 12:56:39 UTC (rev 6447) @@ -481,7 +481,7 @@ } protected void addInplaceInput(FacesContext context, UIComponent column, - StringBuffer buffer) throws IOException { + String buffer) throws IOException { UIInput filterValueInput = (UIInput) column .getFacet(FILTER_INPUT_FACET_NAME); boolean inplaceInput = true; @@ -503,7 +503,7 @@ if (null == filterEvent || "".equals(filterEvent)) { filterEvent = "onchange"; } - filterValueInput.getAttributes().put(filterEvent, buffer.toString()); + filterValueInput.getAttributes().put(filterEvent, buffer); filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);"); filterValueInput.setValue(column.getAttributes().get("filterValue")); @@ -512,7 +512,7 @@ getUtils().encodeEndFormIfNessesary(context, column); } - protected StringBuffer buildAjaxFunction(FacesContext context, UIComponent column, boolean sortable) { + protected String buildAjaxFunction(FacesContext context, UIComponent column, boolean sortable) { UIComponent table = column.getParent(); String id = table.getClientId(context); JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(table, context); @@ -526,7 +526,7 @@ StringBuffer buffer = new StringBuffer(); ajaxFunction.appendScript(buffer); - return buffer; + return buffer.toString(); } protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy {

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6446 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 2 other directories.

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

Author: andrei_exadel Date: 2008-02-29 07:44:05 -0500 (Fri, 29 Feb 2008) New Revision: 6446 Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: refactoring; fix some bugs Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-29 12:44:05 UTC (rev 6446) @@ -202,7 +202,9 @@ FacesContext facesContext = FacesContext.getCurrentInstance(); ExternalContext externalContext = facesContext.getExternalContext(); HttpServletRequest request = (HttpServletRequest) externalContext.getRequest(); - if ("progress".equals(request.getParameter("action"))) { + if ("progress".equals(request.getParameter("action")) + && request.getParameterMap().containsKey( + this.getClientId(facesContext))) { AjaxContext ajaxContext = AjaxContextImpl.getCurrentInstance(facesContext); String uid = request.getParameter("uid"); Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-29 12:44:05 UTC (rev 6446) @@ -150,10 +150,12 @@ String action, Object oncomplete) throws IOException { JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction( component, context); + String clientId = component.getClientId(context); Map options = AjaxRendererUtils.buildEventOptions(context, component); Map parameters = (Map) options.get("parameters"); parameters.put("action", action); parameters.put("uid", new JSReference("uid")); + parameters.put(clientId, clientId); if (oncomplete != null) { options.put("onbeforedomupdate", oncomplete); } Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-29 12:44:05 UTC (rev 6446) @@ -130,12 +130,11 @@ MultipartRequest multipartRequest = sessions.get(uid); if (multipartRequest != null) { multipartRequest.stop(); + HttpServletResponse httpResponse = (HttpServletResponse) response; + httpResponse.setStatus(HttpServletResponse.SC_NO_CONTENT); + httpResponse.getOutputStream().close(); } } - - HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.setStatus(HttpServletResponse.SC_NO_CONTENT); - httpResponse.getOutputStream().close(); } else { chain.doFilter(request, response); } Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-29 12:44:05 UTC (rev 6446) @@ -845,6 +845,7 @@ var entryInput = entry.fileInput; entryInput.name = this.id + ":file"; + entryInput.disabled = false; var l = inputs.length; for (var i = 0; i < l; i++) {

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6445 - in trunk/test-applications/jsp/src/main: java/contextMenu and 58 other directories.

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

Author: ayanul Date: 2008-02-29 06:58:05 -0500 (Fri, 29 Feb 2008) New Revision: 6445 Added: trunk/test-applications/jsp/src/main/java/rich/Options.java trunk/test-applications/jsp/src/main/java/sortingAndFiltering/ trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java trunk/test-applications/jsp/src/main/java/util/style/ trunk/test-applications/jsp/src/main/java/util/style/Style.java trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarDefault.jsp trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxDefault.jsp trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListDefault.jsp trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerDefault.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableDefault.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuDefault.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/GmapDefault.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderDefault.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerDefault.jsp trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleDefault.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelDefault.jsp trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListDefault.jsp trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DDefault.jsp trunk/test-applications/jsp/src/main/webapp/Panel/PanelDefault.jsp trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarDefault.jsp trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuDefault.jsp trunk/test-applications/jsp/src/main/webapp/PickList/PickListDefault.jsp trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBarDefault.jsp trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableDefault.jsp trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorDefault.jsp trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.jsp trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/ trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerDefault.jsp trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxDefault.jsp trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelDefault.jsp trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelDefault.jsp trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarDefault.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipDefault.jsp trunk/test-applications/jsp/src/main/webapp/Tree/TreeDefault.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthDefault.jsp trunk/test-applications/jsp/src/main/webapp/pages/Blank/BlankDefault.jsp Modified: trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java trunk/test-applications/jsp/src/main/java/dnd/DndBean.java trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java trunk/test-applications/jsp/src/main/java/pickList/PickList.java trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java trunk/test-applications/jsp/src/main/java/rich/RichBean.java trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java trunk/test-applications/jsp/src/main/java/util/data/Data.java trunk/test-applications/jsp/src/main/java/util/event/Event.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml trunk/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp trunk/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp trunk/test-applications/jsp/src/main/webapp/styles/styles.css Log: +add sorting and filtering +update Modified: trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java =================================================================== --- trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,6 +5,8 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; +import rich.RichBean; + public class ContextMenu { private String info; private String inputText; Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -2,6 +2,8 @@ import java.util.ArrayList; +import javax.faces.event.ActionEvent; + import org.richfaces.event.DataScrollerEvent; public class DataScroller { @@ -15,7 +17,27 @@ public boolean limitToList; public boolean renderTable; public int maxPages; - + private String action; + private String actionListener; + + public String act() { + action = "action work!"; + return null; + } + + public String actListener(ActionEvent e) { + actionListener = "actionListener work!"; + return null; + } + + public String getAction() { + return action; + } + + public String getActionListener() { + return actionListener; + } + public boolean isRenderTable() { return renderTable; } @@ -41,6 +63,8 @@ } public DataScroller() { + action = "---"; + actionListener = "---"; fastControls = "auto"; render = true; renderIfSinglePage = true; Modified: trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java =================================================================== --- trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -2,6 +2,8 @@ import java.awt.Event; +import javax.faces.event.ActionEvent; + public class DDMenu { private int hideDelay; @@ -17,6 +19,7 @@ private String iconFolder = null; private String selectMenu; private String mode; + private String actionListener; private boolean rendered; private boolean disabled; private boolean disabledDDM; @@ -40,8 +43,17 @@ disabled = false; disabledDDM = false; check = false; + actionListener = "---"; } + + public void actListener(ActionEvent e) { + actionListener = "actionListener work!"; + } + public String getActionListener() { + return actionListener; + } + public String getIcon() { return icon; } Modified: trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -30,10 +30,14 @@ */ public class DemoSliderBean { private boolean rendered; - DemoInventoryList demoInventoryList; + private DemoInventoryList demoInventoryList; + private String action; + private String actionListener; public DemoSliderBean() { rendered = true; + action = "---"; + actionListener = "---"; } public void setDemoInventoryList(DemoInventoryList demoInventoryList) { @@ -68,4 +72,22 @@ public void setRendered(boolean rendered) { this.rendered = rendered; } + + public String act() { + action = "action work!"; + return null; + } + + public String actListener() { + actionListener = "actionListener work!"; + return null; + } + + public String getAction() { + return action; + } + + public String getActionListener() { + return actionListener; + } } \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/java/dnd/DndBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dnd/DndBean.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/dnd/DndBean.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; +import javax.faces.event.ActionEvent; + import org.richfaces.event.DragEvent; import org.richfaces.event.DropEvent; @@ -14,14 +16,33 @@ private List types = new ArrayList(); private Object dragValue; private Object testParam; + private String actionDrop; + private String actionListenerDrop; + private String actionDrag; + private String actionListenerDrag; public DndBean() { super(); types.add("One"); types.add("Two"); + + actionDrag = "---"; + actionListenerDrag = "---"; + actionDrop = "---"; + actionListenerDrop = "---"; } + + public String actListenerDrag(ActionEvent e) { + actionListenerDrag = "actionListenerDrag work!"; + return null; + } + public String actListenerDrop(ActionEvent e) { + actionListenerDrop = "actionListenerDrop work!"; + return null; + } + public void processDrop(DropEvent event) { System.out.println("Bean.processDrop()" + event.getDropValue()); this.dragValue = event.getDragValue(); @@ -37,11 +58,13 @@ public String dragAction() { System.out.println("Bean.dragAction()"); + actionDrag = "actionDtag work!"; return null; } public String dropAction() { System.out.println("Bean.dropAction()"); + actionDrop = "actionDrop work!"; return null; } @@ -57,4 +80,36 @@ this.testParam = testParam; System.out.println("Bean.setTestParam()" + testParam); } + + public String getActionDrop() { + return actionDrop; + } + + public void setActionDrop(String actionDrop) { + this.actionDrop = actionDrop; + } + + public String getActionListenerDrop() { + return actionListenerDrop; + } + + public void setActionListenerDrop(String actionListenerDrop) { + this.actionListenerDrop = actionListenerDrop; + } + + public String getActionDrag() { + return actionDrag; + } + + public void setActionDrag(String actionDrag) { + this.actionDrag = actionDrag; + } + + public String getActionListenerDrag() { + return actionListenerDrag; + } + + public void setActionListenerDrag(String actionListenerDrag) { + this.actionListenerDrag = actionListenerDrag; + } } \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java =================================================================== --- trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -8,7 +8,7 @@ private String width; private String mode; private String align; - private String rendered; + private boolean rendered; private String iconItemPosition; private String iconItemTopPosition; private String iconGroupPosition; @@ -24,7 +24,7 @@ mode = "none"; expandMode = "none"; align = ""; - rendered = "true"; + rendered = true; disabled = false; tabIndex = "1"; iconGroupPosition = "left"; @@ -64,12 +64,14 @@ public void setAlign(String align) { this.align = align; } - public String getRendered() { + public boolean isRendered() { return rendered; } - public void setRendered(String rendered) { + + public void setRendered(boolean rendered) { this.rendered = rendered; } + public Icon getIcon() { return icon; } Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java =================================================================== --- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -1,6 +1,8 @@ package pickList; import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; @@ -19,44 +21,65 @@ public String removeAllControlLabel; public String removeControlLabel; public boolean rendered; - public String showButtonLabels; + public boolean showButtonLabels; public int size; public String sourceListWidth; public boolean switchByClick; public String targetListWidth; public String title; private ArrayList<SelectItem> data; + private boolean required; + private String requiredMessage; + private Object[] value; - public PickList() { - this.copyAllControlLabel = "copyAllControlLabel"; + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public PickList() { + this.copyAllControlLabel = "copyAllControlLabel"; this.copyControlLabel = "copyControlLabel"; - this.dir = "alert('work')"; + this.dir = "alert('work')"; this.disabled = false; this.displayValueOnly = false; this.fastOrderControlsVisible = true; this.immediate = false; this.listsHeight = "400"; - //this.localValueSet = ; + // this.localValueSet = ; this.moveControlsVerticalAlign = "30"; this.removeAllControlLabel = "removeAllControlLabel"; this.removeControlLabel = "removeControlLabel"; this.rendered = true; - this.showButtonLabels = "showButtonLabels"; + this.showButtonLabels = true; this.size = 10; this.sourceListWidth = "300"; this.switchByClick = false; this.targetListWidth = "400"; this.title = "title"; + this.required = false; + this.requiredMessage = "requiredMessage"; data = new ArrayList<SelectItem>(); - for(int i=0; i < 10; i++) + for (int i = 0; i < 10; i++) data.add(new SelectItem("selectItems " + i)); - + } - + public void valueChangeListener(ValueChangeEvent event) { - //event.getNewValue(); + // event.getNewValue(); } - + public String getCopyAllControlLabel() { return copyAllControlLabel; } @@ -201,16 +224,27 @@ this.title = title; } - public String getShowButtonLabels() { + public boolean isShowButtonLabels() { return showButtonLabels; } + + public void setShowButtonLabels(boolean showButtonLabels) { + this.showButtonLabels = showButtonLabels; + } + public ArrayList<SelectItem> getData() { - return data; + return data; } + public void setData(ArrayList<SelectItem> data) { this.data = data; } - public void setShowButtonLabels(String showButtonLabels) { - this.showButtonLabels = showButtonLabels; + + public Object[] getValue() { + return value; } + + public void setValue(Object[] value) { + this.value = value; + } } Modified: trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java =================================================================== --- trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -119,7 +119,7 @@ public Integer getValue() { // without a vodka bottle you will not understand :) - return enabled ? (permanent ? new Integer(maxValue) - 1 : value++) : value; + return enabled ? (permanent ? new Integer(maxValue) : value++) : value; } public void setValue(Integer value) { Added: trunk/test-applications/jsp/src/main/java/rich/Options.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/Options.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,42 @@ +package rich; + +public class Options { + private boolean reDefault; + private boolean reComponent; + private boolean reProperty; + private boolean reStraightforward; + + public Options() { + reDefault = true; + reComponent = true; + reProperty = true; + reStraightforward = true; + } + + public boolean isReComponent() { + return reComponent; + } + public void setReComponent(boolean reComponent) { + this.reComponent = reComponent; + } + public boolean isReProperty() { + return reProperty; + } + public void setReProperty(boolean reProperty) { + this.reProperty = reProperty; + } + public boolean isReStraightforward() { + return reStraightforward; + } + public void setReStraightforward(boolean reStraightforward) { + this.reStraightforward = reStraightforward; + } + + public boolean isReDefault() { + return reDefault; + } + + public void setReDefault(boolean reDefault) { + this.reDefault = reDefault; + } +} Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -3,7 +3,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; +import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; import org.richfaces.VersionBean; @@ -15,59 +17,55 @@ private String srcContainer; private MapComponent map; private List<SelectItem> list; - private boolean reComponent; - private boolean reProperty; - private boolean reStraightforward; + public RichBean() { list = new ArrayList<SelectItem>(); src = "Blank"; srcContainer = "Blank"; - reComponent = true; - reProperty = true; - reStraightforward = true; map = new MapComponent(); // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); - map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); - map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true})); - map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, false})); - map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true})); - map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true})); - map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false})); - map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {true, true})); - map.add("Effect", add("/Effect/Effect", new boolean [] {false, false})); - map.add("Gmap", add("/Gmap/Gmap", new boolean [] {true, false})); - map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {true, true})); - map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {true, true})); - map.add("Insert", add("/Insert/Insert", new boolean [] {true, false})); - map.add("Message", add("/Message/Message", new boolean [] {true, true})); - map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {true, true})); - map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {true, true})); - map.add("Panel", add("/Panel/Panel", new boolean [] {true, true})); - map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {true, true})); - map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {true, true})); - map.add("Separator", add("/Separator/Separator", new boolean [] {true, true})); - map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {true, true})); - map.add("Spacer", add("/Spacer/Spacer", new boolean [] {true, true})); - map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {true, true})); - map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {true, true})); - map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {true, true})); - map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false})); - map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true})); - map.add("Tree", add("/Tree/Tree", new boolean [] {true, false})); - map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, false})); - map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); - map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); - map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, true})); - map.add("DataDefinitionList", add("/DataDefinitionList/DataDefinitionList", new boolean [] {true, false})); - map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {true, false})); - map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false})); - map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true})); - map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false})); - map.add("Columns", add("/Columns/Columns", new boolean [] {true, false})); - map.add("PickList", add("/PickList/PickList", new boolean [] {true, false})); - map.add("Combobox", add("/Combobox/Combobox", new boolean [] {true, false})); - map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false})); + map.add("Blank", add("/pages/Blank/Blank", new boolean [] {false, true, true})); + map.add("Calendar", add("/Calendar/Calendar", new boolean [] {false, true, true})); + map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {false, true, false})); + map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {false, true, true})); + map.add("DataTable", add("/DataTable/DataTable", new boolean [] {false, true, true})); + map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false, false})); + map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {false, true, true})); + map.add("Effect", add("/Effect/Effect", new boolean [] {false, false, false})); + map.add("Gmap", add("/Gmap/Gmap", new boolean [] {false, true, false})); + map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {false, true, true})); + map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {false, true, true})); + map.add("Insert", add("/Insert/Insert", new boolean [] {false, true, false})); + map.add("Message", add("/Message/Message", new boolean [] {false, true, true})); + map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {false, true, true})); + map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {false, true, true})); + map.add("Panel", add("/Panel/Panel", new boolean [] {false, true, true})); + map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {false, true, true})); + map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {false, true, true})); + map.add("Separator", add("/Separator/Separator", new boolean [] {false, true, true})); + map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {false, true, true})); + map.add("Spacer", add("/Spacer/Spacer", new boolean [] {false, true, true})); + map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {false, true, true})); + map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {false, true, true})); + map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {false, true, true})); + map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {false, true, false})); + map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {false, true, true})); + map.add("Tree", add("/Tree/Tree", new boolean [] {false, true, false})); + map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {false, true, false})); + map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {false, true, false})); + map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false, false})); + map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {false, true, true})); + map.add("DataDefinitionList", add("/DataDefinitionList/DataDefinitionList", new boolean [] {false, true, false})); + map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {false, true, false})); + map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {false, true, false})); + map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {false, true, true})); + map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false, false})); + map.add("Columns", add("/Columns/Columns", new boolean [] {false, true, false})); + map.add("PickList", add("/PickList/PickList", new boolean [] {false, true, false})); + map.add("Combobox", add("/Combobox/Combobox", new boolean [] {false, true, false})); + map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false, false})); + map.add("SortingAndFiltering", add("/SortingAndFiltering/SortingAndFiltering", new boolean [] {false, false, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ list.add(new SelectItem(iterator.next())); @@ -81,13 +79,17 @@ public String getPathComponent() { return map.get(src).get(0); } + + public String getDefaultPathComponent() { + return map.get(src).get(1); + } public String getPathProperty() { - return map.get(src).get(1); + return map.get(src).get(2); } public String getPathStraightforward() { - return map.get(src).get(2); + return map.get(src).get(3); } public void setSrc(String src) { @@ -97,35 +99,12 @@ private ArrayList<String> add(String path, boolean [] arr){ ArrayList<String> list = new ArrayList<String>(); list.add(path + EXT); - if(arr[0]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT); - if(arr[1]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT); + if(arr[0]) list.add(path + "Default" + EXT); else list.add("/pages/Blank/BlankDefault" + EXT); + if(arr[1]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT); + if(arr[2]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT); return list; } - public boolean isReComponent() { - return reComponent; - } - - public void setReComponent(boolean reComponent) { - this.reComponent = reComponent; - } - - public boolean isReProperty() { - return reProperty; - } - - public void setReProperty(boolean reProperty) { - this.reProperty = reProperty; - } - - public boolean isReStraightforward() { - return reStraightforward; - } - - public void setReStraightforward(boolean reStraightforward) { - this.reStraightforward = reStraightforward; - } - public String getVersion() { return version; } Modified: trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -1,5 +1,7 @@ package sTP; +import javax.faces.event.ActionEvent; + public class SimpleTogglePanel { private String switchType; // "client", "server"(default), "ajax" @@ -8,6 +10,8 @@ private String position = "right"; private boolean focus; private boolean rendered; + private String action; + private String actionListener; public SimpleTogglePanel() { width = "75%"; @@ -15,8 +19,19 @@ switchType = "server"; focus = true; rendered = true; + action = "---"; + actionListener = "---"; } + public String act() { + action = "action work!"; + return null; + } + + public void actListener(ActionEvent e){ + actionListener = "actionListener work!"; + } + public String getHeight() { return height; } @@ -94,4 +109,12 @@ public void setPosition(String position) { this.position = position; } + + public String getAction() { + return action; + } + + public String getActionListener() { + return actionListener; + } } Modified: trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -21,7 +21,7 @@ private boolean hideWhenScrolling; private int dataLength; private int frozenColCount; - + private String sortMode; private int first; private boolean rendered; private int timeout; @@ -36,6 +36,7 @@ private boolean ajaxSingle; public ScrollableDataTable() { + sortMode = "single"; width = "400px"; rows = 30; hideWhenScrolling = false; @@ -213,4 +214,12 @@ public void setAjaxSingle(boolean ajaxSingle) { this.ajaxSingle = ajaxSingle; } + + public String getSortMode() { + return sortMode; + } + + public void setSortMode(String sortMode) { + this.sortMode = sortMode; + } } \ No newline at end of file Added: trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,127 @@ + +package sortingAndFiltering; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Random; + +import org.richfaces.model.Ordering; + +import util.data.Data; + +public class SortingAndFiltering { + private ArrayList<Data> data; + private String sortMode; + private boolean selfSorted; + private boolean sortable; + private String sortExpression; + private Ordering sortOrder; + private String currentSortOrder; + private String filterInput; + private String filterValue; + private final Comparator<Data> comparator = new Comparator<Data> () { + public int compare(Data o1, Data o2) { + return o2.getStr1().length() - o1.getStr1().length(); + } + }; + public String getFilterValue() { + return filterValue; + } + + public void setFilterValue(String filterValue) { + this.filterValue = filterValue; + } + + public String getFilterInput() { + return filterInput; + } + + public void setFilterInput(String filterInput) { + this.filterInput = filterInput; + } + + public SortingAndFiltering() { + filterValue = ""; + filterInput = ""; + data = new ArrayList<Data>(); + sortMode = "single"; + sortOrder = Ordering.ASCENDING; + currentSortOrder = "ASCENDING"; + boolean b = true; + Random r = new Random(); + for(int i = 0; i < 10; i++) + data.add(new Data(i, r.nextInt(1000), Data.Random(6), r.nextInt(10000) + 98389, Data.Random(r.nextInt(10) + 1), r.nextInt(500000), Data.statusIcon[i % 5], Data.Random(3), false)); //new Data(i, Data.Random(5), Data.statusIcon[i % 5], Data.Random(6), false)); + } + + public String getSortMode() { + return sortMode; + } + + public void setSortMode(String sortMode) { + this.sortMode = sortMode; + } + + public boolean isSelfSorted() { + return selfSorted; + } + + public void setSelfSorted(boolean selfSorted) { + this.selfSorted = selfSorted; + } + + public String getSortExpression() { + return sortExpression; + } + + public void setSortExpression(String sortExpression) { + this.sortExpression = sortExpression; + } + + public ArrayList<Data> getData() { + return data; + } + + public void setData(ArrayList<Data> data) { + this.data = data; + } + + public boolean isSortable() { + return sortable; + } + + public void setSortable(boolean sortable) { + this.sortable = sortable; + } + + public Ordering getSortOrder() { + return sortOrder; + } + + public void setSortOrder(Ordering sortOrder) { + this.sortOrder = sortOrder; + } + + public String getCurrentSortOrder() { + return currentSortOrder; + } + + public void setCurrentSortOrder(String currentSortOrder) { + if("DESCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.DESCENDING; + else if("UNSORTED".equals(currentSortOrder)) this.sortOrder = Ordering.UNSORTED; + else if("ASCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.ASCENDING; + this.currentSortOrder = currentSortOrder; + } + + public boolean filterMethod(Object obj) { + Data d = (Data)obj; + if(d.getStr0().startsWith(filterInput)) return true; + return false; + } + + + public Comparator<Data> getComparator() { + return comparator; + } + + +} Modified: trunk/test-applications/jsp/src/main/java/util/data/Data.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -1,5 +1,7 @@ package util.data; +import java.util.Random; + public class Data { public static final String[] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; public static final String[] status = {"error", "fatal", "info", "passed", "warn"}; @@ -42,6 +44,18 @@ this.bool2 = false; this.bool3 = false; } + + public Data(int int0, int int1, String str0, int int2, String str1, int int3, String str2, String str3, boolean bool0) { + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.str3 = str3; + this.int0 = int0; + this.int1 = int1; + this.int2 = int2; + this.int3 = int3; + this.bool0 = bool0; + } public Data(String str0, String str1, String str2, String str3, int int0, int int1, int int2, int int3, boolean bool0, boolean bool1, @@ -75,6 +89,14 @@ this.str3 = str3; } + public Data(int int0, String str0, String str1, String str2, boolean bool0){ + this.int0 = int0; + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.bool0 = bool0; + } + public Data(String str0){ this.str0 = str0; } @@ -171,6 +193,22 @@ public void setBool3(boolean bool3) { this.bool3 = bool3; } + + public static String Random(int size){ + char [] c = new char[size]; + for(int i = 0; i < size; i++){ + c[i] = (char)(new Random().nextInt(25) + 97); + } + return new String(c); + } + + public static String RandomUp(int size){ + char [] c = new char[size]; + for(int i = 0; i < size; i++){ + c[i] = (char)(new Random().nextInt(25) + 65); + } + return new String(c); + } @Override public int hashCode() { Modified: trunk/test-applications/jsp/src/main/java/util/event/Event.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/event/Event.java 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/java/util/event/Event.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -91,6 +91,7 @@ private String onitemhover; private String ongroupexpand; private String oncontextmenu; + private String ongroupcollapse; // showEvent('onkeypressInputID', 'onkeypress work!') public Event() { @@ -178,6 +179,7 @@ ontimeselected = "showEvent('ontimeselectedInputID', 'ontimeselected work!')"; ontopclick = "showEvent('ontopclickInputID', 'ontopclick work!')"; onupclick = "showEvent('onupclickInputID', 'onupclick work!')"; + ongroupcollapse = "showEvent('ongroupcollapseInputID', 'ongroupcollapse')"; } public String getOncontextmenu() { @@ -1044,4 +1046,14 @@ public void setOnmaskcontextmenu(String onmaskcontextmenu) { this.onmaskcontextmenu = onmaskcontextmenu; } + + + public String getOngroupcollapse() { + return ongroupcollapse; + } + + public void setOngroupcollapse(String ongroupcollapse) { + this.ongroupcollapse = ongroupcollapse; + } + } \ No newline at end of file Added: trunk/test-applications/jsp/src/main/java/util/style/Style.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/style/Style.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,690 @@ +package util.style; + +import rich.RichBean; + +public class Style { + private RichBean curentComponent; + private String style; + private String styleClass; + private String rangeStyleClass; + private String fieldStyleClass; + private String trackStyleClass; + private String columnClasses; + private String footerClass; + private String headerClass; + private String rowClasses; + private String inactiveStyle; + private String inactiveStyleClass; + private String selectedStyle; + private String selectedStyleClass; + private String tableStyle; + private String tableStyleClass; + private String captionClass; + private String dayStyleClass; + private String inputStyle; + private String barStyle; + private String handleSelectedClass; + private String tipStyle; + private String buttonClass; + private String buttonDisabledClass; + private String buttonDisabledStyle; + private String buttonInactiveClass; + private String buttonInactiveStyle; + private String buttonStyle; + private String inputClass; + private String inputDisabledClass; + private String inputDisabledStyle; + private String inputInactiveClass; + private String inputInactiveStyle; + private String itemClass; + private String listClass; + private String listStyle; + private String disabledItemClass; + private String disabledItemStyle; + private String itemStyle; + private String selectItemStyle; + private String selectItemClass; + private String iconClass; + private String iconStyle; + private String selectClass; + private String selectStyle; + private String highlightedClass; + private String tabClass; + private String entryClass; + private String popupClass; + private String popupStyle; + private String selectedClass; + private String remainClass; + private String initialClass; + private String finishClass; + private String completeClass; + private String controlClass; + private String captionStyle; + private String activeClass; + + private String styleA; + private String styleClassA; + private String selectStyleA; + private String iconClassA; + private String iconStyleA; + private String selectClassA; + private String rowClassesA; + private String columnClassesA; + private String footerClassA; + private String headerClassA; + + public Style() { + style = "style"; + styleClass = "styleClass"; + rangeStyleClass = "rangeStyleClass"; + fieldStyleClass = "fieldStyleClass"; + trackStyleClass = "trackStyleClass"; + columnClasses = "columnClasses"; + footerClass = "footerClass"; + headerClass = "headerClass"; + rowClasses = "rowClasses"; + inactiveStyle = "inactiveStyle"; + inactiveStyleClass = "inactiveStyleClass"; + selectedStyle = "selectedStyle"; + selectedStyleClass = "selectedStyleClass"; + tableStyle = "tableStyle"; + tableStyleClass = "tableStyleClass"; + captionClass = "captionClass"; + dayStyleClass = "dayStyleClass"; + inputStyle = "inputStyle"; + barStyle = "barStyle"; + handleSelectedClass = "handleSelectedClass"; + tipStyle = "tipStyle"; + buttonClass = "buttonClass"; + buttonDisabledClass = "buttonDisabledClass"; + buttonDisabledStyle = "buttonDisabledStyle"; + buttonInactiveClass = "buttonInactiveClass"; + buttonInactiveStyle = "buttonInactiveStyle"; + buttonStyle = "buttonStyle"; + inputClass = "inputClass"; + inputDisabledClass = "inputDisabledClass"; + inputDisabledStyle = "inputDisabledStyle"; + inputInactiveClass = "inputInactiveClass"; + inputInactiveStyle = "inputInactiveStyle"; + itemClass = "itemClass"; + listClass = "listClass"; + listStyle = "listStyle"; + disabledItemClass = "disabledItemClass"; + disabledItemStyle = "disabledItemStyle"; + itemStyle = "itemStyle"; + selectItemStyle = "selectItemStyle"; + selectItemClass = "selectItemClass"; + iconClass = "iconClass"; + iconStyle = "iconStyle"; + selectClass = "selectClass"; + selectStyle = "selectStyle"; + highlightedClass = "highlightedClass"; + tabClass = "tabClass"; + entryClass = "entryClass"; + popupClass = "popupClass"; + popupStyle = "popupStyle"; + selectedClass = "selectedClass"; + remainClass = "remainClass"; + initialClass = "initialClass"; + finishClass = "finishClass"; + completeClass = "completeClass"; + controlClass = "controlClass"; + captionStyle = "captionStyle"; + activeClass = "activeClass"; + + styleA = "styleA"; + styleClassA = "styleClassA"; + selectStyleA = "selectStyleA"; + iconClassA = "iconClassA"; + iconStyleA = "iconStyleA"; + selectClassA = "selectClassA"; + rowClassesA = "rowClassesA"; + columnClassesA = "columnClassesA"; + footerClassA = "footerClassA"; + headerClassA = "headerClassA"; + } + + public String getStyle() { + return style; + } + + public void setStyle(String style) { + this.style = style; + } + + public String getStyleClass() { + return styleClass; + } + + public void setStyleClass(String styleClass) { + this.styleClass = styleClass; + } + + public String getRangeStyleClass() { + return rangeStyleClass; + } + + public void setRangeStyleClass(String rangeStyleClass) { + this.rangeStyleClass = rangeStyleClass; + } + + public String getFieldStyleClass() { + return fieldStyleClass; + } + + public void setFieldStyleClass(String fieldStyleClass) { + this.fieldStyleClass = fieldStyleClass; + } + + public String getTrackStyleClass() { + return trackStyleClass; + } + + public void setTrackStyleClass(String trackStyleClass) { + this.trackStyleClass = trackStyleClass; + } + + public String getColumnClasses() { + return columnClasses; + } + + public void setColumnClasses(String columnClasses) { + this.columnClasses = columnClasses; + } + + public String getFooterClass() { + return footerClass; + } + + public void setFooterClass(String footerClass) { + this.footerClass = footerClass; + } + + public String getHeaderClass() { + return headerClass; + } + + public void setHeaderClass(String headerClass) { + this.headerClass = headerClass; + } + + public String getRowClasses() { + return rowClasses; + } + + public void setRowClasses(String rowClasses) { + this.rowClasses = rowClasses; + } + + public String getInactiveStyle() { + return inactiveStyle; + } + + public void setInactiveStyle(String inactiveStyle) { + this.inactiveStyle = inactiveStyle; + } + + public String getInactiveStyleClass() { + return inactiveStyleClass; + } + + public void setInactiveStyleClass(String inactiveStyleClass) { + this.inactiveStyleClass = inactiveStyleClass; + } + + public String getSelectedStyle() { + return selectedStyle; + } + + public void setSelectedStyle(String selectedStyle) { + this.selectedStyle = selectedStyle; + } + + public String getSelectedStyleClass() { + return selectedStyleClass; + } + + public void setSelectedStyleClass(String selectedStyleClass) { + this.selectedStyleClass = selectedStyleClass; + } + + public String getTableStyle() { + return tableStyle; + } + + public void setTableStyle(String tableStyle) { + this.tableStyle = tableStyle; + } + + public String getTableStyleClass() { + return tableStyleClass; + } + + public void setTableStyleClass(String tableStyleClass) { + this.tableStyleClass = tableStyleClass; + } + + public String getCaptionClass() { + return captionClass; + } + + public void setCaptionClass(String captionClass) { + this.captionClass = captionClass; + } + + public String getDayStyleClass() { + return dayStyleClass; + } + + public void setDayStyleClass(String dayStyleClass) { + this.dayStyleClass = dayStyleClass; + } + + public String getInputStyle() { + return inputStyle; + } + + public void setInputStyle(String inputStyle) { + this.inputStyle = inputStyle; + } + + public String getBarStyle() { + return barStyle; + } + + public void setBarStyle(String barStyle) { + this.barStyle = barStyle; + } + + public String getHandleSelectedClass() { + return handleSelectedClass; + } + + public void setHandleSelectedClass(String handleSelectedClass) { + this.handleSelectedClass = handleSelectedClass; + } + + public String getTipStyle() { + return tipStyle; + } + + public void setTipStyle(String tipStyle) { + this.tipStyle = tipStyle; + } + + public String getButtonClass() { + return buttonClass; + } + + public void setButtonClass(String buttonClass) { + this.buttonClass = buttonClass; + } + + public String getButtonDisabledClass() { + return buttonDisabledClass; + } + + public void setButtonDisabledClass(String buttonDisabledClass) { + this.buttonDisabledClass = buttonDisabledClass; + } + + public String getButtonDisabledStyle() { + return buttonDisabledStyle; + } + + public void setButtonDisabledStyle(String buttonDisabledStyle) { + this.buttonDisabledStyle = buttonDisabledStyle; + } + + public String getButtonInactiveClass() { + return buttonInactiveClass; + } + + public void setButtonInactiveClass(String buttonInactiveClass) { + this.buttonInactiveClass = buttonInactiveClass; + } + + public String getButtonInactiveStyle() { + return buttonInactiveStyle; + } + + public void setButtonInactiveStyle(String buttonInactiveStyle) { + this.buttonInactiveStyle = buttonInactiveStyle; + } + + public String getButtonStyle() { + return buttonStyle; + } + + public void setButtonStyle(String buttonStyle) { + this.buttonStyle = buttonStyle; + } + + public String getInputClass() { + return inputClass; + } + + public void setInputClass(String inputClass) { + this.inputClass = inputClass; + } + + public String getInputDisabledClass() { + return inputDisabledClass; + } + + public void setInputDisabledClass(String inputDisabledClass) { + this.inputDisabledClass = inputDisabledClass; + } + + public String getInputDisabledStyle() { + return inputDisabledStyle; + } + + public void setInputDisabledStyle(String inputDisabledStyle) { + this.inputDisabledStyle = inputDisabledStyle; + } + + public String getInputInactiveClass() { + return inputInactiveClass; + } + + public void setInputInactiveClass(String inputInactiveClass) { + this.inputInactiveClass = inputInactiveClass; + } + + public String getInputInactiveStyle() { + return inputInactiveStyle; + } + + public void setInputInactiveStyle(String inputInactiveStyle) { + this.inputInactiveStyle = inputInactiveStyle; + } + + public String getItemClass() { + return itemClass; + } + + public void setItemClass(String itemClass) { + this.itemClass = itemClass; + } + + public String getListClass() { + return listClass; + } + + public void setListClass(String listClass) { + this.listClass = listClass; + } + + public String getListStyle() { + return listStyle; + } + + public void setListStyle(String listStyle) { + this.listStyle = listStyle; + } + + public String getDisabledItemClass() { + return disabledItemClass; + } + + public void setDisabledItemClass(String disabledItemClass) { + this.disabledItemClass = disabledItemClass; + } + + public String getDisabledItemStyle() { + return disabledItemStyle; + } + + public void setDisabledItemStyle(String disabledItemStyle) { + this.disabledItemStyle = disabledItemStyle; + } + + public String getItemStyle() { + return itemStyle; + } + + public void setItemStyle(String itemStyle) { + this.itemStyle = itemStyle; + } + + public String getSelectItemStyle() { + return selectItemStyle; + } + + public void setSelectItemStyle(String selectItemStyle) { + this.selectItemStyle = selectItemStyle; + } + + public String getSelectItemClass() { + return selectItemClass; + } + + public void setSelectItemClass(String selectItemClass) { + this.selectItemClass = selectItemClass; + } + + public String getIconClass() { + return iconClass; + } + + public void setIconClass(String iconClass) { + this.iconClass = iconClass; + } + + public String getIconStyle() { + return iconStyle; + } + + public void setIconStyle(String iconStyle) { + this.iconStyle = iconStyle; + } + + public String getSelectClass() { + return selectClass; + } + + public void setSelectClass(String selectClass) { + this.selectClass = selectClass; + } + + public String getSelectStyle() { + return selectStyle; + } + + public void setSelectStyle(String selectStyle) { + this.selectStyle = selectStyle; + } + + public String getHighlightedClass() { + return highlightedClass; + } + + public void setHighlightedClass(String highlightedClass) { + this.highlightedClass = highlightedClass; + } + + public String getTabClass() { + return tabClass; + } + + public void setTabClass(String tabClass) { + this.tabClass = tabClass; + } + + public String getEntryClass() { + return entryClass; + } + + public void setEntryClass(String entryClass) { + this.entryClass = entryClass; + } + + public String getPopupClass() { + return popupClass; + } + + public void setPopupClass(String popupClass) { + this.popupClass = popupClass; + } + + public String getPopupStyle() { + return popupStyle; + } + + public void setPopupStyle(String popupStyle) { + this.popupStyle = popupStyle; + } + + public String getSelectedClass() { + return selectedClass; + } + + public void setSelectedClass(String selectedClass) { + this.selectedClass = selectedClass; + } + + public String getRemainClass() { + return remainClass; + } + + public void setRemainClass(String remainClass) { + this.remainClass = remainClass; + } + + public String getInitialClass() { + return initialClass; + } + + public void setInitialClass(String initialClass) { + this.initialClass = initialClass; + } + + public String getFinishClass() { + return finishClass; + } + + public void setFinishClass(String finishClass) { + this.finishClass = finishClass; + } + + public String getCompleteClass() { + return completeClass; + } + + public void setCompleteClass(String completeClass) { + this.completeClass = completeClass; + } + + public String getControlClass() { + return controlClass; + } + + public void setControlClass(String controlClass) { + this.controlClass = controlClass; + } + + public String getStyleA() { + return styleA; + } + + public void setStyleA(String styleA) { + this.styleA = styleA; + } + + public String getStyleClassA() { + return styleClassA; + } + + public void setStyleClassA(String styleClassA) { + this.styleClassA = styleClassA; + } + + public String getSelectStyleA() { + return selectStyleA; + } + + public void setSelectStyleA(String selectStyleA) { + this.selectStyleA = selectStyleA; + } + + public String getIconClassA() { + return iconClassA; + } + + public void setIconClassA(String iconClassA) { + this.iconClassA = iconClassA; + } + + public String getIconStyleA() { + return iconStyleA; + } + + public void setIconStyleA(String iconStyleA) { + this.iconStyleA = iconStyleA; + } + + public String getSelectClassA() { + return selectClassA; + } + + public void setSelectClassA(String selectClassA) { + this.selectClassA = selectClassA; + } + + public String getCaptionStyle() { + return captionStyle; + } + + public void setCaptionStyle(String captionStyle) { + this.captionStyle = captionStyle; + } + + public String getRowClassesA() { + return rowClassesA; + } + + public void setRowClassesA(String rowClassesA) { + this.rowClassesA = rowClassesA; + } + + public String getColumnClassesA() { + return columnClassesA; + } + + public void setColumnClassesA(String columnClassesA) { + this.columnClassesA = columnClassesA; + } + + public String getFooterClassA() { + return footerClassA; + } + + public void setFooterClassA(String footerClassA) { + this.footerClassA = footerClassA; + } + + public String getHeaderClassA() { + return headerClassA; + } + + public void setHeaderClassA(String headerClassA) { + this.headerClassA = headerClassA; + } + + public String getActiveClass() { + return activeClass; + } + + public void setActiveClass(String activeClass) { + this.activeClass = activeClass; + } + + public RichBean getCurentComponent() { + return curentComponent; + } + + public void setCurentComponent(RichBean curentComponent) { + this.curentComponent = curentComponent; + } +} Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -15,6 +15,7 @@ rendered="#{calendarBean.renderedAjax}" /> <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" + style="#{style.style}" styleClass="#{style.styleClass}" dayStyleClass="#{style.dayStyleClass}" inputStyle="#{style.inputStyle}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" @@ -174,4 +175,5 @@ </h:panelGrid> </rich:calendar> </h:panelGrid> + <h:outputLink value="http://www.jboss.com/index.html?module=bb&op=viewforum&f=261"></h:outputLink> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,6 @@ +<%@ 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"%> + +<rich:calendar></rich:calendar> Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -8,9 +8,6 @@ <h:panelGrid columns="2"> <h:panelGroup> <a4j:commandButton value="reRender" reRender="calendarClientID,calendarAjaxID"></a4j:commandButton> - <a4j:commandButton reRender="calendarClientID,calendarAjaxID" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> - <h:commandButton action="submit();" value="submit();" /> - <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> </h:panelGroup> <h:column></h:column> Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,6 +4,7 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="columnsSubviewID"> + <h:selectBooleanCheckbox value="#{columns.dataTableRendered}"> <a4j:support event="onchange" reRender="richGridID"></a4j:support> </h:selectBooleanCheckbox> @@ -31,15 +32,16 @@ </f:facet> </rich:column> - <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" + <rich:columns value="#{columns.data2}" var="d2" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" - begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" > + begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" style="#{style.style}" styleClass="#{style.styleClass}"> <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet> <h:outputText value="#{index}. "></h:outputText> <h:outputText value="#{d1.str0}, "></h:outputText> <h:outputText value="#{d2.str0}"></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="footer #{d2.int0}"></h:outputText> </f:facet> @@ -76,6 +78,7 @@ <h:outputText value="#{index}. "></h:outputText> <h:outputText value="#{d1.str0}, "></h:outputText> <h:outputText value="#{d2.str0}"></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="footer #{d2.int0}"></h:outputText> </f:facet> Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,13 +5,14 @@ <f:subview id="comboboxSubviewID"> <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}" defaultLabel="#{combobox.defaultLabel}" - filterNewValues="#{combobox.filterNewValues}" + buttonClass="#{style.buttonClass}" buttonDisabledClass="#{style.buttonDisabledClass}" buttonDisabledStyle="#{style.buttonDisabledStyle}" buttonInactiveClass="#{style.buttonInactiveClass}" buttonInactiveStyle="#{style.buttonInactiveStyle}" buttonStyle="#{style.buttonStyle}" inputClass="#{style.inputClass}" inputDisabledClass="#{style.inputDisabledClass}" inputDisabledStyle="#{style.inputDisabledStyle}" inputInactiveClass="#{style.inputInactiveClass}" inputInactiveStyle="#{style.inputInactiveStyle}" itemClass="#{style.itemClass}" inputStyle="#{style.inputStyle}" listClass="#{style.listClass}" listStyle="#{style.listStyle}" + filterNewValues="#{combobox.filterNewValues}" directInputSuggestions="#{combobox.directInputSuggestions}" immediate="#{combobox.immediate}" inputSize="#{combobox.inputSize}" width="#{combobox.width}" valueChangeListener="#{combobox.valueChangeListener}" value="#{combobox.value}" tabindex="#{combobox.tabindex}" suggestionValues="#{combobox.suggestionValues}" size="#{combobox.size}" required="#{combobox.required}" requiredMessage="#{combobox.requiredMessage}" rendered="#{combobox.rendered}" selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}" maxlength="#{combobox.maxlength}" - enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}" + enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}" style="#{style.style}" styleClass="#{style.styleClass}" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onfocus="#{event.onfocus}" onitemselected="#{event.onitemselected}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" Added: trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,12 @@ +<%@ 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" %> + + <rich:comboBox> + <f:selectItem itemValue="item 1"/> + <f:selectItem itemValue="item 2"/> + <f:selectItem itemValue="item 3"/> + <f:selectItem itemValue="item 4"/> + <f:selectItem itemValue="item 5"/> + </rich:comboBox> Modified: trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -6,10 +6,11 @@ <f:subview id="contextMenuSubviewID"> <h:panelGrid columns="2"> <rich:panel style="width: 130px; height: 50px; background-color: #98FB98;"> - <h:outputText value="panel with contextMenu(DEFAULT)" /> + <h:outputText value="panel with contextMenu(DEFAULT)" /> <f:verbatim><br /></f:verbatim> <h:outputText value="testing events" /> - <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> - <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID"> + <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" style="#{style.style}" styleClass="#{style.styleClass}" disabledItemClass="#{style.disabledItemClass}" disabledItemStyle="#{style.disabledItemStyle}" itemClass="#{style.itemClass}" itemStyle="#{style.itemStyle}" selectItemStyle="#{style.selectItemStyle}" selectItemClass="#{style.selectItemClass}" + oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> + <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID" style="#{style.styleA}" styleClass="#{style.styleClassA}"> <f:param name="cmdParam" value="abc" /> </rich:menuItem> <rich:menuItem onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"><h:outputText value="event item"/></rich:menuItem> @@ -17,7 +18,7 @@ <f:param name="cmdParam" value="hide" /> </rich:menuItem> <rich:menuSeparator /> - <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID" iconClass="#{style.iconClassA}" iconStyle="#{style.iconStyleA}" selectClass="#{style.selectClassA}" styleClass="#{style.styleClassA}" selectStyle="#{style.selectStyleA}" style="#{style.styleA}"> <f:param name="cmdParam" value="a" /> </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value=" b" reRender="cmInfoID"> @@ -26,8 +27,8 @@ <rich:menuItem icon="/pics/info.gif" value="c" reRender="cmInfoID"> <f:param name="cmdParam" value="c" /> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="d" reRender="cmInfoID"> - <f:param name="cmdParam" value="d" /> + <rich:menuItem icon="/pics/info.gif" reRender="cmInfoID"> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:menuItem> <rich:menuGroup value="menuGroup"> <rich:menuItem icon="/pics/fatal.gif" value="a" reRender="cmInfoID"> @@ -62,7 +63,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -128,7 +129,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -223,7 +224,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -264,7 +265,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -305,7 +306,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -348,7 +349,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> Modified: trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -9,18 +9,6 @@ <head> <f:loadBundle basename="message" var="msg" /> <title></title> - <script type="text/javascript"> - function showEvent(elementID, value) { - var oldObject = window.document.getElementById(elementID); - if(oldObject == null || oldObject.type == "text") return; - var newObject = window.document.createElement('input'); - if(oldObject.type) newObject.type = "text"; - if(oldObject.size) newObject.size = oldObject.size; - if(oldObject.value) newObject.value = value; - if(oldObject.id) newObject.id = oldObject.id; - oldObject.parentNode.replaceChild(newObject,oldObject); - } - </script> <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> </head> Added: trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,8 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + + <rich:dataDefinitionList value="#{dataDefinitionList.arrDefault}" var="def"> + <h:outputText value="#{def}" /> + </rich:dataDefinitionList> Modified: trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -6,11 +6,12 @@ <f:subview id="dataDefinitionListSubviewID"> <rich:dataDefinitionList id="ddListID" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}" rendered="#{dataDefinitionList.rendered}" title="#{dataDefinitionList.title}" dir="#{dataDefinitionList.dir}" - rows="#{dataDefinitionList.rows}"> + rows="#{dataDefinitionList.rows}" style="#{style.style}" styleClass="#{style.styleClass}" columnClasses="#{style.columnClasses}" rowClasses="#{style.rowClasses}"> <f:facet name="header"> <h:outputText value="Africa(header):" /> </f:facet> - <h:outputText value="#{arr.str0}" /> + <h:outputText value="#{arr.str0} " /> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="Africa(footer);" /> </f:facet> Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,14 +5,13 @@ <f:subview id="dataFilterSliderSubviewID"> - <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" action="#{dfs.act}" actionListener="#{dfs.actListener}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" for="carList" forValRef="inventoryList.carInventory" - filterBy="getMileage" manualInput="true" storeResults="true" - trackStyleClass="track" width="400px" styleClass="slider-container" + filterBy="getMileage" manualInput="true" storeResults="true" width="400px" + styleClass="#{style.styleClass}" rangeStyleClass="#{style.rangeStyleClass}" trailerStyleClass="#{style.trailerStyleClass}" style="#{style.style}" fieldStyleClass="#{style.fieldStyleClass}" trackStyleClass="#{style.trackStyleClass}" startRange="10000" endRange="60000" increment="10000" - rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" - handleStyleClass="handle" handleValue="10000" id="dfsID" + trailer="true" handleStyleClass="handle" handleValue="10000" id="dfsID" onbeforedomupdate="#{event.onbeforedomupdate}" onchange="#{event.onchange}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" @@ -79,4 +78,11 @@ <h:outputText value="click reRender for update page(RF-1365)" /> <h:commandButton value="reRender" /> + <h:panelGrid columns="2"> + <a4j:commandButton value="action" rendered="actionDFSID" style=" width : 95px;"></a4j:commandButton> /> + <h:outputText id="actionDFSID" value="#{dfs.action}" /> + + <a4j:commandButton value="actionListener" rendered="actionListenerDFSID" style=" width : 95px;"></a4j:commandButton> /> + <h:outputText id="actionListenerDFSID" value="#{dfs.actionListener}" /> + </h:panelGrid> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,13 +4,15 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="dataOrderedListSubviewID"> - <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}" + <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}" rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}" - rows="#{dataOrderedList.rows}"> + rows="#{dataOrderedList.rows}" + columnClasses="#{style.columnClasses}" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" style="#{style.style}" styleClass="#{style.styleClass}" > <f:facet name="header"> <h:outputText value="Africa(header):" /> </f:facet> - <h:outputText value="#{arr.str0}" /> + <h:outputText value="#{arr.str0} " /> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="Africa(footer);" /> </f:facet> Added: trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,8 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<rich:dataOrderedList value="#{dataOrderedList.defaultArr}" var="def"> + <h:outputText value="#{def}" /> +</rich:dataOrderedList> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -7,7 +7,8 @@ <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" var="dT" cellpadding="5px" rows="5" border="1"> <f:facet name="header"> - <rich:datascroller fastControls="#{dataScroller.fastControls}" + <rich:datascroller inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}" selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}" styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}" + fastControls="#{dataScroller.fastControls}" action="#{dataScroller.act}" actionListener="#{dataScroller.actListener}" align="#{dataScroller.align}" rendered="#{dataScroller.render}" limitToList="#{dataScroller.limitToList}" renderIfSinglePage="#{dataScroller.renderIfSinglePage}" @@ -24,7 +25,12 @@ <h:outputText value="#{dT.data0}" /> </h:column> <h:column> - <h:outputText value="#{dT.data1}" /> + <h:outputText value="#{dT.data1} " /> <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </h:column> </h:dataTable> + <h:panelGrid id="dataScrollerActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="dataScrollerActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{dataScroller.action}" /> + <h:outputText value="#{dataScroller.actionListener}" /> + </h:panelGrid> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,69 +4,75 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="DataTableSubviewID"> - <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="showEvent('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" -onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}" -onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:facet name="caption"> - <h:outputText value="caption facet" /> - </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:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" + captionClass="#{style.captionClass}" rowClasses="#{style.rowClasses}" headerClass="#{style.headerClass}" footerClass="#{style.footerClass}" styleClass="#{style.styleClass}" captionStyle="#{style.captionStyle}" columnClasses="#{style.columnClasses}" + onRowClick="#{event.onRowClick};alert('row #{key}');" rendered="#{dataTable.rendered}" + align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" + width="#{dataTable.width}" title="DataTableTite" onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" + onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" + onRowMouseUp="#{event.onRowMouseUp}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> + <f:facet name="caption"> + <h:outputText value="caption facet" /> + </f:facet> + <f:facet name="header"> <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 rowspan="2" rendered="#{dataTable.r2rendered}"> + <h:outputText value="2-row head" /> </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}" /> + <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> - <rich:column styleClass="column" headerClass="cheader" footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="table foot" /> + </f:facet> + <rich:columnGroup columnClasses="#{style.columnClassesA}" rowClasses="#{style.rowClassesA}" style="#{style.styleA}" styleClass="#{style.styleClassA}"> + <rich:column id="mounth" > + <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:subTable id="detail" var="detail" value="#{dataTableID.detail}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onRowClick="#{event.onRowClick}" onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}"> - <f:facet name="header"> - <h:outputText value="facet(header)" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="facet(footer)" /> - </f:facet> - <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 rendered="#{dataTable.r2rendered}"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + <h:outputText value="#{dataTableID.town}" /> </rich:column> - </rich:dataTable> + </rich:columnGroup> + <rich:column styleClass="#{style.styleClassA}" headerClass="#{style.headerClassA}" footerClass="#{style.footerClassA}" style="#{style.styleA}" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{dataTableID.day}" /> + </rich:column> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}" + columnClasses="#{style.columnClassesA}" footerClass="#{style.footerClassA}" headerClass="#{style.headerClassA}" rowClasses="#{style.rowClassesA}" onclick="#{event.onclick}" + ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onRowClick="#{event.onRowClick}" + onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" + onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}"> + <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" footerClass="#{style.footerClassA}" headerClass="#{style.headerClassA}" style="#{style.styleA}" styleClass="#{style.styleClassA}" colspan="2"> + <h:outputText value="#{dataTableID.total}" /> + </rich:column> + </rich:dataTable> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -22,7 +22,7 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drag1"> <h:outputText value="#{type} - drag" /> - <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" + <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" actionListener="#{dndBean.actListenerDrag}" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" oncomplete="#{event.oncomplete}" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}"> </rich:dragSupport> </h:panelGrid> @@ -33,16 +33,22 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drop2"> <h:outputText value="#{type} - drop" /> - <rich:dropSupport reRender="dragValueText" + <rich:dropSupport reRender="dragValueText" actionListener="#{dndBean.actListenerDrop}" action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> </rich:dropSupport> </h:panelGrid> </h:column> </h:dataTable> + <h:panelGrid id="dndActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{dndBean.actionDrag}" /> + <h:outputText value="#{dndBean.actionDrop}" /> + <h:outputText value="#{dndBean.actionListenerDrag}" /> + <h:outputText value="#{dndBean.actionListenerDrop}" /> + </h:panelGrid> </h:panelGrid> - - <rich:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject"> + <rich:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject" style="#{style.style}" styleClass="#{style.styleClass}"> <f:facet name="single"> <f:verbatim>{marker} <b>{testDrag}</b> {label}</f:verbatim> </f:facet> Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -10,7 +10,7 @@ <rich:dropDownMenu id="ddmId" disabled="#{dDMenu.disabledDDM}" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}" popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" - verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" + verticalOffset="#{dDMenu.verticalOffset}" styleClass="#{style.styleClass}" style="#{style.style}" event="#{dDMenu.event}" oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:menuItem icon="#{dDMenu.icon}" onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}!')" oncomplete="#{event.oncomplete}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"> <h:outputText value="Item1(test events)" /> @@ -26,6 +26,14 @@ <rich:menuItem icon="#{dDMenu.icon}"> <h:outputText value="Item3" /> </rich:menuItem> + <rich:menuItem> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:menuItem> + <rich:menuSeparator/> + <rich:menuItem icon="/pics/info.gif" value="action" action="alert('action work')" reRender="cmInfoID"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{dDMenu.actListener}" reRender="cmInfoID"> + </rich:menuItem> <rich:menuSeparator /> <rich:menuItem icon="/pics/ajax_process.gif" iconDisabled="/pics/ajax_stoped.gif" disabled="#{dDMenu.disabled}"> <h:outputText value="Image"></h:outputText> @@ -56,4 +64,9 @@ </rich:dropDownMenu> </rich:panel> </h:panelGrid> + <h:panelGrid id="dndActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{dDMenu.actionDrag}" /> + <h:outputText value="#{dDMenu.actionListener}" /> + </h:panelGrid> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -10,7 +10,7 @@ gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" showGScaleControl="#{gmap.showGScaleControl}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" - gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" /> + gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="#{style.style}" styleClass="#{style.styleClass}" /> <h:panelGroup> <f:verbatim> Added: trunk/test-applications/jsp/src/main/webapp/Gmap/GmapDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/GmapDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/GmapDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,7 +5,7 @@ <f:subview id="inputNumberSliderSubviewID"> <h:panelGrid columns="1"> - <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" + <rich:inputNumberSlider id="SliderId" barStyle="#{style.barStyle}" handleSelectedClass="#{style.handleSelectedClass}" inputStyle="#{style.inputStyle}" tipStyle="#{style.tipStyle}" style="#{style.style}" immediate="#{inputNumberSlider.immediate}" inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="#{inputNumberSlider.valueChangeListener}" required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}" @@ -13,8 +13,8 @@ inputSize="#{inputNumberSlider.inputSize}" maxValue="#{inputNumberSlider.maxValue}" minValue="#{inputNumberSlider.minValue}" rendered="#{inputNumberSlider.rendered}" showBoundaryValues="#{inputNumberSlider.showBoundaryValues}" step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}" - barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}" - handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}" + barClass="#{style.barClass}" tipClass="#{style.barClass}" inputClass="#{style.inputClass}" + handleClass="#{style.handleStyle}" styleClass="#{style.tipStyle}" maxlength="#{inputNumberSlider.maxlength}" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}" onslide="#{event.onslide}"> </rich:inputNumberSlider> Added: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -9,9 +9,9 @@ <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" disabled="#{inputNumberSpinner.disabled}" maxValue="#{inputNumberSpinner.max}" minValue="#{inputNumberSpinner.min}" step="#{inputNumberSpinner.step}" rendered="#{inputNumberSpinner.rendered}" value="#{inputNumberSpinner.value}" - inputClass="#{inputNumberSpinner.inputStyle}" styleClass="#{inputNumberSpinner.style}" + inputClass="#{style.inputClass}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}" style="#{style.style}" enableManualInput="#{inputNumberSpinner.manualInput}" inputSize="#{inputNumberSpinner.inputSize}" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onblur="showEvent('onblurInputID', 'onblur work!')" + onmousedown="#{event.onmousedown}" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onfocus="#{event.onfocus}" onselect="#{event.onselect}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ondownclick="#{event.ondownclick}" onupclick="#{event.onupclick}"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,7 +4,8 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="listShuttleSubviewID"> - <rich:listShuttle id="listShuttleID" var="item" sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}" + <rich:listShuttle id="listShuttleID" var="item" + sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}" bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}" copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}" fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}" converter="listShuttleConverter" @@ -81,5 +82,12 @@ </f:facet> <h:graphicImage value="#{item.str3}" /> </h:column> + + <rich:column> + <f:facet name="header"> + <h:outputText value="Link"></h:outputText> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:column> </rich:listShuttle> </f:subview> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -2,7 +2,7 @@ <%@ 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"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> + <f:subview id="modalPanelSubviewID"> @@ -10,7 +10,7 @@ <f:selectItems value="#{richBean.listContainer}" /> </h:selectOneMenu> - <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" + <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" shadowDepth="#{modalPanel.shadowDepth}" @@ -34,7 +34,14 @@ <br /> <br /> </f:verbatim> - + + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> Added: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -87,6 +87,13 @@ </f:facet> <h:graphicImage value="#{item.str3}" /> </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="Link"></h:outputText> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </h:column> </rich:orderingList> <h:panelGrid columns="3"> <h:column></h:column> Added: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Added: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,5 @@ +<%@ 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"%> +<rich:paint2D paint="#{paint2D.paint}" data="#{paintData}" width="200" height="200" /> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,16 +5,6 @@ <f:subview id="panelSubviewID"> <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel styleClass="top"> - <f:facet name="header"> - <h:panelGroup> - <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> - </h:panelGroup> - - </f:facet> - - <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> - </rich:panel> <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> <f:facet name="header"> <h:outputText value="Header of the Panel"/> @@ -30,7 +20,7 @@ <h:panelGroup> <h:form> - <rich:panel + <rich:panel onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" style="width:200px;" headerClass="hea2" bodyClass="bo3"> @@ -78,6 +68,7 @@ This is a panel with absolute position on the screen.<br /> Resize the browser's window for fun. </f:verbatim> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:panel> <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> Added: trunk/test-applications/jsp/src/main/webapp/Panel/PanelDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/PanelDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Panel/PanelDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,11 @@ +<%@ 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"%> +<rich:panel styleClass="top"> + <f:facet name="header"> + <h:outputText value="default panel" /> + </f:facet> + + <h:outputText value="This is default panel. content here" /> +</rich:panel> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,14 +4,12 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="panelBarSubviewID"> - - <h:messages></h:messages> - <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="#{event.onclick}" onitemchange="#{event.onitemchange}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}"> <h:outputText value="Some text..."></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:panelBarItem> <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}" headerClass="#{panelBar.headerStyle}"> Added: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,12 @@ +<%@ 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"%> +<rich:panelBar> + <rich:panelBarItem> + <h:outputText value="bar item 1" /> + </rich:panelBarItem> + <rich:panelBarItem> + <h:outputText value="bar item 2" /> + </rich:panelBarItem> +</rich:panelBar> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -1,175 +1,187 @@ -<%@ 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" %> +<%@ 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="panelMenuSubviewID"> -<rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" - expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" - iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" - iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" - iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" - iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" - iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" - iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" - iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" - onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ongroupcollapse="#{event.ongroupcollapse}" ongroupexpand="#{event.ongroupexpand}" onitemhover="#{event.onitemhover}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" + expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" + iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" + iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" + iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" + iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" + iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" + iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" + iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ongroupcollapse="#{event.ongroupcollapse}" + ongroupexpand="#{event.ongroupexpand}" onitemhover="#{event.onitemhover}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> -<rich:panelMenuItem label="Item 1(Test event)" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onmouseup="#{event.onmouseup}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1(Test event)" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onmouseup="#{event.onmouseup}"></rich:panelMenuItem> -<rich:panelMenuItem><h:outputText value="select "></h:outputText> <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> - <f:selectItems value="#{richBean.listContainer}"/> -</h:selectOneMenu> -</rich:panelMenuItem> -<rich:panelMenuItem> - <jsp:include flush="true" page="${richBean.pathComponentContainer}"/> -</rich:panelMenuItem> -<rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> - <h:outputText value="Disabled Item"/> -</rich:panelMenuItem> -<rich:panelMenuItem label="Item Image"> - <h:graphicImage value="/pics/item.png"></h:graphicImage> -</rich:panelMenuItem> -<rich:panelMenuItem> - <h:outputText value="Item4"/> -</rich:panelMenuItem> -<rich:panelMenuItem label="CheckBox"> - <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> -</rich:panelMenuItem> -<rich:panelMenuItem> - <h:outputText value="CheckBox 2"></h:outputText> - <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> -</rich:panelMenuItem> -<rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputText value="select "></h:outputText> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}" /> + </h:selectOneMenu> + </rich:panelMenuItem> + <rich:panelMenuItem> + <jsp:include flush="true" page="${richBean.pathComponentContainer}" /> + </rich:panelMenuItem> + <rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> + <h:outputText value="Disabled Item" /> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item Image"> + <h:graphicImage value="/pics/item.png"></h:graphicImage> + </rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputText value="Item4" /> + </rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:panelMenuItem> + <rich:panelMenuItem label="CheckBox"> + <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> + </rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputText value="CheckBox 2"></h:outputText> + <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> + </rich:panelMenuItem> + <rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> -<rich:panelMenuGroup label="Group 1(expanded=true)" expanded="true"> - <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1(expanded=true)" expanded="true"> + <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> - <rich:panelMenuItem label="Imem 1_1"> - <h:inputText value="#{panelMenu.inputText}"></h:inputText> - </rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> + <rich:panelMenuItem label="Imem 1_1"> + <h:inputText value="#{panelMenu.inputText}"></h:inputText> + </rich:panelMenuItem> - <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1_1"> - <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_1_1"> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_1_2"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 4"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_1_2"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 4"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> - <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> + <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3"> - <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_3"> + <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group disabled" disabled="true"> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group disabled" disabled="true"> + </rich:panelMenuGroup> + </rich:panelMenuGroup> -</rich:panelMenuGroup> + </rich:panelMenuGroup> -<rich:panelMenuGroup label="Group 2 "> - <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 2 "> + <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 2_2"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 2_2"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> -</rich:panelMenuGroup> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> -<rich:panelMenuGroup label="Group 3"> - <rich:panelMenuItem label="Item 3_1"> - <f:verbatim> - <br/> - text <br/> - text <br/> + <rich:panelMenuGroup label="Group 3"> + <rich:panelMenuItem label="Item 3_1"> + <f:verbatim> + <br /> + text <br /> + text <br /> text </f:verbatim> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3_2"> - <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem> -</rich:panelMenuGroup> -</rich:panelMenu> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3_2"> + <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenu> -<f:verbatim> - <br/> - <br/> -</f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> -<h:outputText id="info" - value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> - -<f:verbatim> - <br/> -</f:verbatim> + <h:outputText id="info" + value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> +  + <f:verbatim> + <br /> + </f:verbatim> -<rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" - selectedChild="thisChild" styleClass="body"> - <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> - <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" + selectedChild="thisChild" styleClass="body"> + <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> + <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item "></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item "></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" - iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" + iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + </rich:panelMenuGroup> -  - <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> - <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> - <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item "></rich:panelMenuItem> - </rich:panelMenuGroup> +  + <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> + <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item "></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> -</rich:panelMenu> + <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> + </rich:panelMenu> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,12 @@ +<%@ 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"%> +<rich:panelMenu> + <rich:panelMenuItem label="item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="item 2"></rich:panelMenuItem> + <rich:panelMenuGroup label="gruop"> + <rich:panelMenuItem label="item 3"></rich:panelMenuItem> + <rich:panelMenuItem label="item 4"></rich:panelMenuItem> + </rich:panelMenuGroup> +</rich:panelMenu>> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -3,13 +3,16 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="pickListSubviewID"> - <rich:pickList id="pickListID" valueChangeListener="#{pickList.valueChangeListener}" - copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}" + + <rich:pickList id="pickListID" value="#{pickList.value}" showButtonsLabel="#{pickList.showButtonLabels}" valueChangeListener="#{pickList.valueChangeListener}" + controlClass="#{style.controlClass}" listClass="#{style.listClass}" style="#{style.style}" styleClass="#{style.styleClass}" + copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}" disabled="#{pickList.copyControlLabel}" dir="#{pickList.dir}" immediate="#{pickList.immediate}" listsHeight="#{pickList.listsHeight}" moveControlsVerticalAlign="#{pickList.removeAllControlLabel}" removeAllControlLabel="#{pickList.removeAllControlLabel}" removeControlLabel="#{pickList.removeControlLabel}" rendered="#{pickList.rendered}" sourceListWidth="#{pickList.sourceListWidth}" title="#{pickList.title}" - switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}" size="#{pickList.size}" + switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}" size="#{pickList.size}" + required="#{pickList.required}" requiredMessage="#{pickList.requiredMessage}" onclick="#{event.onclick}" onblur="#{event.onblur}" onchange="#{event.onchange}" ondblclick="#{event.ondblclick}" onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" @@ -19,4 +22,6 @@ <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" /> <f:selectItems value="#{pickList.data}" /> </rich:pickList> + + </f:subview> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/PickList/PickListDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PickList/PickListDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/PickList/PickListDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,11 @@ +<%@ 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"%> +<rich:pickList> + <f:selectItem itemValue="Item 1" itemLabel="Item 1" /> + <f:selectItem itemValue="Item 2" itemLabel="Item 2" /> + <f:selectItem itemValue="Item 3" itemLabel="Item 3" /> + <f:selectItem itemValue="Item 4" itemLabel="Item 4" /> + <f:selectItem itemValue="Item 5" itemLabel="Item 5" /> +</rich:pickList> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -3,7 +3,14 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> <f:subview id="pickListPropertySubviewID"> - <h:panelGrid columns="2"> + <h:panelGrid columns="2"> + <a4j:commandButton reRender="pickListTargenID" value="refresh target"></a4j:commandButton> + <h:dataTable id="pickListTargenID" value="#{pickList.value}" var="list" border="1"> + <h:column> + <h:outputText value="#{list}"></h:outputText> + </h:column> + </h:dataTable> + <h:outputText value="title:"></h:outputText> <h:inputText value="#{pickList.title}" onchange="submit();"></h:inputText> @@ -61,6 +68,12 @@ <h:selectBooleanCheckbox value="#{pickList.immediate}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="required:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.required}"></h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage:"></h:outputText> + <h:inputText value="#{pickList.requiredMessage}"></h:inputText> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,15 +4,16 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <f:subview id="progressBarSubviewID"> - - <rich:progressBar id="progressBarID" - style="width: 450px; height: 19px;" value="#{progressBar.value}" +<rich:panelMenu> +<rich:panelMenuItem> + <rich:progressBar id="progressBarID" value="#{progressBar.value}" + style="width: 450px; height: 19px;#{style.style};" completeClass="#{style.completeClass}" finishClass="#{style.finishClass}" initialClass="#{style.initialClass}" remainClass="#{style.remainClass}" styleClass="#{style.styleClass}" mode="#{progressBar.mode}" enabled="#{progressBar.enabled}" actionListener="#{progressBar.actionListener}" interval="#{progressBar.interval}" action="#{progressBar.action}" maxValue="#{progressBar.maxValue}" minValue="#{progressBar.minValue}" rendered="#{progressBar.rendered}" reRender="loadInfoPBID,valuePBID" - progressVar="progressVar" parameters="params:'%'" + progressVar="progressVar" parameters="params:'%'" reRenderAfterComplete="completedPBID" ignoreDupResponses="#{progressBar.ignoreDupResponses}" dualColoredLabel="#{progressBar.dualColoredLabel}" @@ -34,7 +35,10 @@ <h:outputText id="loadInfoPBID" value="[Load: #{progressBar.loadInfo}] " /> <h:graphicImage value="/pics/ajax_process.gif" /> + </rich:progressBar> + </rich:panelMenuItem> + </rich:panelMenu> <f:verbatim> <br /> </f:verbatim> @@ -43,8 +47,8 @@ <h:panelGrid columns="1"> <a4j:commandButton value="getValue" onclick="alert($('formID:progressBarSubviewID:progressBarID').component.getValue())"></a4j:commandButton> - <a4j:commandLink value="doShow" - onclick="$('formID:progressBarSubviewID:progressBarID').component.doShow(event)"></a4j:commandLink> + <a4j:commandLink value="setLabel" + onclick="$('formID:progressBarSubviewID:progressBarID').component.setLabel('setLabel work')"></a4j:commandLink> <a4j:commandLink value="disable" onclick="$('formID:progressBarSubviewID:progressBarID').component.disable();"></a4j:commandLink> <a4j:commandLink value="enable" Added: trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBarDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBarDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBarDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,8 +4,37 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="scrollableDataTableSubviewID"> + <h:panelGrid columns="6" border="1" style="font-size:12px"> + <h:outputText value="#1"></h:outputText> + <h:outputText value="#2"></h:outputText> + <h:outputText value="#3"></h:outputText> + <h:outputText value="#4"></h:outputText> + <h:outputText value="#5"></h:outputText> + <h:outputText value="#6"></h:outputText> + + <h:panelGrid columns="1" title="1"> + <h:outputText value="sortExpression"/> + <h:outputText value="sortable='true'"/> + </h:panelGrid> + <h:panelGrid columns="1" title="2"> + <h:outputText value="sortExpression"/> + <h:outputText value="sortable='false'"/> + </h:panelGrid> + <h:panelGrid columns="1" title="3"> + <h:outputText value="sortExpression"/> + </h:panelGrid> + <h:panelGrid columns="1" title="4"> + <h:outputText value="sortExpression"/> + </h:panelGrid> + <h:panelGrid columns="1" title="5"> + <h:outputText value="sortExpression"/> + </h:panelGrid> + <h:panelGrid columns="1" title="6"> + <h:outputText value=""/> + </h:panelGrid> + </h:panelGrid> <rich:scrollableDataTable id="sdt" var="sdt" rowKeyVar="key" onRowDblClick="alert('row:#{key}')" - ajaxSingle="#{scrollableDT.ajaxSingle}" + ajaxSingle="#{scrollableDT.ajaxSingle}" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" height="#{scrollableDT.height}" hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" @@ -13,13 +42,13 @@ first="#{scrollableDT.first}" ignoreDupResponses="#{scrollableDT.ignoreDupResponses}" bypassUpdates="#{scrollableDT.bypassUpdates}" rendered="#{scrollableDT.rendered}" limitToList="#{scrollableDT.limitToList}" - timeout="#{scrollableDT.timeout}" - selection="#{scrollableDT.selection}" + timeout="#{scrollableDT.timeout}" sortMode="#{scrollableDT.sortMode}" + selection="#{scrollableDT.selection}" eventsQueue="myEventsQueue" + captionClass="#{style.captionClass}" columnClasses="#{style.columnClasses}" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" activeClass="#{style.activeClass}" styleClass="#{style.styleClass}" style="#{style.style}" selectedClass="#{style.selectedClass}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onRowClick="#{event.onRowClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseUp="#{event.onRowMouseUp}" onselectionchange="#{event.onselectionchange}"> <f:facet name="header"> <h:outputText value="facet header"></h:outputText> </f:facet> - <rich:column sortExpression="#{sdt.int0}" sortable="true"> <f:facet name="header"><h:outputText value="#"/></f:facet> <h:outputText value="#{sdt.int0}"></h:outputText> @@ -56,6 +85,16 @@ <f:facet name="footer"><h:outputText value="Select"></h:outputText> </f:facet> </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Link"></h:outputText> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + <f:facet name="footer"> + <h:outputText value="Link"></h:outputText> + </f:facet> + </rich:column> + <f:facet name="footer"> <h:outputText value="facet footer"></h:outputText> </f:facet> Added: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,53 +4,59 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="scrollableDataTablePropertySubviewID"> - <h:panelGrid columns="2"> - <h:outputText value="length:"></h:outputText> - <h:inputText value="#{scrollableDT.dataLength}" onchange="submit();"> - </h:inputText> - - <h:outputText value="rows:" /> - <h:inputText value="#{scrollableDT.rows}" onchange="submit();"> - </h:inputText> - - <h:outputText value="first:"></h:outputText> - <h:inputText value="#{scrollableDT.first}" onchange="submit();"> - </h:inputText> - - <h:outputText value="timeout"></h:outputText> - <h:inputText value="#{scrollableDT.timeout}" onchange="submit();"> - </h:inputText> - - <h:outputText value="width:" /> - <h:inputText value="#{scrollableDT.width}" onchange="submit();"> - </h:inputText> - - <h:outputText value="height:"></h:outputText> - <h:inputText value="#{scrollableDT.height}" onchange="submit();"> - </h:inputText> - - <h:outputText value="frozenColCount"></h:outputText> - <h:inputText value="#{scrollableDT.frozenColCount}" onchange="submit();"> - </h:inputText> - - <h:outputText value="limitToList"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.limitToList}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="bypassUpdates:"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.bypassUpdates}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="ajaxSingle:"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.rendered}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="hideWhenScrolling:" /> - <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" onchange="submit();"> - </h:selectBooleanCheckbox> - </h:panelGrid> - <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> + <h:panelGrid columns="2"> + <h:outputText value="length:"></h:outputText> + <h:inputText value="#{scrollableDT.dataLength}" onchange="submit();"> + </h:inputText> + + <h:outputText value="rows:" /> + <h:inputText value="#{scrollableDT.rows}" onchange="submit();"> + </h:inputText> + + <h:outputText value="first:"></h:outputText> + <h:inputText value="#{scrollableDT.first}" onchange="submit();"> + </h:inputText> + + <h:outputText value="timeout"></h:outputText> + <h:inputText value="#{scrollableDT.timeout}" onchange="submit();"> + </h:inputText> + + <h:outputText value="width:" /> + <h:inputText value="#{scrollableDT.width}" onchange="submit();"> + </h:inputText> + + <h:outputText value="height:"></h:outputText> + <h:inputText value="#{scrollableDT.height}" onchange="submit();"> + </h:inputText> + + <h:outputText value="frozenColCount"></h:outputText> + <h:inputText value="#{scrollableDT.frozenColCount}" onchange="submit();"> + </h:inputText> + + <h:outputText value="limitToList"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.limitToList}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="bypassUpdates:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.bypassUpdates}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="ajaxSingle:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.rendered}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="hideWhenScrolling:" /> + <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="sortMode" /> + <h:selectOneRadio value="#{sortingAndFiltering.sortMode}" onchange="submit();"> + <f:selectItem itemLabel="single" itemValue="single" /> + <f:selectItem itemLabel="multy" itemValue="multy" /> + </h:selectOneRadio> + </h:panelGrid> + <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -6,7 +6,8 @@ <f:subview id="separatorSubviewID"> <h:outputText value="Some text one..." styleClass="text"></h:outputText> <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" - title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" + title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" + style="#{style.style}" styleClass="#{style.styleClass}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> Added: trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,6 @@ +<%@ 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"%> + +<rich:separator width="150" height="10"></rich:separator> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -18,9 +18,10 @@ </h:selectOneMenu> <jsp:include flush="true" page="${richBean.pathComponentContainer}"/> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}" width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" - onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown} onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + style="#{style.style}" styleClass="#{style.styleClass}" + oncollapse="#{event.oncollapse}" onbeforedomupdate="#{event.onbeforedomupdate}" onexpand="#{event.onexpand}" opened="#{event.opened}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="closeMarker"> <h:outputText value="Close It"/> </f:facet> @@ -35,16 +36,17 @@ Some text... Some text... Some text... Some text... 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:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" + <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}" height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" - opened="false" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown} onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + opened="false" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" - focus="#{simpleTogglePanel.focus}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown} onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}" + focus="#{simpleTogglePanel.focus}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> </f:facet> @@ -65,6 +67,10 @@ </h:panelGrid> </rich:simpleTogglePanel> </rich:simpleTogglePanel> - + <h:panelGrid id="simpleTogglePanelActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="simpleTogglePanelActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{simpleTogglePanel.action}" /> + <h:outputText value="#{simpleTogglePanel.actionListener}" /> + </h:panelGrid> <rich:spacer height="20px"></rich:spacer> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,14 @@ +<%@ 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"%> + <rich:simpleTogglePanel switchType="client"> + <f:facet name="closeMarker"> + <h:outputText value="Close it"/> + </f:facet> + + <f:facet name="openMarker"> + <h:outputText value="Open it"/> + </f:facet> + <h:outputText value="default simpleTogglePanel" /> + </rich:simpleTogglePanel> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,177 @@ +<%@ 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"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<f:subview id="sortingAndFilteringSubviewID"> + <h:panelGrid columns="9" border="1" style="font-size:12px"> + <h:outputText value="#1"></h:outputText> + <h:outputText value="#2"></h:outputText> + <h:outputText value="#3"></h:outputText> + <h:outputText value="#4"></h:outputText> + <h:outputText value="#5"></h:outputText> + <h:outputText value="#6"></h:outputText> + <h:outputText value="#7"></h:outputText> + <h:outputText value="#8"></h:outputText> + <h:outputText value="#9"></h:outputText> + <h:panelGrid columns="1" title="1"> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> + <h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText> + <h:outputText value="filterBy"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="2"> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> + <h:outputText value="filterBy"></h:outputText> + <h:outputText value="filterEvent='ondblclick'" /> + </h:panelGrid> + <h:panelGrid columns="1" title="3"> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText> + <h:outputText value="filterMethod" /> + </h:panelGrid> + <h:panelGrid columns="1" title="4"> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="5"> + <h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText> + <h:outputText value="comparator: sort by length" /> + </h:panelGrid> + <h:panelGrid columns="1" title="6"> + <h:outputText value=" filterExpression='data > filterValue"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="7"> + <h:outputText value="filterValue='/pics/error.gif'"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="8"> + <h:outputText value="filterBy" /> + </h:panelGrid> + <h:panelGrid columns="1" title="9"> + <h:outputText value="sortBy"></h:outputText> + </h:panelGrid> + </h:panelGrid> + <rich:dataTable id="dataTableSAFID" value="#{sortingAndFiltering.data}" var="data"> + <rich:column sortBy="#{data.int0}" selfSorted="#{sortingAndFiltering.selfSorted}" sortOrder="#{sortingAndFiltering.sortOrder}" + filterBy="#{data.int0}"> + <f:facet name="header"> + <h:outputText value="#1" /> + </f:facet> + <h:outputText value="#{data.int0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#1" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.int1}" sortBy="#{data.int1}" selfSorted="#{sortingAndFiltering.selfSorted}" + filterEvent="ondblclick"> + <f:facet name="header"> + <h:outputText value="#2" /> + </f:facet> + <h:outputText value="#{data.int1}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#2" /> + </f:facet> + </rich:column> + <rich:column sortBy="#{data.str0}" sortOrder="#{sortingAndFiltering.sortOrder}" + filterMethod="#{sortingAndFiltering.filterMethod}"> + <f:facet name="header"> + <h:outputText value="#3" /> + </f:facet> + <h:outputText value="#{data.str0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#3" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.int2}" selfSorted="#{sortingAndFiltering.selfSorted}"> + <f:facet name="header"> + <h:outputText value="#4" /> + </f:facet> + <h:outputText value="#{data.int2}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#4" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.str1}" sortOrder="#{sortingAndFiltering.sortOrder}" comparator="#{sortingAndFiltering.comparator}"> + <f:facet name="header"> + <h:outputText value="#5" /> + </f:facet> + <h:outputText value="#{data.str1}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#5" /> + </f:facet> + </rich:column> + <rich:column filterExpression="#{data.int3 > sortingAndFiltering.filterValue}"> + <f:facet name="header"> + <h:outputText value="#6" /> + </f:facet> + <h:outputText value="#{data.int3}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#6" /> + </f:facet> + </rich:column> + <rich:column filterValue="/pics/error.gif"> + <f:facet name="header"> + <h:outputText value="#7" /> + </f:facet> + <h:graphicImage value="#{data.str2}"></h:graphicImage> + <h:outputText value="#{data.str2}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#7" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.str3}"> + <f:facet name="header"> + <h:outputText value="#8" /> + </f:facet> + <h:commandButton value="#{data.str3}"></h:commandButton> + <f:facet name="footer"> + <h:outputText value="#8" /> + </f:facet> + </rich:column> + <rich:column sortBy="#{data.bool0}"> + <f:facet name="header"> + <h:outputText value="#9" /> + </f:facet> + <h:selectBooleanCheckbox value="#{data.bool0}"></h:selectBooleanCheckbox> + <f:facet name="footer"> + <h:outputText value="#9" /> + </f:facet> + </rich:column> + </rich:dataTable> + + <rich:dataTable id="dataTableFilterValueID" value="#{sortingAndFiltering.data}" var="data"> + <rich:column filterValue="/pics/error.gif"> + <f:facet name="header"> + <h:outputText value="#7(filterValue='/pics/error.gif)'" /> + </f:facet> + <h:graphicImage value="#{data.str2}"></h:graphicImage> + <h:outputText value=" [#{data.str2}]"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#7" /> + </f:facet> + </rich:column> + </rich:dataTable> + + <h:panelGrid columns="2"> + <h:outputText value="filterMethod (#3):"></h:outputText> + <h:inputText value="#{sortingAndFiltering.filterInput}" onchange="submit();" /> + + <h:outputText value="filterValue (#6):"></h:outputText> + <h:inputText value="#{sortingAndFiltering.filterValue}" onchange="submit();" /> + + <h:outputText value="sortMode" /> + <h:selectOneRadio value="#{sortingAndFiltering.sortMode}" onchange="submit();"> + <f:selectItem itemLabel="single" itemValue="single" /> + <f:selectItem itemLabel="multy" itemValue="multy" /> + </h:selectOneRadio> + + <h:outputText value="selfSorted" /> + <h:selectBooleanCheckbox value="#{sortingAndFiltering.selfSorted}" onchange="submit();" /> + + <h:outputText value="sortOrder" /> + <h:selectOneRadio value="#{sortingAndFiltering.currentSortOrder}" onchange="submit();"> + <f:selectItem itemLabel="DESCENDING" itemValue="DESCENDING" /> + <f:selectItem itemLabel="UNSORTED" itemValue="UNSORTED" /> + <f:selectItem itemLabel="ASCENDING" itemValue="ASCENDING" /> + </h:selectOneRadio> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -14,13 +14,10 @@ } </style> <h:outputText value="Some text one..." styleClass="text"></h:outputText> + <rich:spacer id="spacerId" title="#{spacer.title}" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" - styleClass="#{spacer.style}" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> + styleClass="#{spacer.style}" style="#{style.style}" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,5 @@ +<%@ 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"%> +<rich:spacer width="100" height="50" style="background-color: red"></rich:spacer> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -4,29 +4,28 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="spacerPropertySubviewID"> - <rich:simpleTogglePanel id="spacerPropertyID" switchType="client" opened="true" label="spacer property"> - <h:panelGrid columns="2"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{spacer.width}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> + <h:panelGrid columns="2"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{spacer.width}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{spacer.height}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> - - <h:outputText value="title:"></h:outputText> - <h:inputText value="#{spacer.title}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{spacer.height}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> + <h:outputText value="title:"></h:outputText> + <h:inputText value="#{spacer.title}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> - <h:outputText value="Style" /> - <a4j:commandButton id="btn" action="#{spacer.doStyle}" value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> - </h:panelGrid> - </rich:simpleTogglePanel> + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Style" /> + <a4j:commandButton id="btn" action="#{spacer.doStyle}" + value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -12,11 +12,12 @@ <rich:suggestionbox id="suggestionBoxId" eventsQueue="myEventsQueue" ajaxSingle="#{sb.ajaxSingle}" dir="#{sb.dir}" rendered="#{sb.rendered}" requestDelay="#{sb.requestDelay}" selfRendered="#{sb.selfRendered}" value="#{sb.value}" for="text" var="result" fetchValue="#{result.text}" suggestionAction="#{sb.autocomplete}" width="#{sb.width}" height="#{sb.height}" - border="#{sb.border}" zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" cellpadding="#{sb.cellpadding}" + border="#{sb.border}" zindex="#{sb.zindex}" rules="#{sb.rules}" cellpadding="#{sb.cellpadding}" cellspacing="#{sb.cellspacing}" first="#{sb.first}" minChars="#{sb.minchars}" tokens="#{sb.tokens}" bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}" shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="nothingLabel work! " - oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}"> + entryClass="#{style.entryClass}" popupClass="#{style.popupClass}" popupStyle="#{style.popupStyle}" style="#{style.style}" styleClass="#{style.styleClass}" selectedClass="#{style.selectedClass}" rowClasses="#{style.rowClasses}" + oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}"> <h:column> <h:outputText value="#{result.city}" /> </h:column> @@ -26,7 +27,9 @@ <h:column> <h:outputText value="#{result.flag}" /> </h:column> - + <h:column> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </h:column> </rich:suggestionbox> <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Modified: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,6 +5,7 @@ <f:subview id="tabPanelSubviewID"> <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" + contentStyle="#{style.contentStyle}" headerClass="#{style.headerClass}" style="#{style.style}" styleClass="#{style.styleClass}" tabClass="#{style.tabClass}" height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" @@ -13,6 +14,7 @@ <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" ontableave="#{event.ontableave}"> <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:tab> <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" ontableave="#{event.ontableave}"> Added: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,11 @@ +<%@ 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"%> +<rich:tabPanel> + <rich:tab label="tab1"> + <h:outputText value="tab 1" /> + </rich:tab> + <rich:tab label="tab2"> + </rich:tab> +</rich:tabPanel> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,140 +5,147 @@ <f:subview id="togglePanelSubviewID"> - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px!important;" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:facet name="blank"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID: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" styleClass="#{style.styleClass}" style="width:300px!important;#{style.style};" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> + <f:facet name="blank"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID: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 style="overflow: auto"> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID: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> + <f:facet name="asus"> + <rich:panel style="overflow: auto"> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID: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 /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: NVIDIA GeForce Go 7300<br /> Drive: DVD- RW DL<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> - </rich:togglePanel> + </f:verbatim> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </h:panelGroup> + </h:panelGrid> + </rich:panel> + </f:facet> + </rich:togglePanel> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <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="togglePanelSubviewID: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> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> + <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="togglePanelSubviewID: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 /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: NVIDIA GeForce Go 7300<br /> Drive: DVD- RW DL<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> + </f:verbatim> + </h:panelGroup> + </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="togglePanelSubviewID: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> + <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="togglePanelSubviewID: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 /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: ATI Mobility Radeon X 200<br /> Drive: DVD- RW D<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> + </f:verbatim> + </h:panelGroup> + </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="togglePanelSubviewID: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> + <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="togglePanelSubviewID: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 /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: Intel Graphics Media 950<br /> Drive: DVD- RW DL<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> - </rich:togglePanel> + </f:verbatim> + </h:panelGroup> + </h:panelGrid> + </rich:panel> + </f:facet> + </rich:togglePanel> - <ui:debug hotkey="L"></ui:debug> + <ui:debug hotkey="L"></ui:debug> </f:subview> Added: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -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"%> + <rich:togglePanel switchType="client" stateOrder="closed,tip1"> + + <f:facet name="closed"> + <rich:toggleControl> + <h:graphicImage style="border-width:0" value="/pics/ajax_process.gif" /> + </rich:toggleControl> + </f:facet> + + <f:facet name="tip1"> + <rich:toggleControl> + <h:graphicImage style="border-width:0" value="/pics/ajax_stoped.gif" /> + </rich:toggleControl> + </f:facet> + </rich:togglePanel> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -11,7 +11,7 @@ itemSeparator="#{toolBar.itemSeparator}" contentClass="#{toolBar.contentStyle}" separatorClass="#{toolBar.separatorStyle}" - contentStyle="contentStyle" style="style" styleClass="styleClass"> + contentStyle="contentStyle" style="#{style.style}" styleClass="#{style.styleClass}"> <h:outputText value="ToolBar" style="font-style: italic"></h:outputText> <rich:toolBarGroup> Added: trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,8 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<rich:toolBar> +<h:outputText value="File" /> +<h:outputText value="Edit" /> +</rich:toolBar> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -6,12 +6,6 @@ <f:subview id="tooltipSubviewID"> <h:messages></h:messages> - <h:outputText value="DEFAULT VALUE:"></h:outputText> - - <f:verbatim> - <br/> - </f:verbatim> - <h:inputText value="Text" id="inp1" size="50"> <rich:toolTip id="toolTipID" value="toolTip for input text" > <f:facet name="defaultContent"> @@ -46,12 +40,13 @@ </f:verbatim> <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" event="#{tooltip.event}" + <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" styleClass="#{style.styleClass}" style="#{style.style}" hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" - direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" - onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}"> + direction="#{tooltip.direction}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" + event="#{tooltip.event}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}"> <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:toolTip> </rich:panel> Added: trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,8 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<h:outputText value="Default tooltip!"> + <rich:toolTip value="tooltip"></rich:toolTip> +</h:outputText> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -8,7 +8,7 @@ <h:messages /> </a4j:outputPanel> - <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" + <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" selectedClass="#{style.selectedClass}" styleClass="#{style.styleClass}" style="#{style.style}" highlightedClass="#{style.highlightedClass}" nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" changeExpandListener="#{bean.onExpand}" nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;" onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode" Added: trunk/test-applications/jsp/src/main/webapp/Tree/TreeDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tree/TreeDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Tree/TreeDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,4 @@ +<%@ 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"%> Added: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,5 @@ +<%@ 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"%> +<rich:virtualEarth></rich:virtualEarth> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-02-29 11:58:05 UTC (rev 6445) @@ -12,7 +12,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,! /WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml</param-value> + <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,! /WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: trunk/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -88,4 +88,5 @@ <f:verbatim><div style="position: relative"><input id="onitemhoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> <f:verbatim><div style="position: relative"><input id="ongroupexpandInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> <f:verbatim><div style="position: relative"><input id="oncontextmenuInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ongroupcollapseInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -3,5 +3,5 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="calendarSubviewID"> +<f:subview id="blankSubviewID"> </f:subview> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/pages/Blank/BlankDefault.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Blank/BlankDefault.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/pages/Blank/BlankDefault.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> + +<f:subview id="defaultSubviewID"> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -31,21 +31,17 @@ </div> <h:messages showDetail="true" showSummary="true"></h:messages> <h:panelGrid id="richGridID" columns="1" width="100%"> - <h:column rendered="#{richBean.reComponent}"> + <h:column rendered="#{option.reComponent}"> <jsp:include page="${richBean.pathComponent}"/> </h:column> - <h:column rendered="#{!richBean.reComponent}"></h:column> - - <h:column rendered="#{richBean.reStraightforward}"> + <h:column rendered="#{option.reStraightforward}"> <jsp:include page="${richBean.pathStraightforward}"/> </h:column> - <h:column rendered="#{!richBean.reStraightforward}"></h:column> - <h:column rendered="#{richBean.reProperty}"> + <h:column rendered="#{option.reProperty}"> <jsp:include page="${richBean.pathProperty}"/> </h:column> - <h:column rendered="#{!richBean.reProperty}"></h:column> </h:panelGrid> <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;"> Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-02-29 11:58:05 UTC (rev 6445) @@ -5,23 +5,30 @@ <f:subview id="richMenuSubviewID"> <h:panelGrid columns="5" border="1"> - <h:panelGrid columns="1"> + <h:panelGrid columns="2"> + <h:outputText value="h" /> + <h:outputText value="a4j" /> <h:commandButton value="submit" style="width : 85px; height : 21px;"></h:commandButton> - <a4j:commandButton value="submit[a4j]" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> + <a4j:commandButton value="submit" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> + <h:commandButton value="immediate" immediate="true" style="width : 85px; height : 21px;"></h:commandButton> + <a4j:commandButton value="immediate" immediate="true" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> </h:panelGrid> <h:panelGrid columns="1"> <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status> </h:panelGrid> <h:panelGrid columns="1"> - <h:panelGrid columns="2"> + <h:panelGrid columns="4"> + <h:outputText value="Default:" /> + <h:selectBooleanCheckbox value="#{option.reDefault}" /> + <h:outputText value="Component" /> - <h:selectBooleanCheckbox value="#{richBean.reComponent}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{option.reComponent}" onchange="submit();" /> <h:outputText value="Straightforward" /> - <h:selectBooleanCheckbox value="#{richBean.reStraightforward}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{option.reStraightforward}" onchange="submit();" /> <h:outputText value="Property" /> - <h:selectBooleanCheckbox value="#{richBean.reProperty}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{option.reProperty}" onchange="submit();" /> </h:panelGrid> </h:panelGrid> @@ -36,6 +43,7 @@ <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> <f:selectItems value="#{richBean.list}" /> + <f:param value="#{richBean.src}" name="currentComponent"/> </h:selectOneMenu> </h:panelGrid> </h:panelGrid> Modified: trunk/test-applications/jsp/src/main/webapp/styles/styles.css =================================================================== --- trunk/test-applications/jsp/src/main/webapp/styles/styles.css 2008-02-29 11:46:27 UTC (rev 6444) +++ trunk/test-applications/jsp/src/main/webapp/styles/styles.css 2008-02-29 11:58:05 UTC (rev 6445) @@ -8,7 +8,7 @@ } .rich-messages-label { - padding: 0px 10px + padding: 0px 10px; } .rich-message-marker {

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6444 - trunk/docs/userguide/en/src/main/docbook/included.

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

Author: cluts Date: 2008-02-29 06:46:27 -0500 (Fri, 29 Feb 2008) New Revision: 6444 Modified: trunk/docs/userguide/en/src/main/docbook/included/tab.xml Log: http://jira.jboss.com/jira/browse/RF-672 - corrected attributes names for tab ("ontabenter" and "ontableave" attributes) Modified: trunk/docs/userguide/en/src/main/docbook/included/tab.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2008-02-29 11:45:45 UTC (rev 6443) +++ trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2008-02-29 11:46:27 UTC (rev 6444) @@ -135,7 +135,7 @@ </listitem> </itemizedlist> <para> - Some event could be performed on the tab which has been entered/left using "ontabenter"/"ontableave" attributes. See the example below.</para> + Some event could be performed on the tab which has been entered/left using <emphasis><property>"ontabenter"</property></emphasis>/<emphasis><property>"ontableave"</property></emphasis> attributes. See the example below.</para> <para> <emphasis role="bold">Example:</emphasis>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6443 - trunk/docs/userguide/en/src/main/docbook/included.

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

Author: cluts Date: 2008-02-29 06:45:45 -0500 (Fri, 29 Feb 2008) New Revision: 6443 Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml Log: http://jira.jboss.com/jira/browse/RF-926 - corrected code for toolTip in the "Creating the Component with a Page Tag" section.Corrected code for suggestionBox. Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml 2008-02-29 11:41:39 UTC (rev 6442) +++ trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml 2008-02-29 11:45:45 UTC (rev 6443) @@ -211,9 +211,9 @@ </para> <programlisting role="XML"><![CDATA[... <rich:suggestionbox for="test" suggestionAction="#{bean.autocomplete}" var="cit"> - <facet name="nothingLabel"> + <f:facet name="nothingLabel"> <h:outputText value="Empty"/> - </facet> + </f:facet> <h:column> <h:outputText value="#{cit.text}"/> </h:column> Modified: trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml 2008-02-29 11:41:39 UTC (rev 6442) +++ trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml 2008-02-29 11:45:45 UTC (rev 6443) @@ -49,9 +49,9 @@ <emphasis role="bold">Example:</emphasis> </para> <programlisting role="XML"><![CDATA[... -<h:commandButton value="Button"> +<rich:panel> <rich:toolTip value="toolTip content"/> -</h:commandButton> +</rich:panel> ... ]]></programlisting> </section>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6442 - trunk/docs/userguide/en/src/main/docbook/included.

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

Author: msorokin Date: 2008-02-29 06:41:39 -0500 (Fri, 29 Feb 2008) New Revision: 6442 Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml Log: Just corrected an error Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2008-02-29 11:05:41 UTC (rev 6441) +++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2008-02-29 11:41:39 UTC (rev 6442) @@ -324,7 +324,9 @@ </emphasis> component contains a nodes structure defined in a bean property. The property keeps a structure of objects that implements <property>"TreeNode"</property> interface.</para> - <para><property>"TreeNode"</property> has a property + <para><emphasis role="bold"> + <property><rich:treeNode></property> + </emphasis> has a property <property>"data"</property> (see <ulink url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..." >org.richfaces.model.TreeNode</ulink>). Data contained in the property is placed in a

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6441 - in trunk/samples/progressBarDemo/src/main: webapp and 1 other directories.

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

Author: andrei_exadel Date: 2008-02-29 06:05:41 -0500 (Fri, 29 Feb 2008) New Revision: 6441 Added: trunk/samples/progressBarDemo/src/main/webapp/pages/index2.jsp Modified: trunk/samples/progressBarDemo/src/main/java/org/richfaces/samples/Bean.java trunk/samples/progressBarDemo/src/main/webapp/index.jsp Log: update demo Modified: trunk/samples/progressBarDemo/src/main/java/org/richfaces/samples/Bean.java =================================================================== --- trunk/samples/progressBarDemo/src/main/java/org/richfaces/samples/Bean.java 2008-02-29 11:05:05 UTC (rev 6440) +++ trunk/samples/progressBarDemo/src/main/java/org/richfaces/samples/Bean.java 2008-02-29 11:05:41 UTC (rev 6441) @@ -21,96 +21,154 @@ package org.richfaces.samples; - import java.util.Date; +import javax.faces.event.ActionEvent; + /** * @author $Autor$ - * + * */ public class Bean { + + private boolean enabled1 = false; + private boolean ajaxMode1; + private Integer value1 = 0; + + private boolean enabled2 = false; + private boolean ajaxMode2; + private Integer value2 = 0; + + public String action1() { + System.out.println("Bean.action()"); + return null; + } - private boolean enabled = false; - private boolean permanent = false; - private boolean determined = true; - private boolean ajaxMode; - - private Integer value = 0; + public String action2() { + System.out.println("Bean.action()"); + return null; + } - public String action () { - System.out.println("Bean.action()"); - return null; + public void listener1 (ActionEvent event) { + System.out.println("Bean.listener1"); } + public void listener2 (ActionEvent event) { + System.out.println("Bean.listener2"); + } + public String start() { - this.enabled = true; + this.enabled1 = true; + this.enabled2 = true; return null; } + + public String getDate1() { + Date date = new Date(); + return date.toLocaleString(); + } - public String getDate() { + public String getDate2() { Date date = new Date(); return date.toLocaleString(); } + /** * @return the value */ - public Integer getValue() { - //value = value.add(new BigDecimal(0.6)); - return value; + public Integer getValue1() { + // value = value.add(new BigDecimal(0.6)); + return value1; } /** - * @param value the value to set + * @param value + * the value to set */ - public void setValue(Integer value) { - this.value = value; + public void setValue1(Integer value) { + this.value1 = value; } + + public Integer getIncValue1() { + return value1++; + } - public Integer getIncValue() { - return value++; + public Integer getIncValue2() { + return value2++; } /** * @return the enabled */ - public boolean getEnabled() { - return enabled; + public boolean getEnabled1() { + return enabled1; } /** - * @param enabled the enabled to set + * @param enabled + * the enabled to set */ - public void setEnabled(boolean enabled) { - this.enabled = enabled; + public void setEnabled1(boolean enabled) { + this.enabled1 = enabled; } - public boolean isPermanent() { - return permanent; - } + public boolean isAjaxMode1() { + return ajaxMode1; + } - public void setPermanent(boolean permanent) { - this.permanent = permanent; - } + public void setAjaxMode1(boolean ajaxMode) { + this.ajaxMode1 = ajaxMode; + } - public boolean isDetermined() { - return determined; - } + public String getModeString1() { + return ajaxMode1 ? "ajax" : "client"; + } + + public String getModeString2() { + return ajaxMode2 ? "ajax" : "client"; + } - public void setDetermined(boolean determined) { - this.determined = determined; - } + /** + * @return the enabled2 + */ + public boolean isEnabled2() { + return enabled2; + } - public boolean isAjaxMode() { - return ajaxMode; - } + /** + * @param enabled2 the enabled2 to set + */ + public void setEnabled2(boolean enabled2) { + this.enabled2 = enabled2; + } - public void setAjaxMode(boolean ajaxMode) { - this.ajaxMode = ajaxMode; - } - - public String getModeString() { - return ajaxMode ? "ajax" : "client"; + /** + * @return the ajaxMode2 + */ + public boolean isAjaxMode2() { + return ajaxMode2; } - + + /** + * @param ajaxMode2 the ajaxMode2 to set + */ + public void setAjaxMode2(boolean ajaxMode2) { + this.ajaxMode2 = ajaxMode2; + } + + /** + * @return the value2 + */ + public Integer getValue2() { + return value2; + } + + /** + * @param value2 the value2 to set + */ + public void setValue2(Integer value2) { + this.value2 = value2; + } + } \ No newline at end of file Modified: trunk/samples/progressBarDemo/src/main/webapp/index.jsp =================================================================== --- trunk/samples/progressBarDemo/src/main/webapp/index.jsp 2008-02-29 11:05:05 UTC (rev 6440) +++ trunk/samples/progressBarDemo/src/main/webapp/index.jsp 2008-02-29 11:05:41 UTC (rev 6441) @@ -1,2 +1,2 @@ -<jsp:forward page="faces/pages/index.jsp"/> +<jsp:forward page="faces/pages/index2.jsp"/> Added: trunk/samples/progressBarDemo/src/main/webapp/pages/index2.jsp =================================================================== --- trunk/samples/progressBarDemo/src/main/webapp/pages/index2.jsp (rev 0) +++ trunk/samples/progressBarDemo/src/main/webapp/pages/index2.jsp 2008-02-29 11:05:41 UTC (rev 6441) @@ -0,0 +1,196 @@ +<%@ 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://labs.jboss.com/jbossrichfaces/ui/progressBar" prefix="progressBar" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/componentControl" prefix="cctrl" %> +<html> + <head> + <title></title> + <style> + body{font-size : 11px} + .complete { + background-color: green; + color: white; + } + .remain { + background-color: #FCBBCD; + } + .main { + font-size: 12px; + font-weight: bold; + } + </style> + </head> + <body> + <f:view> + + <h:form> + <h:selectOneRadio binding="#{skinBean.component}" /> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + </h:form> + <br/> + + <h:form id="_form3"> + <progressBar:progressBar value="#{bean.incValue1}" enabled="#{bean.enabled1}" id="progrs1" + interval="500" + reRender="per11" + reRenderAfterComplete="per12" + mode="#{bean.modeString1}" + progressVar="percent1" + parameters="text:'crack'" + style="width: 300px; height: 14px;" + onclick="alert('');"> + <f:facet name="initial"> + <h:outputText value="Process not started"></h:outputText> + </f:facet> + <f:facet name="complete"> + <h:outputText value="Process completed"></h:outputText> + </f:facet> + <h:outputText value="{value}%"></h:outputText> + </progressBar:progressBar> + + <progressBar:progressBar value="#{bean.incValue2}" enabled="#{bean.enabled2}" id="progrs2" + interval="1000" + reRender="per21" + reRenderAfterComplete="per22" + mode="#{bean.modeString2}" + progressVar="percent2" + parameters="text:'crack'" + style="width: 300px; height: 14px;" + actionListener="#{bean.listener2}"> + <f:facet name="initial"> + <h:outputText value="Process not started"></h:outputText> + </f:facet> + <f:facet name="complete"> + <h:outputText value="Process completed"></h:outputText> + </f:facet> + <h:outputText value="{value}%"></h:outputText> + </progressBar:progressBar> + + </h:form> + + + <table><tr><td> + + + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Progress1 value: " /> + <h:inputText value="#{bean.value1}" /> + + <h:commandButton value="Set" /> + </h:panelGrid> + + </h:form> + + <h:form id="_form1"> + + + <table><tr> + <td>ReRender:</td><td><h:outputText value="#{bean.date1}" id="per11"></h:outputText></td></tr><tr> + <td>ReRender after complete:</td><td><h:outputText value="#{bean.date1}" id="per12"></h:outputText></td> + </tr></table></h:form> + + <h:form> + Enabled: <h:selectBooleanCheckbox value="#{bean.enabled1}" id="flag"> + <a4j:support event="onclick" reRender="progrs1"></a4j:support> + </h:selectBooleanCheckbox> + + <f:verbatim><br /></f:verbatim> + + + Ajax mode: <h:selectBooleanCheckbox value="#{bean.ajaxMode1}" id="flag3"> + <a4j:support event="onclick" reRender="progrs1"></a4j:support> + </h:selectBooleanCheckbox> + <f:verbatim><br /></f:verbatim> + </h:form> + <script> + var pr = $('_form3:progrs1').component; + </script> + <input type="button" value="Get value" onclick="alert($('_form3:progrs1').component.getValue());" /><br/> + <input type="text" value="" id="percent1"/> + <input type="button" value="Set value" onclick="$('_form3:progrs1').component.setValue(document.getElementById('percent1').value);" /> + <input type="button" id="ctrlValueButton1" value="Set value by componentControl" /> + <cctrl:componentControl attachTo="ctrlValueButton1" for="progrs1" event="click" disableDefault="true" operation="setValue"> + <a4j:actionparam name="value" value="$F('percent1')" noEscape="true" /> + </cctrl:componentControl> + <br/> + + <input type="text" value="111" id="label1"/> + <input type="button" value="Set label" onclick="$('_form3:progrs1').component.setLabel(document.getElementById('label1').value);" /> + <input type="button" id="ctrlLabelButton1" value="Set label by componentControl" /> + <cctrl:componentControl attachTo="ctrlLabelButton1" for="progrs" event="click" disableDefault="true" operation="setLabel"> + <a4j:actionparam name="label" value="$F('label1')" noEscape="true" /> + </cctrl:componentControl> + <br/> + <input type="button" value="Disable" onclick="$('_form3:progrs1').component.disable();" /> + <br/> + <input type="button" value="Enable" onclick="$('_form3:progrs1').component.enable(event);" /> + <br /> + </td> + <td> + + + + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Progress value: " /> + <h:inputText value="#{bean.value2}" /> + + <h:commandButton value="Set" /> + </h:panelGrid> + + </h:form> + + <h:form id="_form2"> + + <br clear="all"/> + <table><tr> + <td>ReRender:</td><td><h:outputText value="#{bean.date2}" id="per21"></h:outputText></td></tr><tr> + <td>ReRender after complete:</td><td><h:outputText value="#{bean.date2}" id="per22"></h:outputText></td> + </tr></table></h:form> + + <h:form> + Enabled: <h:selectBooleanCheckbox value="#{bean.enabled2}" id="flag"> + <a4j:support event="onclick" reRender="progrs2"></a4j:support> + </h:selectBooleanCheckbox> + + <f:verbatim><br /></f:verbatim> + + + Ajax mode: <h:selectBooleanCheckbox value="#{bean.ajaxMode2}" id="flag3"> + <a4j:support event="onclick" reRender="progrs2"></a4j:support> + </h:selectBooleanCheckbox> + <f:verbatim><br /></f:verbatim> + </h:form> + <script> + var pr = $('_form3:progrs2').component; + </script> + <input type="button" value="Get value" onclick="alert($('_form3:progrs2').component.getValue());" /><br/> + <input type="text" value="" id="percent2"/> + <input type="button" value="Set value" onclick="$('_form3:progrs2').component.setValue(document.getElementById('percent2').value);" /> + <input type="button" id="ctrlValueButton2" value="Set value by componentControl" /> + <cctrl:componentControl attachTo="ctrlValueButton2" for="progrs2" event="click" disableDefault="true" operation="setValue"> + <a4j:actionparam name="value" value="$F('percent2')" noEscape="true" /> + </cctrl:componentControl> + <br/> + + <input type="text" value="111" id="label2"/> + <input type="button" value="Set label" onclick="$('_form3:progrs2').component.setLabel(document.getElementById('label2').value);" /> + <input type="button" id="ctrlLabelButton2" value="Set label by componentControl" /> + <cctrl:componentControl attachTo="ctrlLabelButton2" for="progrs2" event="click" disableDefault="true" operation="setLabel"> + <a4j:actionparam name="label" value="$F('label2')" noEscape="true" /> + </cctrl:componentControl> + <br/> + <input type="button" value="Disable" onclick="$('_form3:progrs2').component.disable();" /> + <br/> + <input type="button" value="Enable" onclick="$('_form3:progrs2').component.enable(event);" /> + <br /> + + </td> + </tr></table><br/> + + + </f:view> + </body> +</html>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6440 - in trunk/ui/progressBAR/src/main: java/org/richfaces/component and 1 other directories.

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

Author: andrei_exadel Date: 2008-02-29 06:05:05 -0500 (Fri, 29 Feb 2008) New Revision: 6440 Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java Log: fix problem with call of actionListener Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml =================================================================== --- trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2008-02-29 10:35:27 UTC (rev 6439) +++ trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2008-02-29 11:05:05 UTC (rev 6440) @@ -100,7 +100,12 @@ </property> <property hidden="true"> <name>actionExpression</name> - </property> + </property> + <property hidden="true"> + <name>action</name> + <classname>javax.el.MethodExpression</classname> + <description>The action method binding expression.</description> + </property> <property> <name>onsubmit</name> <classname>java.lang.String</classname> Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 10:35:27 UTC (rev 6439) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 11:05:05 UTC (rev 6440) @@ -14,6 +14,8 @@ import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; +import javax.faces.event.ActionEvent; +import javax.faces.event.ActionListener; import javax.faces.event.FacesEvent; import javax.servlet.http.HttpServletRequest; @@ -51,19 +53,25 @@ * @see org.ajax4jsf.component.AjaxActionComponent#broadcast(javax.faces.event.FacesEvent) */ public void broadcast(FacesEvent event) throws AbortProcessingException { - - if (event instanceof AjaxEvent) { - FacesContext facesContext = FacesContext.getCurrentInstance(); - AjaxContext ajaxContext = AjaxContextImpl - .getCurrentInstance(facesContext); - HttpServletRequest request = (HttpServletRequest) facesContext - .getExternalContext().getRequest(); - Map params = request.getParameterMap(); - String clientId = this.getClientId(facesContext); - if (!params.containsKey(clientId)) { - return; + FacesContext facesContext = FacesContext.getCurrentInstance(); + AjaxContext ajaxContext = AjaxContextImpl + .getCurrentInstance(facesContext); + HttpServletRequest request = (HttpServletRequest) facesContext + .getExternalContext().getRequest(); + Map params = request.getParameterMap(); + String clientId = this.getClientId(facesContext); + + if (!params.containsKey(clientId)) { + return; + } + + if (event instanceof ActionEvent) { + ActionListener listeners[] = getActionListeners(); + for (ActionListener l : listeners) { + l.processAction((ActionEvent) event); } + } else if (event instanceof AjaxEvent) { if (!params.containsKey(FORCE_PERCENT_PARAM) && params.containsKey(PERCENT_PARAM)) { @@ -87,7 +95,7 @@ } } - + /** * Returns ajax response data * Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-29 10:35:27 UTC (rev 6439) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-29 11:05:05 UTC (rev 6440) @@ -54,6 +54,7 @@ @Override protected void doDecode(FacesContext facesContext, UIComponent uiComponent) { new AjaxEvent(uiComponent).queue(); + uiComponent.queueEvent(new ActionEvent(uiComponent)); } /**

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6439 - in trunk/ui/progressBAR/src/main/java/org/richfaces: renderkit and 1 other directory.

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

Author: andrei_exadel Date: 2008-02-29 05:35:27 -0500 (Fri, 29 Feb 2008) New Revision: 6439 Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java Log: RF-2342 Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 10:08:20 UTC (rev 6438) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 10:35:27 UTC (rev 6439) @@ -39,36 +39,41 @@ public static final String COMPONENT_TYPE = "org.richfaces.ProgressBar"; public static final String COMPONENT_FAMILY = "org.richfaces.ProgressBar"; - + /** Request parameter name containing component state to render */ public static final String FORCE_PERCENT_PARAM = "forcePercent"; - - private static final String PERCENT_PARAM = "percent"; - - /* (non-Javadoc) + private static final String PERCENT_PARAM = "percent"; + + /* + * (non-Javadoc) + * * @see org.ajax4jsf.component.AjaxActionComponent#broadcast(javax.faces.event.FacesEvent) */ public void broadcast(FacesEvent event) throws AbortProcessingException { + if (event instanceof AjaxEvent) { FacesContext facesContext = FacesContext.getCurrentInstance(); AjaxContext ajaxContext = AjaxContextImpl .getCurrentInstance(facesContext); - HttpServletRequest request = (HttpServletRequest) facesContext .getExternalContext().getRequest(); Map params = request.getParameterMap(); - if (!params.containsKey(FORCE_PERCENT_PARAM) + String clientId = this.getClientId(facesContext); + + if (!params.containsKey(clientId)) { + return; + } + + if (!params.containsKey(FORCE_PERCENT_PARAM) && params.containsKey(PERCENT_PARAM)) { - Number value = getNumber(this.getAttributes().get("value")); - ajaxContext.removeRenderedArea(this.getClientId(facesContext)); - ajaxContext.setResponseData(getResponseData(value, - facesContext)); + Number value = getNumber(this.getAttributes().get("value")); + ajaxContext.removeRenderedArea(clientId); + ajaxContext + .setResponseData(getResponseData(value, facesContext)); - Object reRender = this.getAttributes().get( - "reRender"); - Set ajaxRegions = AjaxRendererUtils - .asSet(reRender); + Object reRender = this.getAttributes().get("reRender"); + Set ajaxRegions = AjaxRendererUtils.asSet(reRender); if (ajaxRegions != null) { for (Iterator iter = ajaxRegions.iterator(); iter.hasNext();) { @@ -82,7 +87,7 @@ } } - + /** * Returns ajax response data * @@ -124,6 +129,7 @@ /** * Returns context for macrosubstitution + * * @param renderer * @param percent * @return @@ -131,10 +137,14 @@ private JSLiteral getContext(AbstractProgressBarRenderer renderer, Number percent) { StringBuffer buffer = new StringBuffer("{"); - buffer.append("value:").append(ScriptUtils.toScript(percent.toString())).append(","); - buffer.append("minValue:").append(ScriptUtils.toScript(this.getAttributes().get("minValue").toString())) - .append(","); - buffer.append("maxValue:").append(ScriptUtils.toScript(this.getAttributes().get("maxValue").toString())); + buffer.append("value:") + .append(ScriptUtils.toScript(percent.toString())).append(","); + buffer.append("minValue:").append( + ScriptUtils.toScript(this.getAttributes().get("minValue") + .toString())).append(","); + buffer.append("maxValue:").append( + ScriptUtils.toScript(this.getAttributes().get("maxValue") + .toString())); String parameters = renderer.getParameters(this); if (parameters != null) { @@ -144,9 +154,10 @@ buffer.append("}"); return new JSLiteral(buffer.toString()); } - + /** * Return true if markup is simple + * * @return */ private boolean isSimple(AbstractProgressBarRenderer renderer) { @@ -154,7 +165,8 @@ } /** - * Returns label markup + * Returns label markup + * * @param context * @param renderer * @return Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-29 10:08:20 UTC (rev 6438) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-29 10:35:27 UTC (rev 6439) @@ -16,6 +16,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import javax.faces.event.ActionEvent; import javax.faces.render.RenderKit; import javax.faces.render.RenderKitFactory; import javax.servlet.http.HttpServletRequest; @@ -280,6 +281,7 @@ } Map parameters = (Map) options.get("parameters"); parameters.put("percent", "percent"); + parameters.put(clientId, clientId); // options.put("onbeforedomupdate", getOnComplete(clientId, progressBar, // context)); return options;

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2008