Author: nbelaevski Date: 2008-04-13 19:34:35 -0400 (Sun, 13 Apr 2008) New Revision: 7786 Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Library.java branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Song.java branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/examples/dnd.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/gmap/examples/mapUsage.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/example/playlist.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp branches/3.1.x/ui/assembly/pom.xml branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx Log: Reverted r7650 Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -1,17 +1,15 @@ package org.richfaces.datatable; -import java.util.HashSet; -import java.util.Set; - import javax.faces.component.html.HtmlInputText; import javax.faces.context.FacesContext; - import org.ajax4jsf.component.UIRepeat; +import java.util.HashSet; +import java.util.Set; public class UpdateBean { HtmlInputText priceRef; - private UIRepeat repeater; + private UIRepeat repeater=null; private Set<Integer> keys = null; /** Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -25,7 +25,7 @@ private static int DECIMALS = 1; private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_UP; - private List <DemoInventoryItem> allCars = null; + private static List <DemoInventoryItem> allCars = null; public List <DemoInventoryItem> getAllCars() { synchronized (this) { Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -12,7 +12,7 @@ private boolean popup; private String pattern; private Date selectedDate; - + private boolean showApply=true; private boolean useCustomDayLabels; public Locale getLocale() { @@ -43,7 +43,7 @@ locale = Locale.US; popup = true; - pattern = "MMM d, yyyy"; + pattern = "MMM d, yyyy, HH:mm"; } public void selectLocale(ValueChangeEvent event) { @@ -72,4 +72,12 @@ this.selectedDate = selectedDate; } + public boolean isShowApply() { + return showApply; + } + + public void setShowApply(boolean showApply) { + this.showApply = showApply; + } + } \ No newline at end of file Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -3,9 +3,12 @@ import java.util.HashMap; import java.util.Map; +import javax.faces.application.Application; +import javax.faces.context.FacesContext; + public class Environment { private Map params = new HashMap(); - + private String version; public Map getParams() { return params; } @@ -14,4 +17,8 @@ this.params = params; } + public String getVersion() { + String shortVersion = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{a4j.version}", String.class).getValue(FacesContext.getCurrentInstance().getELContext()).toString(); + return shortVersion.substring(0, shortVersion.indexOf("$Date")); + } } Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -6,7 +6,7 @@ import org.richfaces.component.UIPanelMenuItem; public class PanelMenu { - private String current; + private Object current; private boolean singleMode; public boolean isSingleMode() { return singleMode; @@ -19,11 +19,11 @@ public PanelMenu() { } - public String getCurrent() { + public Object getCurrent() { return this.current; } - public void setCurrent(String current) { + public void setCurrent(Object current) { this.current = current; } public String updateCurrent() { Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Library.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Library.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Library.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -113,7 +113,9 @@ } while (read>0); String buf = os.toString(); StringTokenizer toc1 = new StringTokenizer(buf,"\n"); + int index = 0; while (toc1.hasMoreTokens()) { + index++; String str = toc1.nextToken(); StringTokenizer toc2 = new StringTokenizer(str, "\t"); String songTitle = toc2.nextToken(); @@ -127,6 +129,7 @@ album.setYear(new Integer(albumYear)); Song song = new Song(getNextId()); song.setTitle(songTitle); + song.setTrackNumber(index); album.addSong(song); } } catch (IOException e) { @@ -162,4 +165,5 @@ walk(this, appendTo, Song.class); return appendTo; } + } Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Song.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Song.java 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Song.java 2008-04-13 23:34:35 UTC (rev 7786) @@ -19,6 +19,13 @@ public Song(long id) { this.id = id; } + + public Song(long id, int index) { + this.trackNumber=index; + this.id = id; + System.out.println(index); + } + public void addChild(Object identifier, TreeNode child) { throw new UnsupportedOperationException("Songs do not have children"); Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml 2008-04-13 23:34:35 UTC (rev 7786) @@ -5,70 +5,7 @@ <name>Montgomery</name> <timeZone>GMT-6</timeZone> </capital> - <capital> - <state>Alabama1</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama2</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama3</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama4</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama5</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama6</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama7</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama8</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama9</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama10</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama11</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Alabama12</state> - <name>Montgomery</name> - <timeZone>GMT-6</timeZone> - </capital> - - - <capital> <state>Alaska</state> <name>Juneau</name> <timeZone>GMT-9</timeZone> @@ -279,230 +216,6 @@ <timeZone>GMT-6</timeZone> </capital> <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - <capital> - <state>Texas</state> - <name>Austin</name> - <timeZone>GMT-6</timeZone> - </capital> - - - - - - - - - - - - - - - <capital> <state>Utah</state> <name>Salt Lake City</name> <timeZone>GMT-7</timeZone> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-04-13 23:34:35 UTC (rev 7786) @@ -73,7 +73,7 @@ <managed-bean> <managed-bean-name>dataTableScrollerBean</managed-bean-name> <managed-bean-class>org.richfaces.datatablescroller.DataTableScrollerBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>session</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>toggleBean</managed-bean-name> @@ -167,18 +167,18 @@ <property-class>java.lang.String</property-class> <value>Paint 2D</value> </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>treeDemoStateAdvisor</managed-bean-name> - <managed-bean-class>org.richfaces.treemodeladaptor.TreeDemoStateAdvisor</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>fileSystemBean</managed-bean-name> - <managed-bean-class>org.richfaces.treemodeladaptor.FileSystemBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> + </managed-bean> <managed-bean> + <managed-bean-name>treeDemoStateAdvisor</managed-bean-name> + <managed-bean-class>org.richfaces.treemodeladaptor.TreeDemoStateAdvisor</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>fileSystemBean</managed-bean-name> + <managed-bean-class>org.richfaces.treemodeladaptor.FileSystemBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> <managed-bean-name>simpleTreeBean</managed-bean-name> <managed-bean-class>org.richfaces.demo.tree.SimpleTreeBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> @@ -251,7 +251,7 @@ <managed-bean> <managed-bean-name>updateBean</managed-bean-name> <managed-bean-class>org.richfaces.datatable.UpdateBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>panelMenu</managed-bean-name> @@ -264,7 +264,7 @@ </managed-property> <managed-property> <property-name>singleMode</property-name> - <property-class>java.lang.Boolean</property-class> + <property-class>boolean</property-class> <value>true</value> </managed-property> </managed-bean> @@ -297,8 +297,8 @@ <from-outcome>previous</from-outcome> <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id> </navigation-case> - </navigation-rule> - <lifecycle> - <phase-listener>org.richfaces.treemodeladaptor.PostbackPhaseListener</phase-listener> - </lifecycle> + </navigation-rule> + <lifecycle> + <phase-listener>org.richfaces.treemodeladaptor.PostbackPhaseListener</phase-listener> + </lifecycle> </faces-config> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-04-13 23:34:35 UTC (rev 7786) @@ -37,16 +37,20 @@ </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.COMPRESS_STYLE</param-name> <param-value>false</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> <param-value>NEKO</param-value> </context-param> - <context-param> + <!--context-param> <param-name>org.richfaces.LoadStyleStrategy</param-name> <param-value>DEFAULT</param-value> - </context-param> + </context-param--> <context-param> <param-name>org.richfaces.LoadScriptStrategy</param-name> <param-value>DEFAULT</param-value> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -7,7 +7,10 @@ <style type="text/css"> .ecol1 { width:250px; vertical-align: top; } - .ecol2 { vertical-align: top; border-left:1px solid #CCC; } + .ecol2 { vertical-align: top; border-left:1px solid #CCC; } + .rich-calendar-tool-btn{ + font-family: Arial, Verdana; + } </style> <h:form> @@ -18,7 +21,7 @@ locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" - /> + showApplyButton="#{calendarBean.showApply}"/> </a4j:outputPanel> @@ -27,7 +30,10 @@ <h:selectBooleanCheckbox value="#{calendarBean.popup}"> <a4j:support event="onclick" reRender="calendar"/> </h:selectBooleanCheckbox> - + <h:outputText value="Apply Button:" /> + <h:selectBooleanCheckbox value="#{calendarBean.showApply}"> + <a4j:support event="onclick" reRender="calendar"/> + </h:selectBooleanCheckbox> <h:outputText value="Select Locale" /> <h:selectOneRadio value="en/US" valueChangeListener="#{calendarBean.selectLocale}"> <a4j:support event="onclick" reRender="calendar"/> @@ -40,12 +46,12 @@ <h:outputText value="Select Date Pattern:"/> <h:selectOneMenu value="#{calendarBean.pattern}"> <a4j:support event="onchange" reRender="calendar"/> - <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy"/> - <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy"/> + <f:selectItem itemLabel="d/M/yy HH:mm" itemValue="d/M/yy HH:mm"/> + <f:selectItem itemLabel="dd/M/yy hh:mm a" itemValue="dd/M/yy hh:mm a"/> <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y"/> <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy"/> </h:selectOneMenu> - + </h:panelGrid> </h:panelGrid> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -8,8 +8,8 @@ <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> - <p> - rich:calendar allows to select the date using monthly calendar elements on pages. + <p><b> + rich:calendar</b> allows to select the date using monthly calendar elements on pages. It is possible to use the component in a popup and inline code. At a popup mode Calendar is initially rendered as input for date and button on the right side to call a popup. In case of an inline mode, the monthly calendar is located on a page initially. @@ -23,9 +23,13 @@ </ui:include> </div> + <p>Calendar component allows to work with <b>time</b> also. You should just define time in pattern ( for example "<i>d/M/yy HH:mm</i>" as it's defined in this sample by default) + </p> + <p>After you choose some date, you'll be able to manage time for this date. Spinner will be called after click on the time fields to edit them.</p> + <p>Calendar could be used without "Apply" button (will be closed after date selected)</p> <p> <b>locale</b> attribute is defined as a Locale. The default value is set to the Locale of the current page. - The name of the month and week days names depend of the Locale. + The name of the month and week days depend on the Locale. </p> <p> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/examples/dnd.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/examples/dnd.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/examples/dnd.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -24,7 +24,7 @@ <h:panelGrid columnClasses="panelc" columns="4" width="100%"> - <rich:panel style="width:100px"> + <rich:panel style="width:133px"> <f:facet name="header"> <h:outputText value="Source List" /> </f:facet> @@ -32,7 +32,7 @@ var="fm" > <h:column> - <a4j:outputPanel style="border:1px solid gray;padding:2px;" + <a4j:outputPanel style="width:100px;border:1px solid gray;padding:2px" layout="block"> <rich:dragSupport dragIndicator=":indicator" dragType="#{fm.family}" dragValue="#{fm}"> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -58,4 +58,4 @@ <h:outputText style="font-weight:bold" value="#{ddmenu.current}"></h:outputText> </a4j:outputPanel> -</ui:composition> \ No newline at end of file +</ui:composition> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/gmap/examples/mapUsage.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/gmap/examples/mapUsage.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/gmap/examples/mapUsage.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -11,9 +11,8 @@ height:30px; } </style> - <h:panelGrid columns="2"> - <rich:gmap gmapVar="map" zoom="#{gmBean.zoom}" style="width:400px;height:400px" gmapKey="#{gmBean.gmapkey}" /> + <rich:gmap gmapVar="map" zoom="#{gmBean.zoom}" style="width:400px;height:400px" gmapKey="#{gmBean.gmapkey}" id="gmap"/> <h:panelGroup> <rich:tabPanel switchType="ajax" width="350" height="400"> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/example/playlist.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/example/playlist.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/example/playlist.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -12,13 +12,13 @@ <rich:orderingList value="#{library.libraryAsList}" var="lib" listHeight="300" listWidth="350"> <rich:column width="180"> <f:facet name="header"> - Song Name + <h:outputText value="Song Name"/> </f:facet> <h:outputText value="#{lib.title}"></h:outputText> </rich:column> <rich:column> <f:facet name="header"> - Artist Name + <h:outputText value="Artist Name"/> </f:facet> <h:outputText value="#{lib.album.artist.name}"></h:outputText> </rich:column> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -6,10 +6,8 @@ xmlns:rich="http://richfaces.org/rich"> <h:form id="suggestionbox_form"> - <p> - Suggestion Box will suggest you states capitals names. Comma and space could be used as suggestions separators." - </p> + Suggestion Box will suggest you should state capitals names. Comma and space could be used as suggestions separators." </p> <h:inputText value="#{capitalsBean.capital}" id="text" /> <rich:suggestionbox id="suggestionBoxId" for="text" tokens=",[" rules="#{suggestionBox.rules}" @@ -21,24 +19,12 @@ border="#{suggestionBox.border}" width="#{suggestionBox.width}" height="#{suggestionBox.height}" shadowDepth="#{suggestionBox.shadowDepth}" - cellpadding="#{suggestionBox.cellpadding}" - nothingLabel="No capitals found" columnClasses="center"> - <h:column> - <f:facet name="header"> - <h:outputText value="123"></h:outputText> - </f:facet> + cellpadding="#{suggestionBox.cellpadding}" nothingLabel="No capitals found" columnClasses="center"> + <h:column> <f:facet name="header"> <h:outputText value="123"></h:outputText> </f:facet> <h:graphicImage value="#{result.stateFlag}" /> </h:column> - <h:column> - <h:outputText value="#{result.name}" /> - </h:column> - <h:column> - <h:outputText value="#{result.state}" style="font-style:italic"/> - </h:column> - </rich:suggestionbox> - - <rich:spacer height="30px"/> - + <h:column> <h:outputText value="#{result.name}" /> </h:column> <h:column> <h:outputText value="#{result.state}" style="font-style:italic"/> </h:column> </rich:suggestionbox> + <rich:spacer height="30px"/> <h:panelGrid columns="2" border="0" > <h:outputText value="Border" /> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -12,11 +12,11 @@ <p>RichFaces Suggestion Box component adds the autocomplete capability to the existing input component such as h:inputText or - t:inputText. Use the attribute 'for', in order to pint to the necessary input component + t:inputText. Use the attribute 'for', in order to point to the necessary input component to add the autocomplete capabity to it.</p> <p>Working with Suggestion Box is similar to the h:dataTable component, but instead of the 'value' attribute it has a - suggestionAction attribute that points to the method that returns the + suggestionAction attribute that points to the method, which returns a filtered collection. The 'fetch' attribute points to the data that is inserted into the input field if a particular row is selected or clicked from the suggested list.</p> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -23,20 +23,6 @@ } </style> - <h:outputText id="text" value="abc"> - <rich:toolTip value="Test1111"> - </rich:toolTip> - </h:outputText> -<br /> -<br /> -<br /> - -<h:graphicImage value="/images/page_bg.gif" width="100" height="100" id="img"> - <rich:toolTip value="Test"> - </rich:toolTip> -</h:graphicImage> - - <h:panelGrid columns="2"> <rich:panel id="sample1" styleClass="tooltip-text"> <rich:toolTip> @@ -50,7 +36,7 @@ </p> </rich:panel> <rich:panel id="sample2" styleClass="tooltip-text"> - <rich:toolTip followMouse="true" direction="top-right" delay="500" styleClass="tooltip" style="width:250px"> + <rich:toolTip followMouse="true" direction="top-right" showDelay="500" styleClass="tooltip"> <span style="white-space:nowrap"> This tool-tip content also <strong>pre-rendered</strong> to the page.<br/> However, the look of this tool-tip is customized<br/> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -45,7 +45,7 @@ <h:outputText value="Make"/> </f:facet> <h:outputText id="make" value="#{vehicle.make}" > - <rich:toolTip direction="top-right" mode="ajax" delay="30" styleClass="tooltip" immediate="true" layout="block"> + <rich:toolTip direction="top-right" mode="ajax" showDelay="300" styleClass="tooltip" immediate="true" layout="block"> <a4j:actionparam name="key" value="#{row}" assignTo="#{toolTipData.currentVehicleIndex}" /> <h:panelGrid columns="4"> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -7,7 +7,7 @@ <ui:composition> <rich:panel styleClass="panel_menu"> -<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="550" width="100%"> +<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="600" width="100%"> <rich:panelBarItem id="ajaxSupport" label="Ajax Support"> <ui:include src="/templates/include/components-group.xhtml" > <ui:param name="components" value="#{componentNavigator.ajaxSupport}" /> @@ -58,11 +58,11 @@ <ui:param name="components" value="#{componentNavigator.richInputs}" /> </ui:include> </rich:panelBarItem> - <rich:panelBarItem id="richSelect" label="Rich Selects"> - <ui:include src="/templates/include/components-group.xhtml" > - <ui:param name="components" value="#{componentNavigator.selectComponents}" /> - </ui:include> - </rich:panelBarItem> + <rich:panelBarItem id="richSelect" label="Rich Selects"> + <ui:include src="/templates/include/components-group.xhtml" > + <ui:param name="components" value="#{componentNavigator.selectComponents}" /> + </ui:include> + </rich:panelBarItem> <rich:panelBarItem id="richMisc" label="Rich Miscellaneous"> <ui:include src="/templates/include/components-group.xhtml" > <ui:param name="components" value="#{componentNavigator.richMisc}" /> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -114,12 +114,14 @@ <f:param value="DEFAULT" name="s"/> </h:outputLink> </td> + <ui:remove> <td> <h:outputLink value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}"> Null <f:param value="NULL" name="s"/> </h:outputLink> </td> + </ui:remove> <td class="control"> <rich:toggleControl for="skin_chooser" value="&#171; less" /> </td> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2008-04-13 23:34:35 UTC (rev 7786) @@ -47,8 +47,8 @@ <ui:insert name="body">Body</ui:insert> <!-- tabpanel end --> <rich:spacer style="height:10px;" /> - <rich:separator style="height:1px" /> - <div style="float:right" class="footer-text">${a4j.version}</div> + <rich:separator style="height:1px" /> + <div style="float:right;" class="footer-text">#{environment.version}</div> <div style="float:none"> <a href="http://jboss.com/index.html?module=bb&amp;op=viewtopic&... style="color:#000; display:block" class="footer-text">RichFaces. Most Important Links</a> Modified: branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml 2008-04-13 23:34:35 UTC (rev 7786) @@ -19,10 +19,7 @@ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> -<context-param> -<param-name>org.ajax4jsf.xmlparser.ORDER</param-name> -<param-value>NONE</param-value> -</context-param> + <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> Modified: branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp =================================================================== --- branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp 2008-04-13 23:34:35 UTC (rev 7786) @@ -18,9 +18,7 @@ <body> <f:view> <h:form id="SimpleToglePanel_form"> - <h:outputText id="text" value="abc" /> - <h:selectOneRadio binding="#{skinBean.component}" /> <h:commandLink action="#{skinBean.change}" value="set skin" /> <br/><br/> Modified: branches/3.1.x/ui/assembly/pom.xml =================================================================== --- branches/3.1.x/ui/assembly/pom.xml 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/ui/assembly/pom.xml 2008-04-13 23:34:35 UTC (rev 7786) @@ -69,7 +69,7 @@ </executions> </plugin> <!-- append extracted sources , for pack with library --> - <!--plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -88,8 +88,8 @@ </configuration> </execution> </executions> - </plugin--> - <!--plugin> + </plugin> + <plugin> <groupId>net.sourceforge.maven-taglib</groupId> <artifactId>maven-taglib-plugin</artifactId> <configuration> @@ -123,8 +123,8 @@ </goals> </execution> </executions> - </plugin--> - <!--plugin> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -189,7 +189,7 @@ </configuration> </execution> </executions> - </plugin--> + </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> @@ -200,9 +200,9 @@ <descriptor> ${basedir}/src/main/assembly/richfaces.xml </descriptor> - <!--descriptor> + <descriptor> ${basedir}/src/main/assembly/src.xml - </descriptor--> + </descriptor> </descriptors> </configuration> <executions> Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2008-04-12 00:39:25 UTC (rev 7785) +++ branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2008-04-13 23:34:35 UTC (rev 7786) @@ -41,7 +41,7 @@ <u:insertFacet name="closeMarker" /> <jsp:scriptlet><![CDATA[ } else { - writer.writeText("»", null); + writer.write("&#171;"); } ]]></jsp:scriptlet> </div> @@ -53,7 +53,7 @@ <u:insertFacet name="openMarker" /> <jsp:scriptlet><![CDATA[ } else { - writer.writeText("«", null); + writer.write("&#187;"); } ]]></jsp:scriptlet> </div>