Author: alexsmirnov Date: 2007-10-16 20:46:23 -0400 (Tue, 16 Oct 2007) New Revision: 3415 Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic1.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic2.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic3.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic4.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic5.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic6.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic7.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic8.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml Removed: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic1.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic2.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic3.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic4.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic5.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic6.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic7.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic8.jpg branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml branches/3.1.x/ui/inputnumber-spinner/src/main/config/resources/ Modified: branches/3.1.x/release notes.txt branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/examples/clock.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml Log: Prepare release 3.1.2.GA . Merge richfaces-demo from trunk. Modified: branches/3.1.x/release notes.txt =================================================================== --- branches/3.1.x/release notes.txt 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/release notes.txt 2007-10-17 00:46:23 UTC (rev 3415) @@ -1,3 +1,25 @@ + What new in the 3.1.2 + +**Bug + + * RF-243 Action Listener isn't invoked by DEFAULT on the menuItem + * RF-913 weekDayLabels does not work + * RF-1029 Menu Item doen't work correctly + * RF-1047 UITabPanel?: if "value" is not available during RestoreView?, then ProcessDecodes? ignored for child components + * RF-1070 Panel Menu Item doesn't encodes parameters in server mode. + * RF-1072 Calendar rich:calendar is squeezed in IE when placed inside a t:panelGrid. + * RF-1075 Calendar. Mart month all cells displays "1" in day label. + * RF-1077 Scrollable Data Table : wrong scroll position after scrolling and sorting. + * RF-1090 TabPanel? tabs doesn't encodes parameters in server mode + * RF-1106 header facet provides <td> html elements instead of <th> + * RF-1109 RichFaces + Seam 2.0 : IllegalStateException? : No active conversation context + * RF-1112 3.1.2RC1: Javascript error for PanelMenuItem? + +**Improvements + + * JQuery component created. + * RF-1096 jquery: id selector expansion + Release Notes - RichFaces - Version 3.1.1 ** Bug * [RF-258] - Tab Panel prevent immediate actions calling Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2007-10-17 00:46:23 UTC (rev 3415) @@ -11,6 +11,7 @@ private String city; private String zip; private Date date; + private Date pollStartTime; private boolean pollEnabled; public UserBean() { @@ -60,7 +61,13 @@ } public Date getDate() { - return new Date(); + Date date = new Date(); + if (null==pollStartTime){ + pollStartTime = new Date(); + return date; + } + if ((date.getTime()-pollStartTime.getTime())>=60000) setPollEnabled(false); + return date; } public void setDate(Date date) { @@ -72,6 +79,7 @@ } public void setPollEnabled(boolean pollEnabled) { + if (pollEnabled) setPollStartTime(null); this.pollEnabled = pollEnabled; } @@ -98,5 +106,13 @@ public void setZip(String zip) { this.zip = zip; } + + public Date getPollStartTime() { + return pollStartTime; + } + + public void setPollStartTime(Date pollStartTime) { + this.pollStartTime = pollStartTime; + } } Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-10-17 00:46:23 UTC (rev 3415) @@ -14,7 +14,8 @@ dataGrid= richDataIterators, Data Grid, /images/ico_DataTable.gif, /images/cn_DataGrid.gif, RichFacesComponentsLibrary.html#dataGrid, jbossrichfaces/freezone/docs/tlddoc/rich/dataGrid.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataGrid.html, /richfaces/dataGrid.jsf dataList= richDataIterators, Data List, /images/ico_DataTable.gif, /images/cn_DataList.gif, RichFacesComponentsLibrary.html#dataList, jbossrichfaces/freezone/docs/tlddoc/rich/dataList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataList.html, /richfaces/dataLists.jsf dataOrderedList= richDataIterators, Data Ordered List, /images/ico_DataTable.gif, /images/cn_DataOrderedList.gif, RichFacesComponentsLibrary.html#dataOrderedList, jbossrichfaces/freezone/docs/tlddoc/rich/dataOrderedList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/taglib/DataOrderedListTag.html, /richfaces/dataLists.jsf -gmap= richMisc, Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, RichFacesComponentsLibrary.html#gmap, jbossrichfaces/freezone/docs/tlddoc/rich/gmap.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIGmap.html, /richfaces/gmap.jsf +gmap= richMisc, Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, RichFacesComponentsLibrary.html#gmap, jbossrichfaces/freezone/docs/tlddoc/rich/gmap.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIGmap.html, /richfaces/gmap.jsf +jQuery= richMisc, jQuery, /images/ico_common.gif, /images/cn_jQuery.gif, RichFacesComponentsLibrary.html#jQuery, jbossrichfaces/freezone/docs/tlddoc/rich/jQuery.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIJQuery.html, /richfaces/jQuery.jsf paint2d= richOutputs, Paint2D, /images/ico_Paint2D.gif, /images/cn_Paint2D.gif, RichFacesComponentsLibrary.html#paint2D, jbossrichfaces/freezone/docs/tlddoc/rich/paint2D.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPaint2D.html, /richfaces/paint2D.jsf toolBar= richOutputs, Tool Bar, /images/ico_ToolBar.gif, /images/cn_ToolBar.gif, RichFacesComponentsLibrary.html#toolBar, jbossrichfaces/freezone/docs/tlddoc/rich/toolBar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIToolBar.html, /richfaces/toolBar.jsf toolTip= richOutputs, ToolTip, /images/ico_panel.gif, /images/cn_ToolTip.gif, RichFacesComponentsLibrary.html#toolTip, jbossrichfaces/freezone/docs/tlddoc/rich/toolTip.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIToolTip.html, /richfaces/toolTip.jsf Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -1,52 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - - <style type="text/css"> - .pic-normal { - width: 120px; - border: 2px solid #ACBECE; - - } - .wrap1 { - width:190px; - height: 130px; - float: left; - } - </style> - - - <rich:separator lineType="solid" height="1" /> - <h:outputText value="This demo shows how to attach the mouseover/mouseout events to the - DOM objects. Hower the images below to make them enlarged." /> - - <rich:separator lineType="solid" height="1" style="padding-bottom:10px;" /> - - <a4j:outputPanel id="gallery"> - <h:graphicImage value="/richfaces/jQuery/images/pic1.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic2.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic3.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic4.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic5.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic6.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic7.jpg" /> - <h:graphicImage value="/richfaces/jQuery/images/pic8.jpg" /> - </a4j:outputPanel> - - <br style="clear:both" /> - - - <rich:jQuery selector="#gallery img" query="addClass('pic-normal')"/> - <rich:jQuery selector="#gallery img" query="wrap('&lt;div class=\'wrap1\'&gt;')" /> - <rich:jQuery selector="#gallery img" query="mouseover(function(){enlargePic(this)})"/> - <rich:jQuery selector="#gallery img" query="mouseout(function(){normalPic(this)})"/> - - <rich:jQuery name="enlargePic" timing="onJScall" query="stop().animate({width:'180px'})" /> - <rich:jQuery name="normalPic" timing="onJScall" query="stop().animate({width:'120px'})" /> - - - -</ui:composition> \ No newline at end of file Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml) =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml (rev 0) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -0,0 +1,52 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <style type="text/css"> + .pic-normal { + width: 120px; + border: 2px solid #ACBECE; + + } + .wrap1 { + width:190px; + height: 130px; + float: left; + } + </style> + + + <rich:separator lineType="solid" height="1" /> + <h:outputText value="This demo shows how to attach the mouseover/mouseout events to the + DOM objects. Hower the images below to make them enlarged." /> + + <rich:separator lineType="solid" height="1" style="padding-bottom:10px;" /> + + <a4j:outputPanel id="gallery"> + <h:graphicImage value="/richfaces/jQuery/images/pic1.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic2.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic3.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic4.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic5.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic6.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic7.jpg" /> + <h:graphicImage value="/richfaces/jQuery/images/pic8.jpg" /> + </a4j:outputPanel> + + <br style="clear:both" /> + + + <rich:jQuery selector="#gallery img" query="addClass('pic-normal')"/> + <rich:jQuery selector="#gallery img" query="wrap('&lt;div class=\'wrap1\'&gt;')" /> + <rich:jQuery selector="#gallery img" query="mouseover(function(){enlargePic(this)})"/> + <rich:jQuery selector="#gallery img" query="mouseout(function(){normalPic(this)})"/> + + <rich:jQuery name="enlargePic" timing="onJScall" query="stop().animate({width:'180px'})" /> + <rich:jQuery name="normalPic" timing="onJScall" query="stop().animate({width:'120px'})" /> + + + +</ui:composition> \ No newline at end of file Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -1,71 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - - <style type="text/css"> - .odd-row { - background-color: #ECF3FE; - } - .even-row { - background-color: #FCFFFE; - } - .active-row { - background-color: #FFEBDA; - } - - </style> - - - <rich:separator lineType="solid" height="1" /> - - <h:outputText value="This demo shows how just four rich:jQuery queries allow to - add zebra-style to the table and highlight rows under the mouse cursor." /> - - - <rich:dataTable width="483" id="carList" rows="15" - value="#{dataTableScrollerBean.allCars}" var="category"> - <f:facet name="header"> - <rich:columnGroup> - <h:column> - <h:outputText styleClass="headerText" value="Make" /> - </h:column> - <h:column> - <h:outputText styleClass="headerText" value="Model" /> - </h:column> - <h:column> - <h:outputText styleClass="headerText" value="Price" /> - </h:column> - <h:column> - <h:outputText styleClass="headerText" value="Mileage" /> - </h:column> - </rich:columnGroup> - </f:facet> - - <h:column> - <h:outputText value="#{category.make}" /> - </h:column> - <h:column> - <h:outputText value="#{category.model}" /> - </h:column> - <h:column> - <h:outputText value="#{category.price}" /> - </h:column> - <h:column> - <h:outputText value="#{category.mileage}" /> - </h:column> - - </rich:dataTable> - - <rich:jQuery selector="#carList tr:odd" query="addClass('odd-row')" /> - <rich:jQuery selector="#carList tr:even" query="addClass('even-row')" /> - <rich:jQuery selector="#carList tr" - query="mouseover(function(){jQuery(this).addClass('active-row')})"/> - <rich:jQuery selector="#carList tr" - query="mouseout(function(){jQuery(this).removeClass('active-row')})"/> - - - <rich:separator height="1" style="padding-top:10px" /> -</ui:composition> \ No newline at end of file Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml) =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml (rev 0) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/zebra.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -0,0 +1,71 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <style type="text/css"> + .odd-row { + background-color: #ECF3FE; + } + .even-row { + background-color: #FCFFFE; + } + .active-row { + background-color: #FFEBDA; + } + + </style> + + + <rich:separator lineType="solid" height="1" /> + + <h:outputText value="This demo shows how just four rich:jQuery queries allow to + add zebra-style to the table and highlight rows under the mouse cursor." /> + + + <rich:dataTable width="483" id="carList" rows="15" + value="#{dataTableScrollerBean.allCars}" var="category"> + <f:facet name="header"> + <rich:columnGroup> + <h:column> + <h:outputText styleClass="headerText" value="Make" /> + </h:column> + <h:column> + <h:outputText styleClass="headerText" value="Model" /> + </h:column> + <h:column> + <h:outputText styleClass="headerText" value="Price" /> + </h:column> + <h:column> + <h:outputText styleClass="headerText" value="Mileage" /> + </h:column> + </rich:columnGroup> + </f:facet> + + <h:column> + <h:outputText value="#{category.make}" /> + </h:column> + <h:column> + <h:outputText value="#{category.model}" /> + </h:column> + <h:column> + <h:outputText value="#{category.price}" /> + </h:column> + <h:column> + <h:outputText value="#{category.mileage}" /> + </h:column> + + </rich:dataTable> + + <rich:jQuery selector="#carList tr:odd" query="addClass('odd-row')" /> + <rich:jQuery selector="#carList tr:even" query="addClass('even-row')" /> + <rich:jQuery selector="#carList tr" + query="mouseover(function(){jQuery(this).addClass('active-row')})"/> + <rich:jQuery selector="#carList tr" + query="mouseout(function(){jQuery(this).removeClass('active-row')})"/> + + + <rich:separator height="1" style="padding-top:10px" /> +</ui:composition> \ No newline at end of file Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic1.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic1.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic1.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic2.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic2.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic2.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic3.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic3.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic3.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic4.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic4.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic4.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic5.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic5.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic5.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic6.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic6.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic6.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic7.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic7.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic7.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic8.jpg =================================================================== (Binary files differ) Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic8.jpg (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic8.jpg) =================================================================== (Binary files differ) Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -1,66 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <ui:composition template="/templates/component-sample.xhtml"> - <ui:define name="sample"> - - <p>rich:jQuery integrates jQuery javascript framework into the JavaServer - Faces application. The component allows to apply the styles and behavior - to the DOM elements dynamically, including the result of JSF components rendering. - For more information about jQuery framework and its features, - you can read <a href="http://jquery.com/">http://jquery.com</a> - </p> - <p>Integrated jQuery works without conflicts with prototype.js library that is used - widely in the RichFaces library. This means that $() function is delegated - back to the prototype.js. Use jQuery() function instead to refer to - jQuery objects if necessary. Read more about jQuery usage with other libraries - at <a href="http://docs.jquery.com/Using_jQuery_with_Other_Libraries"... - http://docs.jquery.com/Using_jQuery_with_Other_Libraries</a> - </p> - - - <div class="sample-container" > - - <ui:include src="/richfaces/jQuery/examples/zebra.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/jQuery/examples/zebra.xhtml"/> - </ui:include> - </div> - <p> - rich:jQuery can be used in two major modes: - <ul> - <li> as a once time query applied immediately or on document ready event</li> - <li> as a javascript function that can be invoked from the custom javascript</li> - </ul> - The mode is chosen with timing attribute that can have the following options: - <ul> - <li>immediate - applying the query immediately </li> - <li>onload - applying the query when the document is loaded.</li> - <li>onJScall - applying the query by invoked the javascript function defined with the name attribute</li> - </ul> - </p> - <p> - Defining "name" attribute is mandatory when timing="onJScall". - If "name" attribute is defined when timing equals to "immediate" or "onload", - the query is applied according to this value, but you still have an - opportunity to invoke it by a function name.<br/> - The selector attribute defines an object or list of objects, the query - defined with the query attribute will be applied to. - </p> - <div class="sample-container" > - - <ui:include src="/richfaces/jQuery/examples/fishEye.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/jQuery/examples/fishEye.xhtml"/> - </ui:include> - </div> - - - </ui:define> - - </ui:composition> -</html> \ No newline at end of file Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml) =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml (rev 0) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/usage.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -0,0 +1,66 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <p>rich:jQuery integrates jQuery javascript framework into the JavaServer + Faces application. The component allows to apply the styles and behavior + to the DOM elements dynamically, including the result of JSF components rendering. + For more information about jQuery framework and its features, + you can read <a href="http://jquery.com/">http://jquery.com</a> + </p> + <p>Integrated jQuery works without conflicts with prototype.js library that is used + widely in the RichFaces library. This means that $() function is delegated + back to the prototype.js. Use jQuery() function instead to refer to + jQuery objects if necessary. Read more about jQuery usage with other libraries + at <a href="http://docs.jquery.com/Using_jQuery_with_Other_Libraries"... + http://docs.jquery.com/Using_jQuery_with_Other_Libraries</a> + </p> + + + <div class="sample-container" > + + <ui:include src="/richfaces/jQuery/examples/zebra.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/jQuery/examples/zebra.xhtml"/> + </ui:include> + </div> + <p> + rich:jQuery can be used in two major modes: + <ul> + <li> as a once time query applied immediately or on document ready event</li> + <li> as a javascript function that can be invoked from the custom javascript</li> + </ul> + The mode is chosen with timing attribute that can have the following options: + <ul> + <li>immediate - applying the query immediately </li> + <li>onload - applying the query when the document is loaded.</li> + <li>onJScall - applying the query by invoked the javascript function defined with the name attribute</li> + </ul> + </p> + <p> + Defining "name" attribute is mandatory when timing="onJScall". + If "name" attribute is defined when timing equals to "immediate" or "onload", + the query is applied according to this value, but you still have an + opportunity to invoke it by a function name.<br/> + The selector attribute defines an object or list of objects, the query + defined with the query attribute will be applied to. + </p> + <div class="sample-container" > + + <ui:include src="/richfaces/jQuery/examples/fishEye.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/jQuery/examples/fishEye.xhtml"/> + </ui:include> + </div> + + + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml (from rev 3414, trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml) =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml (rev 0) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -0,0 +1,23 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - jQuery Extension</ui:define> + <ui:define name="body"> + + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + + <rich:tab label="Usage"> + <ui:include src="/richfaces/jQuery/usage.xhtml"/> + </rich:tab> + <ui:include src="/templates/include/tagInfo.xhtml"> + <ui:param name="path" value="rich/jQuery"/> + </ui:include> + </rich:tabPanel> + + </ui:define> +</ui:composition> +</html> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/examples/clock.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/examples/clock.xhtml 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/examples/clock.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -2,25 +2,29 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <rich:separator height="1"/> <a4j:region> <h:form> - <a4j:poll id="poll" interval="500" enabled="#{userBean.pollEnabled}" reRender="serverDate"/> + <a4j:poll id="poll" interval="500" enabled="#{userBean.pollEnabled}" reRender="poll,grid"/> </h:form> </a4j:region> <h:form> - <h:panelGrid columns="2" width="80%"> - <a4j:commandButton style="width:120px" id="control" - value="#{userBean.pollEnabled?'Stop':'Start'} Polling" - reRender="poll, control"> - <a4j:actionparam name="polling" value="#{!userBean.pollEnabled}" - assignTo="#{userBean.pollEnabled}"/> - </a4j:commandButton> - <h:outputText id="serverDate" style="font-size:16px" value="Server Date: #{userBean.date}"/> - </h:panelGrid> + <h:panelGrid columns="2" width="80%" id="grid"> + <h:panelGrid columns="1"> + <h:outputText value="Polling Inactive" rendered="#{not userBean.pollEnabled}"></h:outputText> + <h:outputText value="Polling Active" rendered="#{userBean.pollEnabled}"></h:outputText> + <a4j:commandButton style="width:120px" id="control" + value="#{userBean.pollEnabled?'Stop':'Start'} Polling" + reRender="poll, grid"> + <a4j:actionparam name="polling" value="#{!userBean.pollEnabled}" + assignTo="#{userBean.pollEnabled}"/> + </a4j:commandButton> + </h:panelGrid> + <h:outputText id="serverDate" style="font-size:16px" value="Server Date: #{userBean.date}"/> + </h:panelGrid> </h:form> <rich:separator height="1" style="padding-top:10px"/> </ui:composition> \ No newline at end of file Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -18,7 +18,8 @@ </p> <p>The following example shown how the date and time is updated on the page based on the data - taken from the server.</p> + taken from the server. To turn off polling, press "Stop Polling" button.</p> + <p><b>Note: </b>polling is automatically disabled in this demo after one minute of working.</p> <div class="sample-container"> 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 2007-10-16 23:56:20 UTC (rev 3414) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-10-17 00:46:23 UTC (rev 3415) @@ -12,11 +12,12 @@ <ui:insert name="title"/> </title> <link rel="STYLESHEET" type="text/css" href="${facesContext.externalContext.requestContextPath}/css/common.css"/> + <ui:include src="/templates/include/dynamic-css.xhtml" /> </head> <body> -<span style="display:none">${a4j.version}</span> + <ui:include src="/templates/include/header.xhtml" /> <table class="left_menu" cellpadding="0" cellspacing="0" border="0"> <tbody> @@ -44,35 +45,18 @@ <td width="100%" class="content_container_pdddings"> <!-- tabpanel begin --> <ui:insert name="body">Body</ui:insert> -<!-- tabpanel end --> +<!-- tabpanel end --> + <rich:spacer style="height:10px;" /> + <rich:separator style="height:1px" /> + <div style="font-size:10px;float:right">${a4j.version}</div> + <div style="font-size:10px;float:none"> + <a href="http://jboss.com/index.html?module=bb&amp;op=viewtopic&... + style="color:#000">RichFaces. Most Important Links</a> + </div> </td> </tr> </tbody> </table> - <a4j:log hotkey="M"/> + </body> </html> -<!-- -<table style="height: 100%; width: 100%"> - <tr> - <td colspan="2" style="height: 50px"> - </td> - </tr> - <tr> - <td style="width: 200px; padding:2px; vertical-align:top"> - <rich:panel style="height:95%;"> - <ui:include src="/templates/include/components-navigation.xhtml" /> - </rich:panel> - </td> - <td style="padding:2px; vertical-align:top"> - </td> - </tr> - <tr> - <td colspan="2" style="height:50px"> - <ui:include src="/templates/include/footer.xhtml" /> - </td> - </tr> -</table> -</body> -</html> ---> \ No newline at end of file