Author: ilya_shaikovsky Date: 2009-05-04 09:24:45 -0400 (Mon, 04 May 2009) New Revision: 14003 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifiableModel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/flashSampleDynamic.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml Log: descriptions added Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifiableModel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifiableModel.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifiableModel.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -8,8 +8,15 @@ <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> <p> - Descriptions + This is another sample of <b>ExtendedDataModel</b> implementation which additionally shows + how to implement <b>sorting and filtering in your model</b>. </p> + <p> + Model class should extend <b>ExtendedDataTableModel</b> and additionally implement + <b>Modifiable interface</b>. This interface defines <b>modify</b> method. This + method will be called with lists of sort and filter fields as parameters and should perform sorting and + filtering according to the fields. + </p> <div class="sample-container" > <ui:include src="/richfaces/dataTable/examples/modifiableModel.xhtml"/> @@ -19,8 +26,8 @@ </ui:include> <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/demo/extendeddatamodel/AuctionDataModel.java"/> - <ui:param name="openlabel" value="View AuctionDataModel.java Source" /> + <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/demo/modifiableModel/HibernateDataModel.java"/> + <ui:param name="openlabel" value="View HibernateDataModel.java Source" /> <ui:param name="sourcetype" value="java" /> </ui:include> </div> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -15,12 +15,12 @@ <rich:tab label="Extended Data Model" name="dataModel"> <ui:include src="/richfaces/dataTable/extended-data-model.xhtml"/> </rich:tab> + <rich:tab label="Modifiable Data Model" name="modifiableDataModel"> + <ui:include src="/richfaces/dataTable/modifiableModel.xhtml"/> + </rich:tab> <rich:tab label="Edit Table with ModalPanel" name="editDataTable"> <ui:include src="/richfaces/dataTable/editDataTable.xhtml"/> </rich:tab> - <rich:tab label="Modifiable Data Model" name="modifiableDataModel"> - <ui:include src="/richfaces/dataTable/modifiableModel.xhtml"/> - </rich:tab> <rich:tab name="info" label="Tag Information"> <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -28,6 +28,12 @@ <ui:include src="/templates/include/sourceview.xhtml"> <ui:param name="sourcepath" value="/richfaces/fileUpload/examples/fileUpload.xhtml"/> </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/demo/fileUpload/FileUploadBean.java"/> + <ui:param name="openlabel" value="View FileUploadBean.java Source" /> + <ui:param name="sourcetype" value="java" /> + </ui:include> + </div> </fieldset> <fieldset class="demo_fieldset"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/flashSampleDynamic.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/flashSampleDynamic.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/flashSampleDynamic.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -7,9 +7,6 @@ <p>SWF Movie:</p> - - <a4j:loadScript src="resource:///org/richfaces/renderkit/html/js/swfobject.js" /> - <a4j:outputPanel id="flashPanelDynamic"> <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false" session="true" Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -61,6 +61,11 @@ </ui:include> </div> </fieldset> + <p class="note"> + <b>Note for SWF sample</b>. Using scripts loading strategy different from "ALL" you should use additionally load swfObject script by using: + <i>&lt;a4j:loadScript src="resource:///org/richfaces/renderkit/html/js/swfobject.js" /&gt; </i> + </p> + </ui:define> </ui:composition>