[richfaces-svn-commits] JBoss Rich Faces SVN: r21975 - in modules/tests/metamer/trunk/application/src/main/webapp/components: a4jAjax and 58 other directories.

Author: ppitonak(a)redhat.com Date: 2011-02-28 08:57:40 -0500 (Mon, 28 Feb 2011) New Revision: 21975 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-decoration.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-insertion.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml Log: code reviewed, cleaned, header updated, unnecessary namespaces removed Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -25,18 +25,18 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - + <ui:define name="head"> <h:outputStylesheet library="css" name="a4jActionListener.css"/> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -46,7 +46,7 @@ <ui:define name="component"> <a4j:queue id="queue1" - ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" @@ -60,29 +60,29 @@ status="#{a4jQueueBean.attributes['status'].value}" timeout="#{a4jQueueBean.attributes['timeout'].value}" /> - <fieldset> - <legend>&lt;a4j:ajax event="keyup" &gt;</legend> - - <a4j:ajax event="keyup" render="output1, output2" execute="@form" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " - oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference();" onbeforedomupdate="add(#{rich:element('updates')});"> - - <div>&lt;a4j:attachQueue /&gt;</div> - - <a4j:attachQueue id="a4jAttachQueue" - ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" - name="#{a4jAttachQueueBean.attributes['name'].value}" - onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" - onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" - queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" - rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" - requestDelay="#{a4jAttachQueueBean.attributes['requestDelay'].value}" - requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" - timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> - - <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeyup="add(#{rich:element('events')}); #{rich:element('timeWatcher:grid')}.event();"/> - <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" onkeyup="add(#{rich:element('events')}); #{rich:element('timeWatcher:grid')}.event();"/> - </a4j:ajax> - + <fieldset> + <legend>&lt;a4j:ajax event="keyup" &gt;</legend> + + <a4j:ajax event="keyup" render="output1, output2" execute="@form" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference();" onbeforedomupdate="add(#{rich:element('updates')});"> + + <div>&lt;a4j:attachQueue /&gt;</div> + + <a4j:attachQueue id="a4jAttachQueue" + ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" + name="#{a4jAttachQueueBean.attributes['name'].value}" + onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" + onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" + queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" + rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" + requestDelay="#{a4jAttachQueueBean.attributes['requestDelay'].value}" + requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" + timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> + + <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeyup="add(#{rich:element('events')}); #{rich:element('timeWatcher:grid')}.event();"/> + <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" onkeyup="add(#{rich:element('events')}); #{rich:element('timeWatcher:grid')}.event();"/> + </a4j:ajax> + </fieldset> <h:panelGrid columns="2"> @@ -97,13 +97,13 @@ DOM updates count: <h:outputText value="0" id="updates" /> </h:panelGrid> - - <metamer:clientTimeWatcher id="timeWatcher" /> - + + <metamer:clientTimeWatcher id="timeWatcher" /> + </ui:define> - - + + <ui:define name="outOfTemplateAfter"> Attributes for wrapping attach queue <metamer:attributes value="#{a4jAttachQueueBean.attributes}" id="attributes" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -48,7 +48,7 @@ <div>First a4j:ajax controls clicks to h:inputText and a4j:commandButton.</div> <div>Second a4j:ajax controls valueChanges of h:inputText.</div> </metamer:testPageLink> - + <metamer:testPageLink id="namedQueue" outcome="namedQueue" value="Named Queue"> Special sample for testing referencing queue from attachQueue by name (attachQueue in this simple can contain requestDelay). </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,12 +2,11 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" - xmlns:c="http://java.sun.com/jsp/jstl/core"> + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -63,37 +62,37 @@ <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeypress="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); "> <a4j:ajax event="keypress" render="output1" execute="@form" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " onbeforedomupdate="add(#{rich:element('updates')});" oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> - - <a4j:attachQueue id="a4jAttachQueue1" - ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" - name="namedQueue" - onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" - onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" - queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" - rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" - requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" - timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> + + <a4j:attachQueue id="a4jAttachQueue1" + ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" + name="namedQueue" + onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" + onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" + queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" + rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" + requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" + timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> </a4j:ajax> </h:inputText> - + <a4j:ajax event="keypress" render="output2" execute="@form" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " - onbeforedomupdate="add(#{rich:element('updates')});" oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> - - <a4j:attachQueue id="a4jAttachQueue2" - ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" - name="namedQueue" - onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" - onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" - queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" - rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" - requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" - timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> - - <h:inputText id="input2" value="#{a4jAttachQueueBean.text1}" onkeypress="add(#{rich:element('events2')}); #{rich:element('timeWatcher:grid')}.event(2); " /> + onbeforedomupdate="add(#{rich:element('updates')});" oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> + + <a4j:attachQueue id="a4jAttachQueue2" + ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" + name="namedQueue" + onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" + onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" + queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" + rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" + requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" + timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> + + <h:inputText id="input2" value="#{a4jAttachQueueBean.text1}" onkeypress="add(#{rich:element('events2')}); #{rich:element('timeWatcher:grid')}.event(2); " /> </a4j:ajax> - - + + <h:panelGrid columns="2"> Output 1: <h:outputText id="output1" value="#{a4jAttachQueueBean.text1}" style="font-weight:bold;"/> @@ -108,7 +107,7 @@ DOM updates count: <h:outputText value="0" id="updates" /> </h:panelGrid> - + <metamer:clientTimeWatcher id="timeWatcher" events="2" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -46,7 +46,7 @@ <ui:define name="component"> <a4j:queue id="queue1" - ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" @@ -106,7 +106,7 @@ DOM updates count: <h:outputText value="0" id="updates" /> </h:panelGrid> - + <metamer:clientTimeWatcher id="timeWatcher" events="2" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -46,7 +46,7 @@ <ui:define name="component"> <a4j:queue id="queue1" - ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" @@ -60,68 +60,68 @@ status="#{a4jQueueBean.attributes['status'].value}" timeout="#{a4jQueueBean.attributes['timeout'].value}" /> - <fieldset> - <legend>&lt;a4j:ajax event='click' ... &gt;</legend> - - <a4j:ajax event="click" execute="@form" - onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " - onbeforedomupdate="add(#{rich:element('updates')});" - oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> - - <div>&lt;a4j:attachQueue id="..1" /&gt;</div> - - <a4j:attachQueue id="a4jAttachQueue1" - ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" - name="#{a4jAttachQueueBean.attributes['name'].value}" - onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" - onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" - queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" - rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" - requestDelay="#{a4jAttachQueueBean.attributes['requestDelay'].value}" - requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" - timeout="#{a4jAttachQueueBean.attributes['timeout'].value}" /> - - <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" - onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " /> - <a4j:commandButton - onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " - id="a4jCommandButton1" value="First button" /> - - <fieldset> - <legend>&lt;a4j:ajax event='valueChange' ... &gt;</legend> - - <a4j:ajax event="valueChange" render="output2" execute="@form" - onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " - onbeforedomupdate="add(#{rich:element('updates')});" - oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> - - <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" - onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " - onchange="add(#{rich:element('events2')}); #{rich:element('timeWatcher:grid')}.event(2); " /> - <a4j:commandButton - id="a4jCommandButton2" value="First button" - onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " /> - - <div>&lt;a4j:attachQueue id="..2" /&gt;</div> - - <a4j:attachQueue id="a4jAttachQueue2" - ignoreDupResponses="#{a4jAttachQueueBean.attributes2['ignoreDupResponses'].value}" - name="#{a4jAttachQueueBean.attributes2['name'].value}" - onrequestdequeue="#{a4jAttachQueueBean.attributes2['onrequestdequeue'].value}" - onrequestqueue="#{a4jAttachQueueBean.attributes2['onrequestqueue'].value}" - queueId="#{a4jAttachQueueBean.attributes2['queueId'].value}" - rendered="#{a4jAttachQueueBean.attributes2['rendered'].value}" - requestDelay="#{a4jAttachQueueBean.attributes2['requestDelay'].value}" - requestGroupingId="#{a4jAttachQueueBean.attributes2['requestGroupingId'].value}" - timeout="#{a4jAttachQueueBean.attributes2['timeout'].value}" /> - - - </a4j:ajax> - - </fieldset> - - </a4j:ajax> - + <fieldset> + <legend>&lt;a4j:ajax event='click' ... &gt;</legend> + + <a4j:ajax event="click" execute="@form" + onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " + onbeforedomupdate="add(#{rich:element('updates')});" + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> + + <div>&lt;a4j:attachQueue id="..1" /&gt;</div> + + <a4j:attachQueue id="a4jAttachQueue1" + ignoreDupResponses="#{a4jAttachQueueBean.attributes['ignoreDupResponses'].value}" + name="#{a4jAttachQueueBean.attributes['name'].value}" + onrequestdequeue="#{a4jAttachQueueBean.attributes['onrequestdequeue'].value}" + onrequestqueue="#{a4jAttachQueueBean.attributes['onrequestqueue'].value}" + queueId="#{a4jAttachQueueBean.attributes['queueId'].value}" + rendered="#{a4jAttachQueueBean.attributes['rendered'].value}" + requestDelay="#{a4jAttachQueueBean.attributes['requestDelay'].value}" + requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" + timeout="#{a4jAttachQueueBean.attributes['timeout'].value}" /> + + <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " /> + <a4j:commandButton + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " + id="a4jCommandButton1" value="First button" /> + + <fieldset> + <legend>&lt;a4j:ajax event='valueChange' ... &gt;</legend> + + <a4j:ajax event="valueChange" render="output2" execute="@form" + onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " + onbeforedomupdate="add(#{rich:element('updates')});" + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> + + <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " + onchange="add(#{rich:element('events2')}); #{rich:element('timeWatcher:grid')}.event(2); " /> + <a4j:commandButton + id="a4jCommandButton2" value="First button" + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " /> + + <div>&lt;a4j:attachQueue id="..2" /&gt;</div> + + <a4j:attachQueue id="a4jAttachQueue2" + ignoreDupResponses="#{a4jAttachQueueBean.attributes2['ignoreDupResponses'].value}" + name="#{a4jAttachQueueBean.attributes2['name'].value}" + onrequestdequeue="#{a4jAttachQueueBean.attributes2['onrequestdequeue'].value}" + onrequestqueue="#{a4jAttachQueueBean.attributes2['onrequestqueue'].value}" + queueId="#{a4jAttachQueueBean.attributes2['queueId'].value}" + rendered="#{a4jAttachQueueBean.attributes2['rendered'].value}" + requestDelay="#{a4jAttachQueueBean.attributes2['requestDelay'].value}" + requestGroupingId="#{a4jAttachQueueBean.attributes2['requestGroupingId'].value}" + timeout="#{a4jAttachQueueBean.attributes2['timeout'].value}" /> + + + </a4j:ajax> + + </fieldset> + + </a4j:ajax> + </fieldset> <h:panelGrid columns="2"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -75,4 +75,4 @@ </ui:define> </ui:composition> -</html> \ No newline at end of file +</html> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -66,12 +66,12 @@ </a4j:poll> </h:panelGroup> - <script type="text/javascript"> - //<![CDATA[ - var lastCounter = null; - //]]> - </script> - + <script type="text/javascript"> + //<![CDATA[ + var lastCounter = null; + //]]> + </script> + <h:panelGroup id="output"> <h:outputText value="Server: " /> <h:outputText id="serverDate" value="#{a4jPollBean.date}" title="#{a4jPollBean.date.time}"> @@ -83,21 +83,21 @@ <span id="counterDelta"></span> <script type="text/javascript"> //<![CDATA[ - var counterDelta = document.getElementById('counterDelta'); - document.title = lastCounter; + var counterDelta = document.getElementById('counterDelta'); + document.title = lastCounter; if (lastCounter) { - counterDelta.innerHTML = '(delta: ' + (#{a4jPollBean.counter} - lastCounter) + ')'; + counterDelta.innerHTML = '(delta: ' + (#{a4jPollBean.counter} - lastCounter) + ')'; } lastCounter = #{a4jPollBean.counter}; //]]> </script> </h:panelGroup> - + <metamer:clientTimeWatcher id="timeWatcher" reverseOrder="true" /> </ui:define> - - + + <ui:define name="outOfTemplateAfter"> <metamer:attributes value="#{a4jPollBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -7,7 +7,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,10 +28,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="dontRenderForm" value="true" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -43,9 +43,9 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - - <a4j:queue id="globalQueue" - ignoreDupResponses="#{a4jQueueBean.globalQueue.attributes['ignoreDupResponses'].value}" + + <a4j:queue id="globalQueue" + ignoreDupResponses="#{a4jQueueBean.globalQueue.attributes['ignoreDupResponses'].value}" onbeforedomupdate="#{a4jQueueBean.globalQueue.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.globalQueue.attributes['oncomplete'].value}" onerror="#{a4jQueueBean.globalQueue.attributes['onerror'].value}" @@ -57,7 +57,7 @@ requestDelay="#{a4jQueueBean.globalQueue.attributes['requestDelay'].value}" timeout="#{a4jQueueBean.globalQueue.attributes['timeout'].value}" status="#{a4jQueueBean.globalQueue.attributes['status'].value}" /> - + </ui:define> <ui:define name="component"> @@ -113,7 +113,7 @@ </h:panelGrid> <metamer:clientTimeWatcher id="timeWatcher" events="2" /> - + </h:form> </rich:panel> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,12 +2,11 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" - xmlns:c="http://java.sun.com/jsp/jstl/core"> + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="dontRenderForm" value="true" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -48,9 +47,9 @@ </ui:define> <ui:define name="component"> - + <a4j:queue id="a4jQueue" - ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" @@ -73,13 +72,13 @@ <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " render="outtext" oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); " onbeforedomupdate="add(#{rich:element('updates')});"/> </h:inputText> - + <h:outputText value="Click here:" /> <h:commandButton id="actionButton" value="Action" action="#{richBean.dummyAction}" - onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event();"> - <a4j:ajax onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " - oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); " - onbeforedomupdate="add(#{rich:element('updates')});" /> + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event();"> + <a4j:ajax onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); " + onbeforedomupdate="add(#{rich:element('updates')});" /> </h:commandButton> <h:outputText value="Repeated text:" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-decoration.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-decoration.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-decoration.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-insertion.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-insertion.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested-insertion.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -61,7 +61,7 @@ </h:commandLink> <h:outputText value=" / " /> <h:commandLink id="increaseLink" action="#{cell.increaseValueAction}" value="+"> - <a4j:ajax render="valueInput #{rich:clientId('a4jRepeatRows')}:a4jRepeatColumns:#{cellStatus.index}:valueInput #{rich:clientId('outputRows')}:#{rowStatus.index}:outputColumns:#{cellStatus.index}:output" /> + <a4j:ajax render="valueInput #{rich:clientId('a4jRepeatRows')}:a4jRepeatColumns:#{cellStatus.index}:valueInput #{rich:clientId('outputRows')}:#{rowStatus.index}:outputColumns:#{cellStatus.index}:output" /> </h:commandLink> <h:outputText value=" / " /> <h:commandLink id="decreaseLink" action="#{cell.decreaseValueAction}" value="-"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,12 +2,11 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:c="http://java.sun.com/jsp/jstl/core"> + xmlns:a4j="http://richfaces.org/a4j" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="dontRenderForm" value="true" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="status" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="status" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -50,14 +50,14 @@ <h:outputText value="Facet Error: " /> <h:inputText id="facetErrorTextInput" value="#{a4jStatusBean.facetErrorValue}" /> </h:panelGrid> - + <a4j:commandButton id="applyFacets" value="ApplyFacets" render="#{nestedComponentId}" execute="facetsSettings" /> </fieldset> </ui:define> <ui:define name="component"> - + <fieldset style="height: 3em"> <legend>status (inside form)</legend> <a4j:status id="status" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,12 +2,11 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:c="http://java.sun.com/jsp/jstl/core"> + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="dontRenderForm" value="true" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -110,17 +110,17 @@ <f:facet name="noData"> <h:outputText id="noData" value="#{richSubTableBean.facets['noData']}" style="color: red;" - rendered="#{not empty richSubTableBean.facets['noData']}"/> + rendered="#{not empty richSubTableBean.facets['noData']}"/> </f:facet> <f:facet name="header"> <h:outputText id="header" value="#{richSubTableBean.facets['header']}" - rendered="#{not empty richSubTableBean.facets['header']}" /> + rendered="#{not empty richSubTableBean.facets['header']}" /> </f:facet> <f:facet name="footer"> <h:outputText id="footer" value="#{richSubTableBean.facets['footer']}" - rendered="#{not empty richSubTableBean.facets['footer']}" /> + rendered="#{not empty richSubTableBean.facets['footer']}" /> </f:facet> <rich:column id="columnName"> @@ -141,19 +141,19 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - <a4j:ajax render="#{nestedComponentId}"> - <h:panelGrid columns="2"> - <h:outputLabel value="No Data Facet: " /> - <h:inputText id="noDataInput" value="#{richSubTableBean.facets['noData']}" /> - - <h:outputLabel value="Header Facet:" /> - <h:inputText id="headerInput" value="#{richSubTableBean.facets['header']}" /> - - <h:outputLabel value="Footer Facet:" /> - <h:inputText id="footerInput" value="#{richSubTableBean.facets['footer']}" /> - </h:panelGrid> - </a4j:ajax> - + <a4j:ajax render="#{nestedComponentId}"> + <h:panelGrid columns="2"> + <h:outputLabel value="No Data Facet: " /> + <h:inputText id="noDataInput" value="#{richSubTableBean.facets['noData']}" /> + + <h:outputLabel value="Header Facet:" /> + <h:inputText id="headerInput" value="#{richSubTableBean.facets['header']}" /> + + <h:outputLabel value="Footer Facet:" /> + <h:inputText id="footerInput" value="#{richSubTableBean.facets['footer']}" /> + </h:panelGrid> + </a4j:ajax> + <metamer:attributes value="#{richSubTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,8 +2,7 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" - xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> <!-- JBoss, Home of Professional Open Source @@ -28,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -56,21 +55,21 @@ </rich:column> <rich:column id="columnHeaderName" breakRowBefore="true"> <h:outputText id="columnHeaderNameText" value="Name" /> - <br/> - <h:outputText id="columnHeaderNameType" value="(expression contains ignore case)" /> - <br/> - <h:inputText id="columnHeaderNameInput" value="#{richSubTableBean.filtering['name']}"> - <a4j:ajax render="commonGrid" event="change"/> - </h:inputText> + <br/> + <h:outputText id="columnHeaderNameType" value="(expression contains ignore case)" /> + <br/> + <h:inputText id="columnHeaderNameInput" value="#{richSubTableBean.filtering['name']}"> + <a4j:ajax render="commonGrid" event="change"/> + </h:inputText> </rich:column> <rich:column id="columnHeaderTitle"> <h:outputText id="columnHeaderTitleText" value="Title" /> - <br/> - <h:outputText id="columnHeaderTitleType" value="(expression equals)" /> - <br/> - <h:inputText id="columnHeaderTitleInput" value="#{richSubTableBean.filtering['title']}"> - <a4j:ajax render="commonGrid" event="change"/> - </h:inputText> + <br/> + <h:outputText id="columnHeaderTitleType" value="(expression equals)" /> + <br/> + <h:inputText id="columnHeaderTitleInput" value="#{richSubTableBean.filtering['title']}"> + <a4j:ajax render="commonGrid" event="change"/> + </h:inputText> </rich:column> <rich:column id="columnHeaderBirthdate"> <h:outputText id="columnHeaderBirthdateText" value="Birthdate" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -34,7 +34,7 @@ <metamer:testPageLink id="simple" outcome="simple" value="Simple"> Page that contains a table with two <b>rich:collapsibleSubTable</b>s with defined facets (header, footer, noData) and input boxes for all its attributes. </metamer:testPageLink> - + <metamer:testPageLink id="facets" outcome="facets" value="Facets"> Simple page that contains <b>rich:collapsibleSubTable</b> (with model containing employees) and all facets for this table updateable by Ajax. </metamer:testPageLink> @@ -52,7 +52,7 @@ Page that contains a table with two <b>rich:collapsibleSubTable</b>s (with model containing employees) and input boxes for all its attributes. <span style="color: red">TODO will be used with various types of input and command components as soon as available</span> </metamer:testPageLink> - + <metamer:testPageLink id="sorting-using-column" outcome="sorting-using-column" value="Table Sorting - Column based"> <b>rich:collapsibleSubTable</b> (with model containing employees) with custom sorting by <b>rich:column</b>'s attribute @sortBy, @sortOrder. </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -46,7 +46,7 @@ </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" value="#{richSubTableBean.lists}" var="list" keepSaved="true"> <f:facet name="header"> <rich:columnGroup id="columnGroup"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -54,7 +54,7 @@ <h:outputText id="columnHeaderEmployeesText" value="Employees" /> </rich:column> <rich:column id="columnHeaderName" breakRowBefore="true"> - <a4j:commandLink id="sortByName" value="Name" render="richDataTable" action="#{richSubTableBean.sorting['columnName'].reverseOrder}" /> + <a4j:commandLink id="sortByName" value="Name" render="richDataTable" action="#{richSubTableBean.sorting['columnName'].reverseOrder}" /> </rich:column> <rich:column id="columnHeaderTitle"> <a4j:commandLink id="sortByTitle" value="Title" render="richDataTable" action="#{richSubTableBean.sorting['columnTitle'].reverseOrder}" /> @@ -71,7 +71,7 @@ </rich:column> <rich:collapsibleSubTable id="richSubTable" - binding="#{richSubTableBean.binding}" + binding="#{richSubTableBean.binding}" breakBefore="#{richSubTableBean.attributes['breakBefore'].value}" expandMode="#{richSubTableBean.attributes['expandMode'].value}" filterVar="#{richSubTableBean.attributes['filterVar'].value}" @@ -119,7 +119,7 @@ <f:convertDateTime pattern="d MMM yyyy"/> </h:outputText> </rich:column> - + </rich:collapsibleSubTable> </rich:dataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,10 +26,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -38,39 +37,39 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - <h:form id="attributes"> - <fieldset> - <h:panelGrid columns="2"> - <h:outputLabel for="sortOrderInput" value="Sort Order:" /> - <h:selectOneRadio id="sortOrderInput" value="#{richColumnBean.sortOrder}"> - <f:selectItems value="#{richColumnBean.sortOrders}" /> - <a4j:ajax render="#{nestedComponentId}" /> - </h:selectOneRadio> - </h:panelGrid> - </fieldset> - </h:form> + <h:form id="attributes"> + <fieldset> + <h:panelGrid columns="2"> + <h:outputLabel for="sortOrderInput" value="Sort Order:" /> + <h:selectOneRadio id="sortOrderInput" value="#{richColumnBean.sortOrder}"> + <f:selectItems value="#{richColumnBean.sortOrders}" /> + <a4j:ajax render="#{nestedComponentId}" /> + </h:selectOneRadio> + </h:panelGrid> + </fieldset> + </h:form> </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" rendered="true" value="#{model.capitals}" var="record"> - - <f:facet name="header"> - <rich:column> + + <f:facet name="header"> + <rich:column> Sorted by custom <tt>comparator</tt> - </rich:column> - </f:facet> - + </rich:column> + </f:facet> + <rich:column id="columnState" comparator="#{richColumnBean.stateNameLengthComparator}" sortOrder="#{richColumnBean.sortOrder}"> - <f:facet name="header">State</f:facet> + <f:facet name="header">State</f:facet> <h:outputText id="state" value="#{record.state}" /> </rich:column> <rich:column id="columnCapital"> - <f:facet name="header">Capital</f:facet> + <f:facet name="header">Capital</f:facet> <h:outputText id="capital" value="#{record.name}" /> </rich:column> </rich:dataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" - xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -38,62 +37,62 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - <fieldset> - <h:panelGrid columns="2"> - <h:outputLabel value="Filter State:" for="stateNameToFilter" /> - <h:inputText id="stateNameToFilter" value="#{richColumnBean.stateNameToFilter}"> - <a4j:ajax event="keyup" render="#{nestedPrefix}richDataTable1 #{nestedPrefix}richDataTable2" /> - </h:inputText> - </h:panelGrid> - </fieldset> - + <fieldset> + <h:panelGrid columns="2"> + <h:outputLabel value="Filter State:" for="stateNameToFilter" /> + <h:inputText id="stateNameToFilter" value="#{richColumnBean.stateNameToFilter}"> + <a4j:ajax event="keyup" render="#{nestedPrefix}richDataTable1 #{nestedPrefix}richDataTable2" /> + </h:inputText> + </h:panelGrid> + </fieldset> + </ui:define> <ui:define name="component"> - - <h:panelGrid columns="3"> - <rich:dataTable id="richDataTable1" - rendered="true" - value="#{model.capitals}" - var="record"> - - <f:facet name="header"> - <rich:column>Filter by <tt>filter</tt></rich:column> - </f:facet> - - <rich:column id="columnState1" filter="#{richColumnBean.stateNameFilter}"> - <f:facet name="header">State</f:facet> - <h:outputText id="state" value="#{record.state}" /> - </rich:column> - - <rich:column id="columnCapital1"> - <f:facet name="header">Capital</f:facet> - <h:outputText id="capital" value="#{record.name}" /> - </rich:column> - </rich:dataTable> - - <rich:dataTable id="richDataTable2" - rendered="true" - value="#{model.capitals}" - var="record"> - - <f:facet name="header"> - <rich:column>Filter by <tt>filterExpression</tt></rich:column> - </f:facet> - - <rich:column id="columnState2" filterExpression="#{fn:contains(fn:toLowerCase(record.state), fn:toLowerCase(richColumnBean.stateNameToFilter))}"> - <f:facet name="header">State</f:facet> - <h:outputText id="state" value="#{record.state}" /> - </rich:column> - - <rich:column id="columnCapital2"> - <f:facet name="header">Capital</f:facet> - <h:outputText id="capital" value="#{record.name}" /> - </rich:column> - </rich:dataTable> + + <h:panelGrid columns="3"> + <rich:dataTable id="richDataTable1" + rendered="true" + value="#{model.capitals}" + var="record"> + + <f:facet name="header"> + <rich:column>Filter by <tt>filter</tt></rich:column> + </f:facet> + + <rich:column id="columnState1" filter="#{richColumnBean.stateNameFilter}"> + <f:facet name="header">State</f:facet> + <h:outputText id="state" value="#{record.state}" /> + </rich:column> + + <rich:column id="columnCapital1"> + <f:facet name="header">Capital</f:facet> + <h:outputText id="capital" value="#{record.name}" /> + </rich:column> + </rich:dataTable> + + <rich:dataTable id="richDataTable2" + rendered="true" + value="#{model.capitals}" + var="record"> + + <f:facet name="header"> + <rich:column>Filter by <tt>filterExpression</tt></rich:column> + </f:facet> + + <rich:column id="columnState2" filterExpression="#{fn:contains(fn:toLowerCase(record.state), fn:toLowerCase(richColumnBean.stateNameToFilter))}"> + <f:facet name="header">State</f:facet> + <h:outputText id="state" value="#{record.state}" /> + </rich:column> + + <rich:column id="columnCapital2"> + <f:facet name="header">Capital</f:facet> + <h:outputText id="capital" value="#{record.name}" /> + </rich:column> + </rich:dataTable> </h:panelGrid> - - + + </ui:define> <ui:define name="outOfTemplateAfter"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -34,19 +34,19 @@ <metamer:testPageLink id="simple" outcome="simple" value="Simple"> Simple page that contains a table with two columns </metamer:testPageLink> - - <metamer:testPageLink id="comparator" outcome="comparator" value="Custom Comparator"> + + <metamer:testPageLink id="comparator" outcome="comparator" value="Custom Comparator"> Data table with first column with customized sorting (sorted by length of the state name) using <tt>Comparator&lt;?&gt;</tt> </metamer:testPageLink> - + <metamer:testPageLink id="sorting" outcome="sorting" value="Sorting"> Data table with first column with customized sorting (sorted by length of the state name) using expression </metamer:testPageLink> - + <metamer:testPageLink id="filtering" outcome="filtering" value="Filtering"> Two data tables with first column filtered by custom <tt>Filter&lt;?&gt;</tt> and by expression </metamer:testPageLink> - + </ui:define> </ui:composition> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -43,16 +43,16 @@ rows="5" var="record"> - <f:facet name="header"> - <rich:columnGroup> - <rich:column colspan="#{richColumnBean.attributes['colspan'].value}"><tt>colspan=#{richColumnBean.attributes['colspan'].value}</tt></rich:column> - <rich:column breakRowBefore="#{richColumnBean.attributes['breakRowBefore'].value}"><tt>breakBefore=#{richColumnBean.attributes['breakRowBefore'].value}</tt></rich:column> - <rich:column rowspan="#{richColumnBean.attributes['rowspan'].value}"><tt>rowspan=#{richColumnBean.attributes['rowspan'].value}</tt></rich:column> - <rich:column breakRowBefore="true">Dummy</rich:column> - <rich:column breakRowBefore="#{richColumnBean.attributes['rowspan'].value > 1}">Breaked by <tt>rowspan</tt> > 1</rich:column> - </rich:columnGroup> - </f:facet> - + <f:facet name="header"> + <rich:columnGroup> + <rich:column colspan="#{richColumnBean.attributes['colspan'].value}"><tt>colspan=#{richColumnBean.attributes['colspan'].value}</tt></rich:column> + <rich:column breakRowBefore="#{richColumnBean.attributes['breakRowBefore'].value}"><tt>breakBefore=#{richColumnBean.attributes['breakRowBefore'].value}</tt></rich:column> + <rich:column rowspan="#{richColumnBean.attributes['rowspan'].value}"><tt>rowspan=#{richColumnBean.attributes['rowspan'].value}</tt></rich:column> + <rich:column breakRowBefore="true">Dummy</rich:column> + <rich:column breakRowBefore="#{richColumnBean.attributes['rowspan'].value > 1}">Breaked by <tt>rowspan</tt> > 1</rich:column> + </rich:columnGroup> + </f:facet> + <rich:column id="columnState" comparator="#{richColumnBean.attributes['comparator'].value}" filter="#{richColumnBean.attributes['filter'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -28,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -39,39 +38,39 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - <h:form id="attributes"> - <fieldset> - <h:panelGrid columns="2"> - <h:outputLabel for="sortOrderInput" value="Sort Order:" /> - <h:selectOneRadio id="sortOrderInput" value="#{richColumnBean.sortOrder}"> - <f:selectItems value="#{richColumnBean.sortOrders}" /> - <a4j:ajax render="#{nestedComponentId}" /> - </h:selectOneRadio> - </h:panelGrid> - </fieldset> - </h:form> + <h:form id="attributes"> + <fieldset> + <h:panelGrid columns="2"> + <h:outputLabel for="sortOrderInput" value="Sort Order:" /> + <h:selectOneRadio id="sortOrderInput" value="#{richColumnBean.sortOrder}"> + <f:selectItems value="#{richColumnBean.sortOrders}" /> + <a4j:ajax render="#{nestedComponentId}" /> + </h:selectOneRadio> + </h:panelGrid> + </fieldset> + </h:form> </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" rendered="true" value="#{model.capitals}" var="record"> - + <f:facet name="header"> - <rich:column> - <tt>sortBy="\#{fn:length(record.state)}"</tt> - </rich:column> - </f:facet> - + <rich:column> + <tt>sortBy="\#{fn:length(record.state)}"</tt> + </rich:column> + </f:facet> + <rich:column id="columnState" sortBy="#{fn:length(record.state)}" sortOrder="#{richColumnBean.sortOrder}"> - <f:facet name="header">State</f:facet> + <f:facet name="header">State</f:facet> <h:outputText id="state" value="#{record.state}" /> </rich:column> <rich:column id="columnCapital"> - <f:facet name="header">Capital</f:facet> + <f:facet name="header">Capital</f:facet> <h:outputText id="capital" value="#{record.name}" /> </rich:column> </rich:dataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,11 +2,11 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich" > <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -44,16 +44,16 @@ <h:outputText value="#{record.name}" /> </rich:column> - <rich:columnGroup> - <rich:column> - <h:outputText value="#{record.title}" /> - </rich:column> - - <rich:column id="columnFavoriteColor"> - <h:outputText value="#{record.favoriteColor}" /> - </rich:column> - </rich:columnGroup> + <rich:columnGroup> + <rich:column> + <h:outputText value="#{record.title}" /> + </rich:column> + <rich:column id="columnFavoriteColor"> + <h:outputText value="#{record.favoriteColor}" /> + </rich:column> + </rich:columnGroup> + </rich:dataTable> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -41,8 +41,8 @@ <rich:dataTable id="richDataTable" rows="10" value="#{model.employees}" var="record"> <f:facet name="header"> - - + + <rich:columnGroup id="columnGroupHeader" rendered="#{richColumnGroupBean.attributes['rendered'].value}"> <rich:column id="colHeaderName" rowspan="2"> @@ -64,7 +64,7 @@ <h:outputText id="colHeaderNumberOfKidsText" value="Number of Kids" /> </rich:column> </rich:columnGroup> - + </f:facet> <rich:column id="columnName"> @@ -92,12 +92,12 @@ </rich:column> <f:facet name="footer"> - - + + <rich:columnGroup id="columnGroupFooter" rendered="#{richColumnGroupBean.attributes['rendered'].value}"> <rich:column colspan="5"> - <rich:dataScroller /> + <rich:dataScroller /> </rich:column> <rich:column id="colFooterName" rowspan="2" breakRowBefore="true"> <h:outputText id="colFooterNameText" value="Name" /> @@ -118,7 +118,7 @@ <h:outputText id="colFooterInfoText" value="Information" /> </rich:column> </rich:columnGroup> - + </f:facet> </rich:dataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -34,7 +34,7 @@ <metamer:testPageLink id="headerFooter" outcome="headerFooter" value="Header and Footer"> <b>rich:columnGroup</b> in the header and footer facets of the table </metamer:testPageLink> - + <metamer:testPageLink id="body" outcome="body" value="Body"> <b>rich:columnGroup</b> in the body of the table </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -51,7 +51,7 @@ <br/><br/> <rich:dataScroller id="scroller1" for="#{richDataScrollerBean.attributes['for'].value}" - + boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}" fastControls="#{richDataScrollerBean.attributes['fastControls'].value}" fastStep="#{richDataScrollerBean.attributes['fastStep'].value}" @@ -102,7 +102,7 @@ <f:facet name="footer"> <rich:dataScroller id="scroller2" - + boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}" fastControls="#{richDataScrollerBean.attributes['fastControls'].value}" fastStep="#{richDataScrollerBean.attributes['fastStep'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -56,7 +56,7 @@ <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.employees : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,16 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - + <ui:define name="head"> <h:outputStylesheet library="css" name="richDataTable.css"/> </ui:define> @@ -56,7 +56,7 @@ <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.employees : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" @@ -125,7 +125,7 @@ <rich:inplaceSelect id="titleInput" value="#{record.title}"> <f:selectItems value="#{model.jobTitlesSelectItems}"/> </rich:inplaceSelect> - + <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> @@ -141,7 +141,7 @@ <rich:calendar id="birthdate" value="#{record.birthdate}"> <a4j:ajax event="change" render="@this"/> </rich:calendar> - + <f:facet name="footer"> <h:outputText id="columnFooterBirthdate" value="Birthdate" /> </f:facet> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -51,11 +51,11 @@ </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.capitals : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" @@ -75,42 +75,42 @@ <f:facet name="noData"> <h:outputText id="noData" value="#{richDataTableBean.facets['noData']}" style="color: red;" - rendered="#{not empty richDataTableBean.facets['noData']}"/> + rendered="#{not empty richDataTableBean.facets['noData']}"/> </f:facet> <f:facet name="caption"> <h:outputText id="caption" value="#{richDataTableBean.facets['caption']}" - rendered="#{not empty richDataTableBean.facets['caption']}"/> + rendered="#{not empty richDataTableBean.facets['caption']}"/> </f:facet> <f:facet name="header"> <h:outputText id="header" value="#{richDataTableBean.facets['header']}" - rendered="#{not empty richDataTableBean.facets['header']}" /> + rendered="#{not empty richDataTableBean.facets['header']}" /> </f:facet> <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="#{richDataTableBean.facets['columnStateHeader']}" - rendered="#{not empty richDataTableBean.facets['columnStateHeader']}"/> + rendered="#{not empty richDataTableBean.facets['columnStateHeader']}"/> </f:facet> <h:outputText value="#{record.state}" /> <f:facet name="footer"> <h:outputText id="columnFooterState" value="#{richDataTableBean.facets['columnStateFooter']}" - rendered="#{not empty richDataTableBean.facets['columnStateFooter']}"/> + rendered="#{not empty richDataTableBean.facets['columnStateFooter']}"/> </f:facet> </rich:column> <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="#{richDataTableBean.facets['columnCapitalHeader']}" - rendered="#{not empty richDataTableBean.facets['columnCapitalHeader']}"/> + rendered="#{not empty richDataTableBean.facets['columnCapitalHeader']}"/> </f:facet> <h:outputText value="#{record.name}" /> <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="#{richDataTableBean.facets['columnCapitalFooter']}" - rendered="#{not empty richDataTableBean.facets['columnCapitalFooter']}"/> + rendered="#{not empty richDataTableBean.facets['columnCapitalFooter']}"/> </f:facet> </rich:column> @@ -118,32 +118,32 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - - <a4j:ajax render="#{nestedComponentId}"> - <h:panelGrid columns="2"> - <h:outputLabel value="No Data Facet: " /> - <h:inputText id="noDataInput" value="#{richDataTableBean.facets['noData']}" /> - - <h:outputLabel value="Caption Facet: " /> - <h:inputText id="captionInput" value="#{richDataTableBean.facets['caption']}" /> - - <h:outputLabel value="Header Facet:" /> - <h:inputText id="headerInput" value="#{richDataTableBean.facets['header']}" /> - - <h:outputLabel value="State Column Header:" /> - <h:inputText id="stateHeaderInput" value="#{richDataTableBean.facets['columnStateHeader']}" /> - - <h:outputLabel value="State Column Footer:" /> - <h:inputText id="stateFooterInput" value="#{richDataTableBean.facets['columnStateFooter']}" /> - - <h:outputLabel value="Capital Column Header:" /> - <h:inputText id="capitalHeaderInput" value="#{richDataTableBean.facets['columnCapitalHeader']}" /> - - <h:outputLabel value="Capital Column Footer:" /> - <h:inputText id="capitalFooterInput" value="#{richDataTableBean.facets['columnCapitalFooter']}" /> - </h:panelGrid> - </a4j:ajax> - + + <a4j:ajax render="#{nestedComponentId}"> + <h:panelGrid columns="2"> + <h:outputLabel value="No Data Facet: " /> + <h:inputText id="noDataInput" value="#{richDataTableBean.facets['noData']}" /> + + <h:outputLabel value="Caption Facet: " /> + <h:inputText id="captionInput" value="#{richDataTableBean.facets['caption']}" /> + + <h:outputLabel value="Header Facet:" /> + <h:inputText id="headerInput" value="#{richDataTableBean.facets['header']}" /> + + <h:outputLabel value="State Column Header:" /> + <h:inputText id="stateHeaderInput" value="#{richDataTableBean.facets['columnStateHeader']}" /> + + <h:outputLabel value="State Column Footer:" /> + <h:inputText id="stateFooterInput" value="#{richDataTableBean.facets['columnStateFooter']}" /> + + <h:outputLabel value="Capital Column Header:" /> + <h:inputText id="capitalHeaderInput" value="#{richDataTableBean.facets['columnCapitalHeader']}" /> + + <h:outputLabel value="Capital Column Footer:" /> + <h:inputText id="capitalFooterInput" value="#{richDataTableBean.facets['columnCapitalFooter']}" /> + </h:panelGrid> + </a4j:ajax> + <br/><br/> <metamer:attributes value="#{richDataTableBean.attributes}" id="attributes" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -28,10 +28,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -56,7 +56,7 @@ <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.employees : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" @@ -143,7 +143,7 @@ <h:outputText id="columnHeaderNumberOfKidsType" value="(expression &gt;=)" /> <br/> <rich:inputNumberSpinner id="spinnerFilter" minValue="0" maxValue="6" cycled="false" value="#{richDataTableBean.filtering['numberOfKids1']}"> - <a4j:ajax event="change" render="commonGrid" /> + <a4j:ajax event="change" render="commonGrid" /> </rich:inputNumberSpinner> </f:facet> @@ -160,7 +160,7 @@ <h:outputText id="columnHeaderNumberOfKids2Type" value="(expression &lt;)" /> <br/> <rich:inputNumberSlider id="sliderFilter" minValue="0" maxValue="6" value="#{richDataTableBean.filtering['numberOfKids2']}"> - <!-- <a4j:ajax render="commonGrid" /> --> + <!-- <a4j:ajax render="commonGrid" /> --> </rich:inputNumberSlider> <br /> (a4j:ajax disabled - RF-9900) Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -28,10 +28,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -48,18 +48,18 @@ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> <a4j:ajax render="#{nestedComponentId} scroller1" /> </h:selectBooleanCheckbox> - + <br/><br/> - + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.capitals : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" @@ -119,7 +119,7 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - + <fieldset> <legend>scroller1</legend> @@ -147,8 +147,8 @@ <br/> <fieldset> - <c:set var="nestedScrollerId" value="#{nestedComponentId}:scroller2" /> - + <c:set var="nestedScrollerId" value="#{nestedComponentId}:scroller2" /> + <legend>scroller2</legend> <h:commandButton id="buttonFirst2" value="&lt;&lt; first"> <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,16 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - + <ui:define name="head"> <h:outputStylesheet library="css" name="richDataTable.css"/> </ui:define> @@ -51,11 +51,11 @@ </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.capitals : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -54,10 +54,10 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - binding="#{richDataTableBean.binding}" + binding="#{richDataTableBean.binding}" value="#{richDataTableBean.state ? model.employees : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" @@ -89,21 +89,21 @@ <rich:column id="columnName" sortBy="#{record.name}" sortOrder="#{richDataTableBean.sorting['columnName'].order}"> <f:facet name="header"> - <a4j:commandLink id="sortByName" value="Name" render="richDataTable" action="#{richDataTableBean.sorting['columnName'].reverseOrder}" /> + <a4j:commandLink id="sortByName" value="Name" render="richDataTable" action="#{richDataTableBean.sorting['columnName'].reverseOrder}" /> </f:facet> <h:outputText value="#{record.name}" /> </rich:column> <rich:column id="columnTitle" sortBy="#{record.title}" sortOrder="#{richDataTableBean.sorting['columnTitle'].order}"> <f:facet name="header"> - <a4j:commandLink id="sortByTitle" value="Title" render="richDataTable" action="#{richDataTableBean.sorting['columnTitle'].reverseOrder}" /> + <a4j:commandLink id="sortByTitle" value="Title" render="richDataTable" action="#{richDataTableBean.sorting['columnTitle'].reverseOrder}" /> </f:facet> <h:outputText value="#{record.title}" /> </rich:column> <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}" sortOrder="#{richDataTableBean.sorting['columnNumberOfKids'].order}"> <f:facet name="header"> - <a4j:commandLink id="sortByNumberOfKids" value="# of Kids" render="richDataTable" action="#{richDataTableBean.sorting['columnNumberOfKids'].reverseOrder}" /> + <a4j:commandLink id="sortByNumberOfKids" value="# of Kids" render="richDataTable" action="#{richDataTableBean.sorting['columnNumberOfKids'].reverseOrder}" /> </f:facet> <h:outputText value="#{record.numberOfKids}" /> </rich:column> @@ -113,12 +113,12 @@ </f:facet> </rich:dataTable> - + </ui:define> <ui:define name="outOfTemplateAfter"> <a4j:commandButton id="sortReset" value="Reset Sorting" action="#{richDataTableBean.sorting.clear}" render="#{nestedComponentId} scroller1" /> - + <br /><br /> <metamer:attributes value="#{richDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richDataTable" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -56,7 +56,7 @@ <rich:dataTable id="richDataTable" value="#{richDataTableBean.state ? model.employees : null}" var="record" - + captionClass="#{richDataTableBean.attributes['captionClass'].value}" columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" columns="#{richDataTableBean.attributes['columns'].value}" @@ -81,10 +81,10 @@ <rich:column id="columnSex" sortBy="#{record.sex}"> <f:facet name="header"> <h:commandLink id="sortSexes" value="Sex"> - <rich:componentControl event="click" target="richDataTable" operation="sort"> - <f:param value="columnSex" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richDataTable" operation="sort"> + <f:param value="columnSex" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:graphicImage library="images" name="#{record.sex == 'MALE' ? 'male.png' : 'female.png'}" alt="#{record.sex}" /> </rich:column> @@ -93,10 +93,10 @@ <rich:column id="columnName" sortBy="#{record.name}"> <f:facet name="header"> <h:commandLink id="sortByName" value="Name"> - <rich:componentControl event="click" target="richDataTable" operation="sort"> - <f:param value="columnName" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richDataTable" operation="sort"> + <f:param value="columnName" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:outputText value="#{record.name}" /> </rich:column> @@ -104,10 +104,10 @@ <rich:column id="columnTitle" sortBy="#{record.title}"> <f:facet name="header"> <h:commandLink id="sortByTitle" value="Title"> - <rich:componentControl event="click" target="richDataTable" operation="sort"> - <f:param value="columnTitle" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richDataTable" operation="sort"> + <f:param value="columnTitle" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:outputText value="#{record.title}" /> </rich:column> @@ -115,10 +115,10 @@ <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> <f:facet name="header"> <h:commandLink id="sortByNumberOfKids" value="Number of Kids"> - <rich:componentControl event="click" target="richDataTable" operation="sort"> - <f:param value="columnNumberOfKids" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richDataTable" operation="sort"> + <f:param value="columnNumberOfKids" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:outputText value="#{record.numberOfKids}" /> </rich:column> @@ -128,17 +128,17 @@ </f:facet> </rich:dataTable> - - + + </ui:define> <ui:define name="outOfTemplateAfter"> - <h:commandButton id="sortReset" value="Reset Sorting"> + <h:commandButton id="sortReset" value="Reset Sorting"> <rich:componentControl event="click" target="#{nestedComponentId}" operation="sort" /> </h:commandButton> - + <br /><br /> - + <metamer:attributes value="#{richDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -32,8 +32,8 @@ <ui:define name="links"> <metamer:testPageLink id="simple" outcome="simple" value="Simple"> - <div>The simple <b>rich:dropTarget</b> component tied to target component.</div> - <div>After drop to target, details of event appears.</div> + <div>The simple <b>rich:dropTarget</b> component tied to target component.</div> + <div>After drop to target, details of event appears.</div> </metamer:testPageLink> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,176 +1,172 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> -<!-- -JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors -by the @authors tag. See the copyright.txt in the distribution for a -full listing of individual contributors. + <!-- + JBoss, Home of Professional Open Source + Copyright 2010-2011, Red Hat, Inc. and individual contributors + by the @authors tag. See the copyright.txt in the distribution for a + full listing of individual contributors. -This is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of -the License, or (at your option) any later version. + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. -This software is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -You should have received a copy of the GNU Lesser General Public -License along with this software; if not, write to the Free -Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301 USA, or see the FSF site: http://www.fsf.org. + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richTree" /> - - <ui:define name="view"> - <f:metadata> + <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richTree" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - <ui:define name="head"> - <h:outputStylesheet library="css" name="richDragBehavior.css" /> - </ui:define> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richDragBehavior.css" /> + </ui:define> - <ui:define name="component"> + <ui:define name="component"> - <rich:dragIndicator id="indicator" - acceptClass="#{richDragIndicatorBean.attributes['acceptClass'].value}" - draggingClass="#{richDragIndicatorBean.attributes['draggingClass'].value}" - rejectClass="#{richDragIndicatorBean.attributes['rejectClass'].value}" - rendered="#{richDragIndicatorBean.attributes['rendered'].value}" - /> + <rich:dragIndicator id="indicator" + acceptClass="#{richDragIndicatorBean.attributes['acceptClass'].value}" + draggingClass="#{richDragIndicatorBean.attributes['draggingClass'].value}" + rejectClass="#{richDragIndicatorBean.attributes['rejectClass'].value}" + rendered="#{richDragIndicatorBean.attributes['rendered'].value}" + /> - <table> - <tr> - <td> - <a4j:outputPanel id="draggable1" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#1: type=#{richDragSourceBean.attributes['type'].value}" /> - <rich:dragSource - dragIndicator="indicator" - dragValue="#{richDragSourceBean.dragValues[0]}" - type="drg1" /> - </a4j:outputPanel> - </td> - <td> - <a4j:outputPanel id="draggable2" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#2: type=drg2" /> - <rich:dragSource type="drg2" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[1]}" /> - </a4j:outputPanel> - </td> - <td> - <a4j:outputPanel id="draggable3" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#3: type=drg3" /> - <rich:dragSource type="drg3" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[2]}" /> - </a4j:outputPanel> - </td> - </tr> - </table> + <table> + <tr> + <td> + <a4j:outputPanel id="draggable1" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#1: type=#{richDragSourceBean.attributes['type'].value}" /> + <rich:dragSource + dragIndicator="indicator" + dragValue="#{richDragSourceBean.dragValues[0]}" + type="drg1" /> + </a4j:outputPanel> + </td> + <td> + <a4j:outputPanel id="draggable2" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#2: type=drg2" /> + <rich:dragSource type="drg2" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[1]}" /> + </a4j:outputPanel> + </td> + <td> + <a4j:outputPanel id="draggable3" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#3: type=drg3" /> + <rich:dragSource type="drg3" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[2]}" /> + </a4j:outputPanel> + </td> + </tr> + </table> - <a4j:outputPanel id="droppable1" layout="block" styleClass="metamer-droppable" style="float: left"> - <rich:dropTarget - id="richDropTarget1" - dropValue="#{richDropTargetBean.dropValue}" - dropListener="#{richDropListenerBean.processDragging}" - acceptedTypes="drg1, drg2" - render="droppable1 droppable2" - /> - - <h:outputText value="Accepts: drg1, drg2" /> - <br /> - - <h:outputText id="dropNumber1" value="Drops: #{richDropTargetBean.dropValue.number}" /> - <br /> - - - - <h:dataTable id="droppedValues1" var="droppedValue" value="#{richDropTargetBean.droppedEntries1}"> - <h:column> - <f:facet name="header"> + <a4j:outputPanel id="droppable1" layout="block" styleClass="metamer-droppable" style="float: left"> + <rich:dropTarget + id="richDropTarget1" + dropValue="#{richDropTargetBean.dropValue}" + dropListener="#{richDropListenerBean.processDragging}" + acceptedTypes="drg1, drg2" + render="droppable1 droppable2" + /> + + <h:outputText value="Accepts: drg1, drg2" /> + <br /> + + <h:outputText id="dropNumber1" value="Drops: #{richDropTargetBean.dropValue.number}" /> + <br /> + + + + <h:dataTable id="droppedValues1" var="droppedValue" value="#{richDropTargetBean.droppedEntries1}"> + <h:column> + <f:facet name="header"> Dragged - </f:facet> - <h:outputText value="##{droppedValue.value.number}" /> - </h:column> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="##{droppedValue.value.number}" /> + </h:column> + <h:column> + <f:facet name="header"> Dropped - </f:facet> - <h:outputText value="#{droppedValue.key.number}" /> - </h:column> - - </h:dataTable> - </a4j:outputPanel> - - <a4j:outputPanel id="droppable2" layout="block" styleClass="metamer-droppable"> - <rich:dropTarget - id="richDropTarget2" - dropValue="#{richDropTargetBean.dropValue}" - dropListener="#{richDropListenerBean.processDragging}" - acceptedTypes="drg2, drg3" - render="droppable1 droppable2" - /> - - <h:outputText value="Accepts: drg2, drg3" /> - <br /> - - <h:outputText id="dropNumber2" value="Drops: #{richDropTargetBean.dropValue.number}" /> - <br /> - - - - <h:dataTable id="droppedValues2" var="droppedValue" value="#{richDropTargetBean.droppedEntries2}"> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="#{droppedValue.key.number}" /> + </h:column> + + </h:dataTable> + </a4j:outputPanel> + + <a4j:outputPanel id="droppable2" layout="block" styleClass="metamer-droppable"> + <rich:dropTarget + id="richDropTarget2" + dropValue="#{richDropTargetBean.dropValue}" + dropListener="#{richDropListenerBean.processDragging}" + acceptedTypes="drg2, drg3" + render="droppable1 droppable2" + /> + + <h:outputText value="Accepts: drg2, drg3" /> + <br /> + + <h:outputText id="dropNumber2" value="Drops: #{richDropTargetBean.dropValue.number}" /> + <br /> + + + + <h:dataTable id="droppedValues2" var="droppedValue" value="#{richDropTargetBean.droppedEntries2}"> + <h:column> + <f:facet name="header"> Dragged - </f:facet> - <h:outputText value="##{droppedValue.value.number}" /> - </h:column> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="##{droppedValue.value.number}" /> + </h:column> + <h:column> + <f:facet name="header"> Dropped - </f:facet> - <h:outputText value="#{droppedValue.key.number}" /> - </h:column> - - </h:dataTable> - </a4j:outputPanel> + </f:facet> + <h:outputText value="#{droppedValue.key.number}" /> + </h:column> - </ui:define> + </h:dataTable> + </a4j:outputPanel> - <ui:define name="outOfTemplateAfter"> - <a4j:outputPanel ajaxRendered="true"> - <h:panelGrid columns="2"> - <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> - <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> - <h:panelGrid columns="2"> - <h:outputLabel value="clientId:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.component.clientId}" /> - - <h:outputLabel value="Drag Value:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.dragValue}" /> - - <h:outputLabel value="Drop Value:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.dropValue}" /> - </h:panelGrid> - </h:panelGroup> - </h:panelGrid> - </a4j:outputPanel> - - <metamer:attributes value="#{richDragIndicatorBean.attributes}" id="attributes" /> - </ui:define> + </ui:define> -</ui:composition> + <ui:define name="outOfTemplateAfter"> + <a4j:outputPanel ajaxRendered="true"> + <h:panelGrid columns="2"> + <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> + <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> + <h:panelGrid columns="2"> + <h:outputLabel value="clientId:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.component.clientId}" /> + + <h:outputLabel value="Drag Value:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.dragValue}" /> + + <h:outputLabel value="Drop Value:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.dropValue}" /> + </h:panelGrid> + </h:panelGroup> + </h:panelGrid> + </a4j:outputPanel> + + <metamer:attributes value="#{richDragIndicatorBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -32,9 +32,9 @@ <ui:define name="links"> <metamer:testPageLink id="simple" outcome="simple" value="Simple"> - <div>The 3 simple <b>rich:dragSource</b> components tied to target component.</div> - <div>Attributes are tied to first of components.</div> - <div>After drop to target, details of event appears.</div> + <div>The 3 simple <b>rich:dragSource</b> components tied to target component.</div> + <div>Attributes are tied to first of components.</div> + <div>After drop to target, details of event appears.</div> </metamer:testPageLink> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,176 +1,172 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> -<!-- -JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors -by the @authors tag. See the copyright.txt in the distribution for a -full listing of individual contributors. + <!-- + JBoss, Home of Professional Open Source + Copyright 2010-2011, Red Hat, Inc. and individual contributors + by the @authors tag. See the copyright.txt in the distribution for a + full listing of individual contributors. -This is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of -the License, or (at your option) any later version. + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. -This software is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -You should have received a copy of the GNU Lesser General Public -License along with this software; if not, write to the Free -Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301 USA, or see the FSF site: http://www.fsf.org. + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richTree" /> - - <ui:define name="view"> - <f:metadata> + <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richTree" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - <ui:define name="head"> - <h:outputStylesheet library="css" name="richDragBehavior.css" /> - </ui:define> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richDragBehavior.css" /> + </ui:define> - <ui:define name="component"> + <ui:define name="component"> - <rich:dragIndicator id="indicator" /> - - <rich:dragIndicator id="indicator2" acceptClass="acceptClass" rejectClass="rejectClass" draggingClass="draggingClass" /> - <p>Use @indicator=indicator2 to switch to usage of second defined indicator with custom styling</p> - - - <table> - <tr> - <td> - <a4j:outputPanel id="draggable1" layout="block" styleClass="metamer-draggable" style="border: 3px solid red"> - <h:outputText value="#1: type=#{richDragSourceBean.attributes['type'].value}" /> - <rich:dragSource - dragValue="#{richDragSourceBean.dragValues[0]}" - dragIndicator="#{richDragSourceBean.attributes['dragIndicator'].value}" - type="#{richDragSourceBean.attributes['type'].value}" - rendered="#{richDragSourceBean.attributes['rendered'].value}" /> - </a4j:outputPanel> - </td> - <td> - <a4j:outputPanel id="draggable2" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#2: type=drg2" /> - <rich:dragSource type="drg2" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[1]}" /> - </a4j:outputPanel> - </td> - <td> - <a4j:outputPanel id="draggable3" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#3: type=drg3" /> - <rich:dragSource type="drg3" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[2]}" /> - </a4j:outputPanel> - </td> - </tr> - </table> + <rich:dragIndicator id="indicator" /> - <a4j:outputPanel id="droppable1" layout="block" styleClass="metamer-droppable" style="float: left"> - <rich:dropTarget - id="richDropTarget1" - dropValue="#{richDropTargetBean.dropValue}" - dropListener="#{richDropListenerBean.processDragging}" - acceptedTypes="drg1, drg2" - render="droppable1 droppable2" - /> - - <h:outputText value="Accepts: drg1, drg2" /> - <br /> - - <h:outputText id="dropNumber1" value="Drops: #{richDropTargetBean.dropValue.number}" /> - <br /> - - - - <h:dataTable id="droppedValues1" var="droppedValue" value="#{richDropTargetBean.droppedEntries1}"> - <h:column> - <f:facet name="header"> + <rich:dragIndicator id="indicator2" acceptClass="acceptClass" rejectClass="rejectClass" draggingClass="draggingClass" /> + <p>Use @indicator=indicator2 to switch to usage of second defined indicator with custom styling</p> + + + <table> + <tr> + <td> + <a4j:outputPanel id="draggable1" layout="block" styleClass="metamer-draggable" style="border: 3px solid red"> + <h:outputText value="#1: type=#{richDragSourceBean.attributes['type'].value}" /> + <rich:dragSource + dragValue="#{richDragSourceBean.dragValues[0]}" + dragIndicator="#{richDragSourceBean.attributes['dragIndicator'].value}" + type="#{richDragSourceBean.attributes['type'].value}" + rendered="#{richDragSourceBean.attributes['rendered'].value}" /> + </a4j:outputPanel> + </td> + <td> + <a4j:outputPanel id="draggable2" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#2: type=drg2" /> + <rich:dragSource type="drg2" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[1]}" /> + </a4j:outputPanel> + </td> + <td> + <a4j:outputPanel id="draggable3" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#3: type=drg3" /> + <rich:dragSource type="drg3" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[2]}" /> + </a4j:outputPanel> + </td> + </tr> + </table> + + <a4j:outputPanel id="droppable1" layout="block" styleClass="metamer-droppable" style="float: left"> + <rich:dropTarget + id="richDropTarget1" + dropValue="#{richDropTargetBean.dropValue}" + dropListener="#{richDropListenerBean.processDragging}" + acceptedTypes="drg1, drg2" + render="droppable1 droppable2" + /> + + <h:outputText value="Accepts: drg1, drg2" /> + <br /> + + <h:outputText id="dropNumber1" value="Drops: #{richDropTargetBean.dropValue.number}" /> + <br /> + + + + <h:dataTable id="droppedValues1" var="droppedValue" value="#{richDropTargetBean.droppedEntries1}"> + <h:column> + <f:facet name="header"> Dragged - </f:facet> - <h:outputText value="##{droppedValue.value.number}" /> - </h:column> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="##{droppedValue.value.number}" /> + </h:column> + <h:column> + <f:facet name="header"> Dropped - </f:facet> - <h:outputText value="#{droppedValue.key.number}" /> - </h:column> - - </h:dataTable> - </a4j:outputPanel> - - <a4j:outputPanel id="droppable2" layout="block" styleClass="metamer-droppable"> - <rich:dropTarget - id="richDropTarget2" - dropValue="#{richDropTargetBean.dropValue}" - dropListener="#{richDropListenerBean.processDragging}" - acceptedTypes="drg2, drg3" - render="droppable1 droppable2" - /> - - <h:outputText value="Accepts: drg2, drg3" /> - <br /> - - <h:outputText id="dropNumber2" value="Drops: #{richDropTargetBean.dropValue.number}" /> - <br /> - - - - <h:dataTable id="droppedValues2" var="droppedValue" value="#{richDropTargetBean.droppedEntries2}"> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="#{droppedValue.key.number}" /> + </h:column> + + </h:dataTable> + </a4j:outputPanel> + + <a4j:outputPanel id="droppable2" layout="block" styleClass="metamer-droppable"> + <rich:dropTarget + id="richDropTarget2" + dropValue="#{richDropTargetBean.dropValue}" + dropListener="#{richDropListenerBean.processDragging}" + acceptedTypes="drg2, drg3" + render="droppable1 droppable2" + /> + + <h:outputText value="Accepts: drg2, drg3" /> + <br /> + + <h:outputText id="dropNumber2" value="Drops: #{richDropTargetBean.dropValue.number}" /> + <br /> + + + + <h:dataTable id="droppedValues2" var="droppedValue" value="#{richDropTargetBean.droppedEntries2}"> + <h:column> + <f:facet name="header"> Dragged - </f:facet> - <h:outputText value="##{droppedValue.value.number}" /> - </h:column> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="##{droppedValue.value.number}" /> + </h:column> + <h:column> + <f:facet name="header"> Dropped - </f:facet> - <h:outputText value="#{droppedValue.key.number}" /> - </h:column> - - </h:dataTable> - </a4j:outputPanel> + </f:facet> + <h:outputText value="#{droppedValue.key.number}" /> + </h:column> - </ui:define> + </h:dataTable> + </a4j:outputPanel> - <ui:define name="outOfTemplateAfter"> - <a4j:outputPanel ajaxRendered="true"> - <h:panelGrid columns="2"> - <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> - <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> - <h:panelGrid columns="2"> - <h:outputLabel value="clientId:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.component.clientId}" /> - - <h:outputLabel value="Drag Value:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.dragValue}" /> - - <h:outputLabel value="Drop Value:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.dropValue}" /> - </h:panelGrid> - </h:panelGroup> - </h:panelGrid> - </a4j:outputPanel> - - <metamer:attributes value="#{richDragSourceBean.attributes}" id="attributes" /> - </ui:define> + </ui:define> -</ui:composition> + <ui:define name="outOfTemplateAfter"> + <a4j:outputPanel ajaxRendered="true"> + <h:panelGrid columns="2"> + <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> + <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> + <h:panelGrid columns="2"> + <h:outputLabel value="clientId:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.component.clientId}" /> + + <h:outputLabel value="Drag Value:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.dragValue}" /> + + <h:outputLabel value="Drop Value:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.dropValue}" /> + </h:panelGrid> + </h:panelGroup> + </h:panelGrid> + </a4j:outputPanel> + + <metamer:attributes value="#{richDragSourceBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -32,8 +32,8 @@ <ui:define name="links"> <metamer:testPageLink id="simple" outcome="simple" value="Simple"> - <div>The simple <b>rich:dropTarget</b> component tied to target component.</div> - <div>After drop to target, details of event appears.</div> + <div>The simple <b>rich:dropTarget</b> component tied to target component.</div> + <div>After drop to target, details of event appears.</div> </metamer:testPageLink> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,184 +1,180 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> -<!-- -JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors -by the @authors tag. See the copyright.txt in the distribution for a -full listing of individual contributors. + <!-- + JBoss, Home of Professional Open Source + Copyright 2010-2011, Red Hat, Inc. and individual contributors + by the @authors tag. See the copyright.txt in the distribution for a + full listing of individual contributors. -This is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of -the License, or (at your option) any later version. + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. -This software is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -You should have received a copy of the GNU Lesser General Public -License along with this software; if not, write to the Free -Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301 USA, or see the FSF site: http://www.fsf.org. + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richTree" /> - - <ui:define name="view"> - <f:metadata> + <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richTree" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - <ui:define name="head"> - <h:outputStylesheet library="css" name="richDragBehavior.css" /> - </ui:define> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richDragBehavior.css" /> + </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> + <ui:define name="outOfTemplateBefore"> + </ui:define> - <ui:define name="component"> + <ui:define name="component"> - <rich:dragIndicator id="indicator" /> + <rich:dragIndicator id="indicator" /> - <table> - <tr> - <td> - <a4j:outputPanel id="draggable1" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#1: type=#{richDragSourceBean.attributes['type'].value}" /> - <rich:dragSource - dragIndicator="indicator" - dragValue="#{richDragSourceBean.dragValues[0]}" - type="drg1" /> - </a4j:outputPanel> - </td> - <td> - <a4j:outputPanel id="draggable2" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#2: type=drg2" /> - <rich:dragSource type="drg2" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[1]}" /> - </a4j:outputPanel> - </td> - <td> - <a4j:outputPanel id="draggable3" layout="block" styleClass="metamer-draggable"> - <h:outputText value="#3: type=drg3" /> - <rich:dragSource type="drg3" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[2]}" /> - </a4j:outputPanel> - </td> - </tr> - </table> + <table> + <tr> + <td> + <a4j:outputPanel id="draggable1" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#1: type=#{richDragSourceBean.attributes['type'].value}" /> + <rich:dragSource + dragIndicator="indicator" + dragValue="#{richDragSourceBean.dragValues[0]}" + type="drg1" /> + </a4j:outputPanel> + </td> + <td> + <a4j:outputPanel id="draggable2" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#2: type=drg2" /> + <rich:dragSource type="drg2" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[1]}" /> + </a4j:outputPanel> + </td> + <td> + <a4j:outputPanel id="draggable3" layout="block" styleClass="metamer-draggable"> + <h:outputText value="#3: type=drg3" /> + <rich:dragSource type="drg3" dragIndicator="indicator" dragValue="#{richDragSourceBean.dragValues[2]}" /> + </a4j:outputPanel> + </td> + </tr> + </table> - <a4j:outputPanel id="droppable1" layout="block" styleClass="metamer-droppable" style="border: 3px solid red; float: left"> - <rich:dropTarget - id="richDropTarget1" - dropValue="#{richDropTargetBean.dropValue}" - dropListener="#{richDropListenerBean.processDragging}" - - acceptedTypes="#{richDropTargetBean.attributes['acceptedTypes'].value}" - bypassUpdates="#{richDropTargetBean.attributes['bypassUpdates'].value}" - data="#{richDropTargetBean.attributes['data'].value}" - immediate="#{richDropTargetBean.attributes['immediate'].value}" - execute="#{richDropTargetBean.attributes['execute'].value}" - limitRender="#{richDropTargetBean.attributes['limitRender'].value}" - onbegin="#{richDropTargetBean.attributes['onbegin'].value}" - onbeforedomupdate="#{richDropTargetBean.attributes['onbeforedomupdate'].value}" - oncomplete="#{richDropTargetBean.attributes['oncomplete'].value}" - render="#{richDropTargetBean.attributes['render'].value}" - rendered="#{richDropTargetBean.attributes['rendered'].value}" - status="#{richDropTargetBean.attributes['status'].value}" - value="#{richDropTargetBean.attributes['value'].value}" - /> - - <h:outputText value="Accepts: #{richDragSourceBean.attributes['acceptedTypes'].value}" /> - <br /> - - <h:outputText id="dropNumber1" value="Drops: #{richDropTargetBean.dropValue.number}" /> - <br /> - - <h:dataTable id="droppedValues1" var="droppedValue" value="#{richDropTargetBean.droppedEntries1}"> - <h:column> - <f:facet name="header"> + <a4j:outputPanel id="droppable1" layout="block" styleClass="metamer-droppable" style="border: 3px solid red; float: left"> + <rich:dropTarget + id="richDropTarget1" + dropValue="#{richDropTargetBean.dropValue}" + dropListener="#{richDropListenerBean.processDragging}" + + acceptedTypes="#{richDropTargetBean.attributes['acceptedTypes'].value}" + bypassUpdates="#{richDropTargetBean.attributes['bypassUpdates'].value}" + data="#{richDropTargetBean.attributes['data'].value}" + immediate="#{richDropTargetBean.attributes['immediate'].value}" + execute="#{richDropTargetBean.attributes['execute'].value}" + limitRender="#{richDropTargetBean.attributes['limitRender'].value}" + onbegin="#{richDropTargetBean.attributes['onbegin'].value}" + onbeforedomupdate="#{richDropTargetBean.attributes['onbeforedomupdate'].value}" + oncomplete="#{richDropTargetBean.attributes['oncomplete'].value}" + render="#{richDropTargetBean.attributes['render'].value}" + rendered="#{richDropTargetBean.attributes['rendered'].value}" + status="#{richDropTargetBean.attributes['status'].value}" + value="#{richDropTargetBean.attributes['value'].value}" + /> + + <h:outputText value="Accepts: #{richDragSourceBean.attributes['acceptedTypes'].value}" /> + <br /> + + <h:outputText id="dropNumber1" value="Drops: #{richDropTargetBean.dropValue.number}" /> + <br /> + + <h:dataTable id="droppedValues1" var="droppedValue" value="#{richDropTargetBean.droppedEntries1}"> + <h:column> + <f:facet name="header"> Dragged - </f:facet> - <h:outputText value="##{droppedValue.value.number}" /> - </h:column> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="##{droppedValue.value.number}" /> + </h:column> + <h:column> + <f:facet name="header"> Dropped - </f:facet> - <h:outputText value="#{droppedValue.key.number}" /> - </h:column> - - </h:dataTable> - </a4j:outputPanel> - - <a4j:outputPanel id="droppable2" layout="block" styleClass="metamer-droppable"> - <rich:dropTarget - id="richDropTarget2" - dropValue="#{richDropTargetBean.dropValue}" - dropListener="#{richDropListenerBean.processDragging}" - acceptedTypes="drg2, drg3" - render="droppable1 droppable2" - /> - - <h:outputText value="Accepts: drg2, drg3" /> - <br /> - - <h:outputText id="dropNumber2" value="Drops: #{richDropTargetBean.dropValue.number}" /> - <br /> - - - - <h:dataTable id="droppedValues2" var="droppedValue" value="#{richDropTargetBean.droppedEntries2}"> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="#{droppedValue.key.number}" /> + </h:column> + + </h:dataTable> + </a4j:outputPanel> + + <a4j:outputPanel id="droppable2" layout="block" styleClass="metamer-droppable"> + <rich:dropTarget + id="richDropTarget2" + dropValue="#{richDropTargetBean.dropValue}" + dropListener="#{richDropListenerBean.processDragging}" + acceptedTypes="drg2, drg3" + render="droppable1 droppable2" + /> + + <h:outputText value="Accepts: drg2, drg3" /> + <br /> + + <h:outputText id="dropNumber2" value="Drops: #{richDropTargetBean.dropValue.number}" /> + <br /> + + + + <h:dataTable id="droppedValues2" var="droppedValue" value="#{richDropTargetBean.droppedEntries2}"> + <h:column> + <f:facet name="header"> Dragged - </f:facet> - <h:outputText value="##{droppedValue.value.number}" /> - </h:column> - <h:column> - <f:facet name="header"> + </f:facet> + <h:outputText value="##{droppedValue.value.number}" /> + </h:column> + <h:column> + <f:facet name="header"> Dropped - </f:facet> - <h:outputText value="#{droppedValue.key.number}" /> - </h:column> - - </h:dataTable> - </a4j:outputPanel> + </f:facet> + <h:outputText value="#{droppedValue.key.number}" /> + </h:column> - </ui:define> + </h:dataTable> + </a4j:outputPanel> - <ui:define name="outOfTemplateAfter"> - <a4j:outputPanel ajaxRendered="true"> - <h:panelGrid columns="2"> - <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> - <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> - <h:panelGrid columns="2"> - <h:outputLabel value="clientId:" /> - <h:outputText id="clientId" value="#{richDropListenerBean.dropEvent.component.clientId}" /> - - <h:outputLabel value="Drag Value:" /> - <h:outputText id="dragValue" value="#{richDropListenerBean.dropEvent.dragValue}" /> - - <h:outputLabel value="Drop Value:" /> - <h:outputText id="dropValue" value="#{richDropListenerBean.dropEvent.dropValue}" /> - </h:panelGrid> - </h:panelGroup> - </h:panelGrid> - </a4j:outputPanel> - - <metamer:attributes value="#{richDropTargetBean.attributes}" id="dropBehaviorAttributes" /> - </ui:define> + </ui:define> -</ui:composition> + <ui:define name="outOfTemplateAfter"> + <a4j:outputPanel ajaxRendered="true"> + <h:panelGrid columns="2"> + <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> + <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> + <h:panelGrid columns="2"> + <h:outputLabel value="clientId:" /> + <h:outputText id="clientId" value="#{richDropListenerBean.dropEvent.component.clientId}" /> + + <h:outputLabel value="Drag Value:" /> + <h:outputText id="dragValue" value="#{richDropListenerBean.dropEvent.dragValue}" /> + + <h:outputLabel value="Drop Value:" /> + <h:outputText id="dropValue" value="#{richDropListenerBean.dropEvent.dropValue}" /> + </h:panelGrid> + </h:panelGroup> + </h:panelGrid> + </a4j:outputPanel> + + <metamer:attributes value="#{richDropTargetBean.attributes}" id="dropBehaviorAttributes" /> + </ui:define> + + </ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -103,7 +103,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -96,7 +96,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -186,7 +186,7 @@ <rich:calendar id="birthdate" value="#{record.birthdate}"> <a4j:ajax event="change" render="@this"/> </rich:calendar> - + <f:facet name="footer"> <h:outputText id="columnFooterBirthdate" value="Birthdate" /> </f:facet> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -60,7 +60,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -89,31 +89,31 @@ <f:facet name="header"> <h:outputText id="header" value="#{richExtendedDataTableBean.facets['header']}" - rendered="#{not empty richExtendedDataTableBean.facets['header']}"/> + rendered="#{not empty richExtendedDataTableBean.facets['header']}"/> </f:facet> <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="#{richExtendedDataTableBean.facets['columnStateHeader']}" - rendered="#{not empty richExtendedDataTableBean.facets['columnStateHeader']}"/> - </f:facet> + rendered="#{not empty richExtendedDataTableBean.facets['columnStateHeader']}"/> + </f:facet> <h:outputText value="#{record.state}" /> <f:facet name="footer"> <h:outputText id="columnFooterState" value="#{richExtendedDataTableBean.facets['columnStateFooter']}" - rendered="#{not empty richExtendedDataTableBean.facets['columnStateFooter']}"/> + rendered="#{not empty richExtendedDataTableBean.facets['columnStateFooter']}"/> </f:facet> </rich:column> <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="#{richExtendedDataTableBean.facets['columnCapitalHeader']}" - rendered="#{not empty richExtendedDataTableBean.facets['columnCapitalHeader']}"/> + rendered="#{not empty richExtendedDataTableBean.facets['columnCapitalHeader']}"/> </f:facet> <h:outputText value="#{record.name}" /> <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="#{richExtendedDataTableBean.facets['columnCapitalFooter']}" - rendered="#{not empty richExtendedDataTableBean.facets['columnCapitalFooter']}"/> + rendered="#{not empty richExtendedDataTableBean.facets['columnCapitalFooter']}"/> </f:facet> </rich:column> @@ -122,29 +122,29 @@ <ui:define name="outOfTemplateAfter"> <a4j:ajax render="#{nestedComponentId}"> - <h:panelGrid columns="2"> - <h:outputLabel value="No Data Facet: " /> - <h:inputText id="noDataInput" value="#{richExtendedDataTableBean.facets['noData']}" /> - - <h:outputLabel value="Header Facet:" /> - <h:inputText id="headerInput" value="#{richExtendedDataTableBean.facets['header']}" /> - - <h:outputLabel value="State Column Header:" /> - <h:inputText id="stateHeaderInput" value="#{richExtendedDataTableBean.facets['columnStateHeader']}" /> - - <h:outputLabel value="State Column Footer:" /> - <h:inputText id="stateFooterInput" value="#{richExtendedDataTableBean.facets['columnStateFooter']}" /> - - <h:outputLabel value="Capital Column Header:" /> - <h:inputText id="capitalHeaderInput" value="#{richExtendedDataTableBean.facets['columnCapitalHeader']}" /> - - <h:outputLabel value="Capital Column Footer:" /> - <h:inputText id="capitalFooterInput" value="#{richExtendedDataTableBean.facets['columnCapitalFooter']}" /> - </h:panelGrid> - </a4j:ajax> - + <h:panelGrid columns="2"> + <h:outputLabel value="No Data Facet: " /> + <h:inputText id="noDataInput" value="#{richExtendedDataTableBean.facets['noData']}" /> + + <h:outputLabel value="Header Facet:" /> + <h:inputText id="headerInput" value="#{richExtendedDataTableBean.facets['header']}" /> + + <h:outputLabel value="State Column Header:" /> + <h:inputText id="stateHeaderInput" value="#{richExtendedDataTableBean.facets['columnStateHeader']}" /> + + <h:outputLabel value="State Column Footer:" /> + <h:inputText id="stateFooterInput" value="#{richExtendedDataTableBean.facets['columnStateFooter']}" /> + + <h:outputLabel value="Capital Column Header:" /> + <h:inputText id="capitalHeaderInput" value="#{richExtendedDataTableBean.facets['columnCapitalHeader']}" /> + + <h:outputLabel value="Capital Column Footer:" /> + <h:inputText id="capitalFooterInput" value="#{richExtendedDataTableBean.facets['columnCapitalFooter']}" /> + </h:panelGrid> + </a4j:ajax> + <br/><br/> - + <metamer:attributes value="#{richExtendedDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -28,10 +28,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -93,7 +93,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -185,7 +185,7 @@ <h:outputText id="columnHeaderNumberOfKidsType" value="(expression &gt;=)" /> <br/> <rich:inputNumberSpinner id="spinnerFilter" minValue="0" maxValue="6" cycled="false" value="#{richExtendedDataTableBean.filtering['numberOfKids1']}"> - <a4j:ajax event="change" render="commonGrid" /> + <a4j:ajax event="change" render="commonGrid" /> </rich:inputNumberSpinner> </f:facet> @@ -202,7 +202,7 @@ <h:outputText id="columnHeaderNumberOfKids2Type" value="(expression &lt;)" /> <br/> <rich:inputNumberSlider id="sliderFilter" minValue="0" maxValue="6" value="#{richExtendedDataTableBean.filtering['numberOfKids2']}"> - <!-- <a4j:ajax render="commonGrid" /> --> + <!-- <a4j:ajax render="commonGrid" /> --> </rich:inputNumberSlider> <br /> (a4j:ajax disabled - RF-9900) Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -35,10 +35,10 @@ Simple page that contains <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes. </metamer:testPageLink> - <metamer:testPageLink id="facets" outcome="facets" value="Facets"> + <metamer:testPageLink id="facets" outcome="facets" value="Facets"> Page containing <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all facets dynamically changing. </metamer:testPageLink> - + <metamer:testPageLink id="scroller" outcome="scroller" value="Data Scroller"> Page that contains <b>rich:extendedDataTable</b> (with model containing capitals), data scroller and input boxes for all its attributes. </metamer:testPageLink> @@ -56,7 +56,7 @@ <metamer:testPageLink id="sorting-using-component-control" outcome="sorting-using-component-control" value="Table Sorting - Component Control"> <b>rich:extendedDataTable</b> (with model containing employees) sortable by <b>rich:componentControl</b>. </metamer:testPageLink> - + <metamer:testPageLink id="sorting-using-column" outcome="sorting-using-column" value="Table Sorting - Column based"> <b>rich:extendedDataTable</b> (with model containing employees) custom sorting by <b>rich:column</b>'s attribute @sortBy, @sortOrder. </metamer:testPageLink> @@ -64,7 +64,7 @@ <metamer:testPageLink id="filtering" outcome="filtering" value="Table Filtering"> Page that contains filterable <b>rich:extendedDataTable</b> (with model containing employees) and input boxes for all its attributes. </metamer:testPageLink> - + <metamer:testPageLink id="selection" outcome="selection" value="Selection"> Page that contains sample of <b>rich:extendedDataTable</b> selection model </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -28,10 +28,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -62,7 +62,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -128,52 +128,52 @@ <ui:define name="outOfTemplateAfter"> <fieldset> - <legend>scroller1</legend> - - <h:commandButton id="buttonFirst1" value="&lt;&lt; first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> - <f:param value="first" /> - </rich:componentControl> - </h:commandButton> - - <h:commandButton id="buttonPrev1" value="&lt; previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> - </h:commandButton> - - <h:commandButton id="buttonNext1" value="next &gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> - </h:commandButton> - - <h:commandButton id="buttonLast1" value="last &gt;&gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> - <f:param value="last" /> - </rich:componentControl> - </h:commandButton> + <legend>scroller1</legend> + + <h:commandButton id="buttonFirst1" value="&lt;&lt; first"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <f:param value="first" /> + </rich:componentControl> + </h:commandButton> + + <h:commandButton id="buttonPrev1" value="&lt; previous"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> + </h:commandButton> + + <h:commandButton id="buttonNext1" value="next &gt;"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> + </h:commandButton> + + <h:commandButton id="buttonLast1" value="last &gt;&gt;"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <f:param value="last" /> + </rich:componentControl> + </h:commandButton> </fieldset> - <c:set var="nestedScrollerId" value="#{nestedComponentId}:scroller2" /> - - <fieldset> - <legend>scroller2</legend> - <h:commandButton id="buttonFirst2" value="&lt;&lt; first"> - <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> - <f:param value="first" /> - </rich:componentControl> - </h:commandButton> - - <h:commandButton id="buttonPrev2" value="&lt; previous"> - <rich:componentControl event="click" target="#{nestedScrollerId}" operation="previous" /> - </h:commandButton> - - <h:commandButton id="buttonNext2" value="next &gt;"> - <rich:componentControl event="click" target="#{nestedScrollerId}" operation="next" /> - </h:commandButton> - - <h:commandButton id="buttonLast2" value="last &gt;&gt;"> - <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> - <f:param value="last" /> - </rich:componentControl> - </h:commandButton> + <c:set var="nestedScrollerId" value="#{nestedComponentId}:scroller2" /> + + <fieldset> + <legend>scroller2</legend> + <h:commandButton id="buttonFirst2" value="&lt;&lt; first"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> + <f:param value="first" /> + </rich:componentControl> + </h:commandButton> + + <h:commandButton id="buttonPrev2" value="&lt; previous"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="previous" /> + </h:commandButton> + + <h:commandButton id="buttonNext2" value="next &gt;"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="next" /> + </h:commandButton> + + <h:commandButton id="buttonLast2" value="last &gt;&gt;"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> + <f:param value="last" /> + </rich:componentControl> + </h:commandButton> </fieldset> <metamer:attributes value="#{richExtendedDataTableBean.attributes}" id="attributes" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -44,12 +44,12 @@ height: 300px !important; } .currentSelection { - font-weight: bold; - } - - .previousSelection { - color: gray; - } + font-weight: bold; + } + + .previousSelection { + color: gray; + } </style> </ui:define> @@ -68,7 +68,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -90,11 +90,11 @@ style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - - - <a4j:ajax execute="@this" event="beforeselectionchange" render="previousSelection" /> - <a4j:ajax execute="@this" event="selectionchange" render="currentSelection" /> - + + + <a4j:ajax execute="@this" event="beforeselectionchange" render="previousSelection" /> + <a4j:ajax execute="@this" event="selectionchange" render="currentSelection" /> + <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> </f:facet> @@ -135,20 +135,20 @@ </rich:extendedDataTable> </ui:define> - + <ui:define name="outOfTemplateAfter"> - <h:panelGrid columns="2"> - <h:outputLabel ajaxRendered="true" value="CurrentSelection:" styleClass="currentSelection" /> - <a4j:outputPanel ajaxRendered="true"> - <h:outputText id="currentSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" styleClass="currentSelection" /> - </a4j:outputPanel> - - <h:outputLabel value="Previous Selection:" styleClass="previousSelection" /> - <h:outputText id="previousSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" styleClass="previousSelection" /> + <h:panelGrid columns="2"> + <h:outputLabel ajaxRendered="true" value="CurrentSelection:" styleClass="currentSelection" /> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText id="currentSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" styleClass="currentSelection" /> + </a4j:outputPanel> + + <h:outputLabel value="Previous Selection:" styleClass="previousSelection" /> + <h:outputText id="previousSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" styleClass="previousSelection" /> </h:panelGrid> - + <br /><br /> - + <metamer:attributes value="#{richExtendedDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -60,7 +60,7 @@ <rich:extendedDataTable id="richEDT" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -81,11 +81,11 @@ sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - + - + <rich:column id="columnState" sortBy="#{record.state}"> <h:outputText value="#{record.state}" /> </rich:column> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -89,12 +89,12 @@ </ui:define> <ui:define name="component"> - + <rich:extendedDataTable id="richEDT" - binding="#{richExtendedDataTableBean.binding}" + binding="#{richExtendedDataTableBean.binding}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -120,7 +120,7 @@ <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> </f:facet> - + <rich:column id="columnSex" sortBy="#{record.sex}" sortOrder="#{richExtendedDataTableBean.sorting['columnSex'].order}"> <f:facet name="header"> <a4j:commandLink id="sortBySex" value="Sex" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnSex'].reverseOrder}" /> @@ -131,21 +131,21 @@ <rich:column id="columnName" sortBy="#{record.name}" sortOrder="#{richExtendedDataTableBean.sorting['columnName'].order}"> <f:facet name="header"> - <a4j:commandLink id="sortByName" value="Name" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnName'].reverseOrder}" /> + <a4j:commandLink id="sortByName" value="Name" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnName'].reverseOrder}" /> </f:facet> <h:outputText value="#{record.name}" /> </rich:column> <rich:column id="columnTitle" sortBy="#{record.title}" sortOrder="#{richExtendedDataTableBean.sorting['columnTitle'].order}"> <f:facet name="header"> - <a4j:commandLink id="sortByTitle" value="Title" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnTitle'].reverseOrder}" /> + <a4j:commandLink id="sortByTitle" value="Title" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnTitle'].reverseOrder}" /> </f:facet> <h:outputText value="#{record.title}" /> </rich:column> <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}" sortOrder="#{richExtendedDataTableBean.sorting['columnNumberOfKids'].order}"> <f:facet name="header"> - <a4j:commandLink id="sortByNumberOfKids" value="# of Kids" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnNumberOfKids'].reverseOrder}" /> + <a4j:commandLink id="sortByNumberOfKids" value="# of Kids" render="richEDT" action="#{richExtendedDataTableBean.sorting['columnNumberOfKids'].reverseOrder}" /> </f:facet> <h:outputText value="#{record.numberOfKids}" /> </rich:column> @@ -158,7 +158,7 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - + <a4j:commandButton id="sortReset" value="Reset Sorting" action="#{richExtendedDataTableBean.sorting.clear}" render="richEDT scroller1" /> <br/><br/> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richEDT" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richEDT" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -91,10 +91,10 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - binding="#{richExtendedDataTableBean.binding}" + binding="#{richExtendedDataTableBean.binding}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" - + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" @@ -120,14 +120,14 @@ <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> </f:facet> - + <rich:column id="columnSex" sortBy="#{record.sex}"> <f:facet name="header"> <h:commandLink id="sortSexes" value="Sex"> - <rich:componentControl event="click" target="richEDT" operation="sort"> - <f:param value="columnSex" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richEDT" operation="sort"> + <f:param value="columnSex" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:graphicImage library="images" name="#{record.sex == 'MALE' ? 'male.png' : 'female.png'}" alt="#{record.sex}" /> </rich:column> @@ -136,10 +136,10 @@ <rich:column id="columnName" sortBy="#{record.name}"> <f:facet name="header"> <h:commandLink id="sortByName" value="Name"> - <rich:componentControl event="click" target="richEDT" operation="sort"> - <f:param value="columnName" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richEDT" operation="sort"> + <f:param value="columnName" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:outputText value="#{record.name}" /> </rich:column> @@ -147,10 +147,10 @@ <rich:column id="columnTitle" sortBy="#{record.title}"> <f:facet name="header"> <h:commandLink id="sortByTitle" value="Title"> - <rich:componentControl event="click" target="richEDT" operation="sort"> - <f:param value="columnTitle" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richEDT" operation="sort"> + <f:param value="columnTitle" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:outputText value="#{record.title}" /> </rich:column> @@ -158,10 +158,10 @@ <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> <f:facet name="header"> <h:commandLink id="sortByNumberOfKids" value="Number of Kids"> - <rich:componentControl event="click" target="richEDT" operation="sort"> - <f:param value="columnNumberOfKids" /> - </rich:componentControl> - </h:commandLink> + <rich:componentControl event="click" target="richEDT" operation="sort"> + <f:param value="columnNumberOfKids" /> + </rich:componentControl> + </h:commandLink> </f:facet> <h:outputText value="#{record.numberOfKids}" /> </rich:column> @@ -174,7 +174,7 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - + <h:commandButton id="sortReset" value="Reset Sorting"> <rich:componentControl event="click" target="#{nestedComponentId}" operation="sort" /> </h:commandButton> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -34,7 +34,7 @@ <metamer:testPageLink id="simple" outcome="simple" value="Simple"> Simple page that contains <b>rich:list</b> (with model containing capitals) and "term" facet which influences list in definitions mode </metamer:testPageLink> - + <metamer:testPageLink id="scroller" outcome="scroller" value="Data Scroller"> Simple page that contains <b>rich:list</b> (with model containing capitals) with bound dataScroller </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richList" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richList" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -42,7 +42,7 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - <rich:dataScroller id="scroller1" for="richList" maxPages="7" render="#{nestedComponentId}" /> + <rich:dataScroller id="scroller1" for="richList" maxPages="7" render="#{nestedComponentId}" /> </ui:define> <ui:define name="component"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -54,7 +54,7 @@ <ui:define name="component"> <rich:toolbar id="toolbar" height="26px" width="500px;"> - <rich:dropDownMenu id="menu1" menu="ajax"> + <rich:dropDownMenu id="menu1" mode="ajax"> <f:facet name="label"> <h:panelGroup> <h:graphicImage library="images/icons" name="copy.gif" styleClass="pic" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -43,7 +43,7 @@ actionListener="#{richBean.dummyActionListener}" itemChangeListener="#{richPanelMenuBean.itemChangeListener}" activeItem="#{richPanelMenuBean.activeItem}" - + bubbleSelection="#{richPanelMenuBean.attributes['bubbleSelection'].value}" bypassUpdates="#{richPanelMenuBean.attributes['bypassUpdates'].value}" collapseEvent="#{richPanelMenuBean.attributes['collapseEvent'].value}" @@ -106,27 +106,27 @@ </rich:panelMenuGroup> <rich:panelMenuItem id="item1" name="item1" label="Item 1"/> - + <rich:panelMenuGroup id="group2" name="group2" label="Group 2"> <rich:panelMenuItem id="item21" name="item21" label="Item 2.1"/> <rich:panelMenuItem id="item22" name="item22" label="Item 2.2"/> <rich:panelMenuItem id="item23" name="item23" label="Item 2.3"/> - + <rich:panelMenuGroup id="group24" name="group24" label="Group 2.4"> <rich:panelMenuItem id="item241" name="item241" label="Item 2.4.1"/> <rich:panelMenuItem id="item242" name="item242" label="Item 2.4.2"/> <rich:panelMenuItem id="item243" name="item243" label="Item 2.4.3"/> </rich:panelMenuGroup> - + <rich:panelMenuItem id="item25" name="item25" disabled="true" label="Item 2.5"/> - + <rich:panelMenuGroup id="group26" name="group26" label="Group 2.6" disabled="true"> <rich:panelMenuItem id="item261" name="item261" label="Item 2.6.1"/> <rich:panelMenuItem id="item262" name="item262" label="Item 2.6.2"/> <rich:panelMenuItem id="item263" name="item263" label="Item 2.6.3"/> </rich:panelMenuGroup> </rich:panelMenuGroup> - + <rich:panelMenuItem id="item2" name="item2" label="Item 2" disabled="true" /> <rich:panelMenuGroup id="group3" name="group3" label="Group 3"> @@ -140,7 +140,7 @@ <rich:panelMenuItem id="item42" name="item42" label="Item 4.2"/> <rich:panelMenuItem id="item43" name="item43" label="Item 4.3"/> </rich:panelMenuGroup> - + <rich:panelMenuItem id="item3" name="item3" label="Item 3" /> <rich:panelMenuItem id="item4" name="item4" label="Item 4" disabled="true" /> <rich:panelMenuItem id="item5" name="item5" label="Item 5" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -46,122 +46,122 @@ <rich:panelMenuItem id="item12" name="item12" label="Item 1.2" /> <rich:panelMenuItem id="item13" name="item13" label="Item 1.3"/> </rich:panelMenuGroup> - + <rich:panelMenuGroup id="group2" name="group2" label="Group 2 (influenced by attributes)" - action="#{richBean.dummyAction}" - actionListener="#{richBean.dummyActionListener}" - changeExpandListener="#{richPanelMenuGroupBean.changeExpandListener}" - expanded="#{richPanelMenuGroupBean.expanded['group2']}" - - bubbleSelection="#{richPanelMenuGroupBean.attributes['bubbleSelection'].value}" - bypassUpdates="#{richPanelMenuGroupBean.attributes['bypassUpdates'].value}" - collapseEvent="#{richPanelMenuGroupBean.attributes['collapseEvent'].value}" - data="#{richPanelMenuGroupBean.attributes['data'].value}" - disabled="#{richPanelMenuGroupBean.attributes['disabled'].value}" - disabledClass="#{richPanelMenuGroupBean.attributes['disabledClass'].value}" - execute="#{richPanelMenuGroupBean.attributes['execute'].value}" - expandEvent="#{richPanelMenuGroupBean.attributes['expandEvent'].value}" - expandSingle="#{richPanelMenuGroupBean.attributes['expandSingle'].value}" - hoverClass="#{richPanelMenuGroupBean.attributes['hoverClass'].value}" - iconLeftClass="#{richPanelMenuGroupBean.attributes['iconLeftClass'].value}" - leftCollapsedIcon="#{richPanelMenuGroupBean.attributes['leftCollapsedIcon'].value}" - leftDisabledIcon="#{richPanelMenuGroupBean.attributes['leftDisabledIcon'].value}" - leftExpandedIcon="#{richPanelMenuGroupBean.attributes['leftExpandedIcon'].value}" - rightCollapsedIcon="#{richPanelMenuGroupBean.attributes['rightCollapsedIcon'].value}" - rightDisabledIcon="#{richPanelMenuGroupBean.attributes['rightDisabledIcon'].value}" - rightExpandedIcon="#{richPanelMenuGroupBean.attributes['rightExpandedIcon'].value}" - immediate="#{richPanelMenuGroupBean.attributes['immediate'].value}" - limitRender="#{richPanelMenuGroupBean.attributes['limitRender'].value}" - mode="#{richPanelMenuGroupBean.attributes['mode'].value}" - onbeforecollapse="#{richPanelMenuGroupBean.attributes['onbeforecollapse'].value}" - onbeforedomupdate="#{richPanelMenuGroupBean.attributes['onbeforedomupdate'].value}" - onbeforeexpand="#{richPanelMenuGroupBean.attributes['onbeforeexpand'].value}" - onbeforeselect="#{richPanelMenuGroupBean.attributes['onbeforeselect'].value}" - onbeforeswitch="#{richPanelMenuGroupBean.attributes['onbeforeswitch'].value}" - onbegin="#{richPanelMenuGroupBean.attributes['onbegin'].value}" - onclick="#{richPanelMenuGroupBean.attributes['onclick'].value}" - oncollapse="#{richPanelMenuGroupBean.attributes['oncollapse'].value}" - oncomplete="#{richPanelMenuGroupBean.attributes['oncomplete'].value}" - ondblclick="#{richPanelMenuGroupBean.attributes['ondblclick'].value}" - onexpand="#{richPanelMenuGroupBean.attributes['onexpand'].value}" - onmousedown="#{richPanelMenuGroupBean.attributes['onmousedown'].value}" - onmousemove="#{richPanelMenuGroupBean.attributes['onmousemove'].value}" - onmouseout="#{richPanelMenuGroupBean.attributes['onmouseout'].value}" - onmouseover="#{richPanelMenuGroupBean.attributes['onmouseover'].value}" - onmouseup="#{richPanelMenuGroupBean.attributes['onmouseup'].value}" - onselect="#{richPanelMenuGroupBean.attributes['onselect'].value}" - onswitch="#{richPanelMenuGroupBean.attributes['onswitch'].value}" - onunselect="#{richPanelMenuGroupBean.attributes['onunselect'].value}" - render="#{richPanelMenuGroupBean.attributes['render'].value}" - rendered="#{richPanelMenuGroupBean.attributes['rendered'].value}" - selectable="#{richPanelMenuGroupBean.attributes['selectable'].value}" - status="#{richPanelMenuGroupBean.attributes['status'].value}" - style="#{richPanelMenuGroupBean.attributes['style'].value}" - styleClass="#{richPanelMenuGroupBean.attributes['styleClass'].value}" - > + action="#{richBean.dummyAction}" + actionListener="#{richBean.dummyActionListener}" + changeExpandListener="#{richPanelMenuGroupBean.changeExpandListener}" + expanded="#{richPanelMenuGroupBean.expanded['group2']}" + + bubbleSelection="#{richPanelMenuGroupBean.attributes['bubbleSelection'].value}" + bypassUpdates="#{richPanelMenuGroupBean.attributes['bypassUpdates'].value}" + collapseEvent="#{richPanelMenuGroupBean.attributes['collapseEvent'].value}" + data="#{richPanelMenuGroupBean.attributes['data'].value}" + disabled="#{richPanelMenuGroupBean.attributes['disabled'].value}" + disabledClass="#{richPanelMenuGroupBean.attributes['disabledClass'].value}" + execute="#{richPanelMenuGroupBean.attributes['execute'].value}" + expandEvent="#{richPanelMenuGroupBean.attributes['expandEvent'].value}" + expandSingle="#{richPanelMenuGroupBean.attributes['expandSingle'].value}" + hoverClass="#{richPanelMenuGroupBean.attributes['hoverClass'].value}" + iconLeftClass="#{richPanelMenuGroupBean.attributes['iconLeftClass'].value}" + leftCollapsedIcon="#{richPanelMenuGroupBean.attributes['leftCollapsedIcon'].value}" + leftDisabledIcon="#{richPanelMenuGroupBean.attributes['leftDisabledIcon'].value}" + leftExpandedIcon="#{richPanelMenuGroupBean.attributes['leftExpandedIcon'].value}" + rightCollapsedIcon="#{richPanelMenuGroupBean.attributes['rightCollapsedIcon'].value}" + rightDisabledIcon="#{richPanelMenuGroupBean.attributes['rightDisabledIcon'].value}" + rightExpandedIcon="#{richPanelMenuGroupBean.attributes['rightExpandedIcon'].value}" + immediate="#{richPanelMenuGroupBean.attributes['immediate'].value}" + limitRender="#{richPanelMenuGroupBean.attributes['limitRender'].value}" + mode="#{richPanelMenuGroupBean.attributes['mode'].value}" + onbeforecollapse="#{richPanelMenuGroupBean.attributes['onbeforecollapse'].value}" + onbeforedomupdate="#{richPanelMenuGroupBean.attributes['onbeforedomupdate'].value}" + onbeforeexpand="#{richPanelMenuGroupBean.attributes['onbeforeexpand'].value}" + onbeforeselect="#{richPanelMenuGroupBean.attributes['onbeforeselect'].value}" + onbeforeswitch="#{richPanelMenuGroupBean.attributes['onbeforeswitch'].value}" + onbegin="#{richPanelMenuGroupBean.attributes['onbegin'].value}" + onclick="#{richPanelMenuGroupBean.attributes['onclick'].value}" + oncollapse="#{richPanelMenuGroupBean.attributes['oncollapse'].value}" + oncomplete="#{richPanelMenuGroupBean.attributes['oncomplete'].value}" + ondblclick="#{richPanelMenuGroupBean.attributes['ondblclick'].value}" + onexpand="#{richPanelMenuGroupBean.attributes['onexpand'].value}" + onmousedown="#{richPanelMenuGroupBean.attributes['onmousedown'].value}" + onmousemove="#{richPanelMenuGroupBean.attributes['onmousemove'].value}" + onmouseout="#{richPanelMenuGroupBean.attributes['onmouseout'].value}" + onmouseover="#{richPanelMenuGroupBean.attributes['onmouseover'].value}" + onmouseup="#{richPanelMenuGroupBean.attributes['onmouseup'].value}" + onselect="#{richPanelMenuGroupBean.attributes['onselect'].value}" + onswitch="#{richPanelMenuGroupBean.attributes['onswitch'].value}" + onunselect="#{richPanelMenuGroupBean.attributes['onunselect'].value}" + render="#{richPanelMenuGroupBean.attributes['render'].value}" + rendered="#{richPanelMenuGroupBean.attributes['rendered'].value}" + selectable="#{richPanelMenuGroupBean.attributes['selectable'].value}" + status="#{richPanelMenuGroupBean.attributes['status'].value}" + style="#{richPanelMenuGroupBean.attributes['style'].value}" + styleClass="#{richPanelMenuGroupBean.attributes['styleClass'].value}" + <rich:panelMenuItem id="item21" name="item21" label="Item 2.1"/> <rich:panelMenuItem id="item22" name="item22" label="Item 2.2" /> - + <rich:panelMenuGroup id="group23" name="group23" label="Group 2.3 (influenced by attributes)" - action="#{richBean.dummyAction}" - actionListener="#{richBean.dummyActionListener}" - changeExpandListener="#{richPanelMenuGroupBean.changeExpandListener}" - expanded="#{richPanelMenuGroupBean.expanded['group23']}" - - bubbleSelection="#{richPanelMenuGroupBean.attributes['bubbleSelection'].value}" - bypassUpdates="#{richPanelMenuGroupBean.attributes['bypassUpdates'].value}" - collapseEvent="#{richPanelMenuGroupBean.attributes['collapseEvent'].value}" - data="#{richPanelMenuGroupBean.attributes['data'].value}" - disabled="#{richPanelMenuGroupBean.attributes['disabled'].value}" - disabledClass="#{richPanelMenuGroupBean.attributes['disabledClass'].value}" - execute="#{richPanelMenuGroupBean.attributes['execute'].value}" - expandEvent="#{richPanelMenuGroupBean.attributes['expandEvent'].value}" - expandSingle="#{richPanelMenuGroupBean.attributes['expandSingle'].value}" - hoverClass="#{richPanelMenuGroupBean.attributes['hoverClass'].value}" - iconLeftClass="#{richPanelMenuGroupBean.attributes['iconLeftClass'].value}" - leftCollapsedIcon="#{richPanelMenuGroupBean.attributes['leftCollapsedIcon'].value}" - leftDisabledIcon="#{richPanelMenuGroupBean.attributes['leftDisabledIcon'].value}" - leftExpandedIcon="#{richPanelMenuGroupBean.attributes['leftExpandedIcon'].value}" - rightCollapsedIcon="#{richPanelMenuGroupBean.attributes['rightCollapsedIcon'].value}" - rightDisabledIcon="#{richPanelMenuGroupBean.attributes['rightDisabledIcon'].value}" - rightExpandedIcon="#{richPanelMenuGroupBean.attributes['rightExpandedIcon'].value}" - immediate="#{richPanelMenuGroupBean.attributes['immediate'].value}" - limitRender="#{richPanelMenuGroupBean.attributes['limitRender'].value}" - mode="#{richPanelMenuGroupBean.attributes['mode'].value}" - onbeforecollapse="#{richPanelMenuGroupBean.attributes['onbeforecollapse'].value}" - onbeforedomupdate="#{richPanelMenuGroupBean.attributes['onbeforedomupdate'].value}" - onbeforeexpand="#{richPanelMenuGroupBean.attributes['onbeforeexpand'].value}" - onbeforeselect="#{richPanelMenuGroupBean.attributes['onbeforeselect'].value}" - onbeforeswitch="#{richPanelMenuGroupBean.attributes['onbeforeswitch'].value}" - onbegin="#{richPanelMenuGroupBean.attributes['onbegin'].value}" - onclick="#{richPanelMenuGroupBean.attributes['onclick'].value}" - oncollapse="#{richPanelMenuGroupBean.attributes['oncollapse'].value}" - oncomplete="#{richPanelMenuGroupBean.attributes['oncomplete'].value}" - ondblclick="#{richPanelMenuGroupBean.attributes['ondblclick'].value}" - onexpand="#{richPanelMenuGroupBean.attributes['onexpand'].value}" - onmousedown="#{richPanelMenuGroupBean.attributes['onmousedown'].value}" - onmousemove="#{richPanelMenuGroupBean.attributes['onmousemove'].value}" - onmouseout="#{richPanelMenuGroupBean.attributes['onmouseout'].value}" - onmouseover="#{richPanelMenuGroupBean.attributes['onmouseover'].value}" - onmouseup="#{richPanelMenuGroupBean.attributes['onmouseup'].value}" - onselect="#{richPanelMenuGroupBean.attributes['onselect'].value}" - onswitch="#{richPanelMenuGroupBean.attributes['onswitch'].value}" - onunselect="#{richPanelMenuGroupBean.attributes['onunselect'].value}" - render="#{richPanelMenuGroupBean.attributes['render'].value}" - rendered="#{richPanelMenuGroupBean.attributes['rendered'].value}" - selectable="#{richPanelMenuGroupBean.attributes['selectable'].value}" - status="#{richPanelMenuGroupBean.attributes['status'].value}" - style="#{richPanelMenuGroupBean.attributes['style'].value}" - styleClass="#{richPanelMenuGroupBean.attributes['styleClass'].value}" - > - <rich:panelMenuItem id="item231" name="item231" label="Item 2.3.1"/> - <rich:panelMenuItem id="item232" name="item232" label="Item 2.3.2"/> - <rich:panelMenuItem id="item233" name="item233" label="Item 2.3.3"/> + action="#{richBean.dummyAction}" + actionListener="#{richBean.dummyActionListener}" + changeExpandListener="#{richPanelMenuGroupBean.changeExpandListener}" + expanded="#{richPanelMenuGroupBean.expanded['group23']}" + + bubbleSelection="#{richPanelMenuGroupBean.attributes['bubbleSelection'].value}" + bypassUpdates="#{richPanelMenuGroupBean.attributes['bypassUpdates'].value}" + collapseEvent="#{richPanelMenuGroupBean.attributes['collapseEvent'].value}" + data="#{richPanelMenuGroupBean.attributes['data'].value}" + disabled="#{richPanelMenuGroupBean.attributes['disabled'].value}" + disabledClass="#{richPanelMenuGroupBean.attributes['disabledClass'].value}" + execute="#{richPanelMenuGroupBean.attributes['execute'].value}" + expandEvent="#{richPanelMenuGroupBean.attributes['expandEvent'].value}" + expandSingle="#{richPanelMenuGroupBean.attributes['expandSingle'].value}" + hoverClass="#{richPanelMenuGroupBean.attributes['hoverClass'].value}" + iconLeftClass="#{richPanelMenuGroupBean.attributes['iconLeftClass'].value}" + leftCollapsedIcon="#{richPanelMenuGroupBean.attributes['leftCollapsedIcon'].value}" + leftDisabledIcon="#{richPanelMenuGroupBean.attributes['leftDisabledIcon'].value}" + leftExpandedIcon="#{richPanelMenuGroupBean.attributes['leftExpandedIcon'].value}" + rightCollapsedIcon="#{richPanelMenuGroupBean.attributes['rightCollapsedIcon'].value}" + rightDisabledIcon="#{richPanelMenuGroupBean.attributes['rightDisabledIcon'].value}" + rightExpandedIcon="#{richPanelMenuGroupBean.attributes['rightExpandedIcon'].value}" + immediate="#{richPanelMenuGroupBean.attributes['immediate'].value}" + limitRender="#{richPanelMenuGroupBean.attributes['limitRender'].value}" + mode="#{richPanelMenuGroupBean.attributes['mode'].value}" + onbeforecollapse="#{richPanelMenuGroupBean.attributes['onbeforecollapse'].value}" + onbeforedomupdate="#{richPanelMenuGroupBean.attributes['onbeforedomupdate'].value}" + onbeforeexpand="#{richPanelMenuGroupBean.attributes['onbeforeexpand'].value}" + onbeforeselect="#{richPanelMenuGroupBean.attributes['onbeforeselect'].value}" + onbeforeswitch="#{richPanelMenuGroupBean.attributes['onbeforeswitch'].value}" + onbegin="#{richPanelMenuGroupBean.attributes['onbegin'].value}" + onclick="#{richPanelMenuGroupBean.attributes['onclick'].value}" + oncollapse="#{richPanelMenuGroupBean.attributes['oncollapse'].value}" + oncomplete="#{richPanelMenuGroupBean.attributes['oncomplete'].value}" + ondblclick="#{richPanelMenuGroupBean.attributes['ondblclick'].value}" + onexpand="#{richPanelMenuGroupBean.attributes['onexpand'].value}" + onmousedown="#{richPanelMenuGroupBean.attributes['onmousedown'].value}" + onmousemove="#{richPanelMenuGroupBean.attributes['onmousemove'].value}" + onmouseout="#{richPanelMenuGroupBean.attributes['onmouseout'].value}" + onmouseover="#{richPanelMenuGroupBean.attributes['onmouseover'].value}" + onmouseup="#{richPanelMenuGroupBean.attributes['onmouseup'].value}" + onselect="#{richPanelMenuGroupBean.attributes['onselect'].value}" + onswitch="#{richPanelMenuGroupBean.attributes['onswitch'].value}" + onunselect="#{richPanelMenuGroupBean.attributes['onunselect'].value}" + render="#{richPanelMenuGroupBean.attributes['render'].value}" + rendered="#{richPanelMenuGroupBean.attributes['rendered'].value}" + selectable="#{richPanelMenuGroupBean.attributes['selectable'].value}" + status="#{richPanelMenuGroupBean.attributes['status'].value}" + style="#{richPanelMenuGroupBean.attributes['style'].value}" + styleClass="#{richPanelMenuGroupBean.attributes['styleClass'].value}" + + <rich:panelMenuItem id="item231" name="item231" label="Item 2.3.1"/> + <rich:panelMenuItem id="item232" name="item232" label="Item 2.3.2"/> + <rich:panelMenuItem id="item233" name="item233" label="Item 2.3.3"/> </rich:panelMenuGroup> - + <rich:panelMenuItem id="item24" name="item24" label="Item 2.4"/> </rich:panelMenuGroup> - + <rich:panelMenuGroup id="group3" name="group3" label="Group 3"> <rich:panelMenuItem id="item31" name="item31" label="Item 3.1"/> <rich:panelMenuItem id="item32" name="item32" label="Item 3.2" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -41,49 +41,49 @@ <rich:panelMenu id="panelMenu" style="width: 250px; " action="#{richBean.dummyAction}" actionListener="#{richBean.dummyActionListener}" - activeItem="#{richPanelMenuBean.attributes['activeItem'].value}" + activeItem="#{richPanelMenuBean.attributes['activeItem'].value}" itemChangeListener="#{richPanelMenuBean.itemChangeListener}"> <rich:panelMenuGroup id="group1" name="group1" label="Group 1" expanded="true"> <rich:panelMenuItem id="item11" name="item11" label="Item 1.1"/> <rich:panelMenuItem id="item12" name="item12" label="Item 1.2 (influenced by attributes)" - action="#{richBean.dummyAction}" - actionListener="#{richBean.dummyActionListener}" - bypassUpdates="#{richPanelMenuItemBean.attributes['bypassUpdates'].value}" - data="#{richPanelMenuItemBean.attributes['data'].value}" - disabled="#{richPanelMenuItemBean.attributes['disabled'].value}" - disabledClass="#{richPanelMenuItemBean.attributes['disabledClass'].value}" - execute="#{richPanelMenuItemBean.attributes['execute'].value}" - hoverClass="#{richPanelMenuItemBean.attributes['hoverClass'].value}" - leftIcon="#{richPanelMenuItemBean.attributes['leftIcon'].value}" - leftIconClass="#{richPanelMenuItemBean.attributes['leftIconClass'].value}" - leftDisabledIcon="#{richPanelMenuItemBean.attributes['leftDisabledIcon'].value}" - rightIcon="#{richPanelMenuItemBean.attributes['rightIcon'].value}" - rightIconClass="#{richPanelMenuItemBean.attributes['rightIconClass'].value}" - rightDisabledIcon="#{richPanelMenuItemBean.attributes['rightDisabledIcon'].value}" - immediate="#{richPanelMenuItemBean.attributes['immediate'].value}" - limitRender="#{richPanelMenuItemBean.attributes['limitRender'].value}" - mode="#{richPanelMenuItemBean.attributes['mode'].value}" - onbeforedomupdate="#{richPanelMenuItemBean.attributes['onbeforedomupdate'].value}" - onbeforeselect="#{richPanelMenuItemBean.attributes['onbeforeselect'].value}" - onbegin="#{richPanelMenuItemBean.attributes['onbegin'].value}" - onclick="#{richPanelMenuItemBean.attributes['onclick'].value}" - oncomplete="#{richPanelMenuItemBean.attributes['oncomplete'].value}" - ondblclick="#{richPanelMenuItemBean.attributes['ondblclick'].value}" - onmousedown="#{richPanelMenuItemBean.attributes['onmousedown'].value}" - onmousemove="#{richPanelMenuItemBean.attributes['onmousemove'].value}" - onmouseout="#{richPanelMenuItemBean.attributes['onmouseout'].value}" - onmouseover="#{richPanelMenuItemBean.attributes['onmouseover'].value}" - onmouseup="#{richPanelMenuItemBean.attributes['onmouseup'].value}" - onselect="#{richPanelMenuItemBean.attributes['onselect'].value}" - onunselect="#{richPanelMenuItemBean.attributes['onunselect'].value}" - render="#{richPanelMenuItemBean.attributes['render'].value}" - rendered="#{richPanelMenuItemBean.attributes['rendered'].value}" - selectable="#{richPanelMenuItemBean.attributes['selectable'].value}" - status="#{richPanelMenuItemBean.attributes['status'].value}" - style="#{richPanelMenuItemBean.attributes['style'].value}" - styleClass="#{richPanelMenuItemBean.attributes['styleClass'].value}" - /> + action="#{richBean.dummyAction}" + actionListener="#{richBean.dummyActionListener}" + bypassUpdates="#{richPanelMenuItemBean.attributes['bypassUpdates'].value}" + data="#{richPanelMenuItemBean.attributes['data'].value}" + disabled="#{richPanelMenuItemBean.attributes['disabled'].value}" + disabledClass="#{richPanelMenuItemBean.attributes['disabledClass'].value}" + execute="#{richPanelMenuItemBean.attributes['execute'].value}" + hoverClass="#{richPanelMenuItemBean.attributes['hoverClass'].value}" + leftIcon="#{richPanelMenuItemBean.attributes['leftIcon'].value}" + leftIconClass="#{richPanelMenuItemBean.attributes['leftIconClass'].value}" + leftDisabledIcon="#{richPanelMenuItemBean.attributes['leftDisabledIcon'].value}" + rightIcon="#{richPanelMenuItemBean.attributes['rightIcon'].value}" + rightIconClass="#{richPanelMenuItemBean.attributes['rightIconClass'].value}" + rightDisabledIcon="#{richPanelMenuItemBean.attributes['rightDisabledIcon'].value}" + immediate="#{richPanelMenuItemBean.attributes['immediate'].value}" + limitRender="#{richPanelMenuItemBean.attributes['limitRender'].value}" + mode="#{richPanelMenuItemBean.attributes['mode'].value}" + onbeforedomupdate="#{richPanelMenuItemBean.attributes['onbeforedomupdate'].value}" + onbeforeselect="#{richPanelMenuItemBean.attributes['onbeforeselect'].value}" + onbegin="#{richPanelMenuItemBean.attributes['onbegin'].value}" + onclick="#{richPanelMenuItemBean.attributes['onclick'].value}" + oncomplete="#{richPanelMenuItemBean.attributes['oncomplete'].value}" + ondblclick="#{richPanelMenuItemBean.attributes['ondblclick'].value}" + onmousedown="#{richPanelMenuItemBean.attributes['onmousedown'].value}" + onmousemove="#{richPanelMenuItemBean.attributes['onmousemove'].value}" + onmouseout="#{richPanelMenuItemBean.attributes['onmouseout'].value}" + onmouseover="#{richPanelMenuItemBean.attributes['onmouseover'].value}" + onmouseup="#{richPanelMenuItemBean.attributes['onmouseup'].value}" + onselect="#{richPanelMenuItemBean.attributes['onselect'].value}" + onunselect="#{richPanelMenuItemBean.attributes['onunselect'].value}" + render="#{richPanelMenuItemBean.attributes['render'].value}" + rendered="#{richPanelMenuItemBean.attributes['rendered'].value}" + selectable="#{richPanelMenuItemBean.attributes['selectable'].value}" + status="#{richPanelMenuItemBean.attributes['status'].value}" + style="#{richPanelMenuItemBean.attributes['style'].value}" + styleClass="#{richPanelMenuItemBean.attributes['styleClass'].value}" + /> <rich:panelMenuItem id="item13" name="item13" label="Item 1.3"/> </rich:panelMenuGroup> </rich:panelMenu> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,8 +2,7 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" - xmlns:c="http://java.sun.com/jsp/jstl/core"> + xmlns:rich="http://richfaces.org/rich"> <!-- JBoss, Home of Professional Open Source @@ -28,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="dontRenderForm" value="true" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -44,27 +44,27 @@ var intervalID; function updateProgress(i) { - #{rich:component('progressBar')}.setValue(counter*2); + #{rich:component('progressBar')}.setValue(counter*2); if ((counter++)>50){ clearInterval(intervalID); - #{rich:element('startButton')}.disabled=false; - #{rich:element('pauseButton')}.disabled=true; + #{rich:element('startButton')}.disabled=false; + #{rich:element('pauseButton')}.disabled=true; counter=1; } } function startProgress(){ - #{rich:element('startButton')}.disabled=true; - #{rich:element('pauseButton')}.disabled=false; - #{rich:component('progressBar')}.enable(); - #{rich:component('progressBar')}.setValue(counter*2); + #{rich:element('startButton')}.disabled=true; + #{rich:element('pauseButton')}.disabled=false; + #{rich:component('progressBar')}.enable(); + #{rich:component('progressBar')}.setValue(counter*2); intervalID = setInterval(updateProgress,1000); } function pauseProgress(){ - #{rich:element('startButton')}.disabled=false; - #{rich:element('pauseButton')}.disabled=true; - #{rich:component('progressBar')}.disable(); + #{rich:element('startButton')}.disabled=false; + #{rich:element('pauseButton')}.disabled=true; + #{rich:component('progressBar')}.disable(); clearInterval(intervalID); } //]]> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,7 +2,7 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich" > <!-- JBoss, Home of Professional Open Source @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,7 +2,7 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich"> <!-- JBoss, Home of Professional Open Source @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -40,11 +40,11 @@ <rich:tabPanel id="tabPanel" itemChangeListener="#{richBean.itemChangeListener}"> - + <rich:tab id="tab1" action="#{richBean.dummyAction}" actionListener="#{richBean.dummyActionListener}" - + contentClass="#{richTabBean.attributes['contentClass'].value}" bypassUpdates="#{richTabBean.attributes['bypassUpdates'].value}" dir="#{richTabBean.attributes['dir'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:h="http://java.sun.com/jsf/html"> + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:h="http://java.sun.com/jsf/html"> <!-- JBoss, Home of Professional Open Source Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -26,9 +26,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -2,7 +2,7 @@ <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich" > <!-- JBoss, Home of Professional Open Source @@ -27,15 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - + <ui:define name="head"> <style type="text/css"> .pic { Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -27,15 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> </ui:define> - + <ui:define name="head"> <style type="text/css"> .pic { Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -34,7 +34,7 @@ <metamer:testPageLink id="simple" outcome="simple" value="Simple"> The sample of <b>rich:tooltip</b> by default targeted to its parent (rich:panel). </metamer:testPageLink> - + <metamer:testPageLink id="targetting" outcome="targetting" value="Targetting"> The sample of <b>rich:tooltip</b> with ability to change target. </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich" > <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -37,69 +37,68 @@ </ui:define> <ui:define name="head"> - <h:outputStylesheet> - .sample-panel { - border: 1px solid black; - background: solid white; - } - </h:outputStylesheet> + <style type="text/css"> + .sample-panel { + border: 1px solid black; + background: white; + } + </style> </ui:define> <ui:define name="component"> - + <rich:panel id="panel" style="width: 200px"> - + Panel's content 8 - - <rich:tooltip id="tooltip" - attached="#{richTooltipBean.attributes['attached'].value}" - bypassUpdates="#{richTooltipBean.attributes['bypassUpdates'].value}" - data="#{richTooltipBean.attributes['data'].value}" - dir="#{richTooltipBean.attributes['dir'].value}" - direction="#{richTooltipBean.attributes['direction'].value}" - disabled="#{richTooltipBean.attributes['disabled'].value}" - execute="#{richTooltipBean.attributes['execute'].value}" - followMouse="#{richTooltipBean.attributes['followMouse'].value}" - hideDelay="#{richTooltipBean.attributes['hideDelay'].value}" - hideEvent="#{richTooltipBean.attributes['hideEvent'].value}" - horizontalOffset="#{richTooltipBean.attributes['horizontalOffset'].value}" - jointPoint="#{richTooltipBean.attributes['jointPoint'].value}" - lang="#{richTooltipBean.attributes['lang'].value}" - layout="#{richTooltipBean.attributes['layout'].value}" - limitRender="#{richTooltipBean.attributes['limitRender'].value}" - mode="#{richTooltipBean.attributes['mode'].value}" - onbeforehide="#{richTooltipBean.attributes['onbeforehide'].value}" - onbeforeshow="#{richTooltipBean.attributes['onbeforeshow'].value}" - onclick="#{richTooltipBean.attributes['onclick'].value}" - ondblclick="#{richTooltipBean.attributes['ondblclick'].value}" - onhide="#{richTooltipBean.attributes['onhide'].value}" - onmousedown="#{richTooltipBean.attributes['onmousedown'].value}" - onmousemove="#{richTooltipBean.attributes['onmousemove'].value}" - onmouseout="#{richTooltipBean.attributes['onmouseout'].value}" - onmouseover="#{richTooltipBean.attributes['onmouseover'].value}" - onmouseup="#{richTooltipBean.attributes['onmouseup'].value}" - onbegin="#{richTooltipBean.attributes['onbegin'].value}" - onbeforedomupdate="#{richTooltipBean.attributes['onbeforedomupdate'].value}" - oncomplete="#{richTooltipBean.attributes['oncomplete'].value}" - onshow="#{richTooltipBean.attributes['onshow'].value}" - render="#{richTooltipBean.attributes['render'].value}" - rendered="#{richTooltipBean.attributes['rendered'].value}" - showDelay="#{richTooltipBean.attributes['showDelay'].value}" - showEvent="#{richTooltipBean.attributes['showEvent'].value}" - status="#{richTooltipBean.attributes['status'].value}" - style="#{richTooltipBean.attributes['style'].value}" - styleClass="#{richTooltipBean.attributes['styleClass'].value}" - title="#{richTooltipBean.attributes['title'].value}" - verticalOffset="#{richTooltipBean.attributes['verticalOffset'].value}" - zindex="#{richTooltipBean.attributes['zindex'].value}" - > - - - Tooltip content (counter: #{richTooltipBean.counter}) - - </rich:tooltip> - </rich:panel> - + + <rich:tooltip id="tooltip" + attached="#{richTooltipBean.attributes['attached'].value}" + bypassUpdates="#{richTooltipBean.attributes['bypassUpdates'].value}" + data="#{richTooltipBean.attributes['data'].value}" + dir="#{richTooltipBean.attributes['dir'].value}" + direction="#{richTooltipBean.attributes['direction'].value}" + disabled="#{richTooltipBean.attributes['disabled'].value}" + execute="#{richTooltipBean.attributes['execute'].value}" + followMouse="#{richTooltipBean.attributes['followMouse'].value}" + hideDelay="#{richTooltipBean.attributes['hideDelay'].value}" + hideEvent="#{richTooltipBean.attributes['hideEvent'].value}" + horizontalOffset="#{richTooltipBean.attributes['horizontalOffset'].value}" + jointPoint="#{richTooltipBean.attributes['jointPoint'].value}" + lang="#{richTooltipBean.attributes['lang'].value}" + layout="#{richTooltipBean.attributes['layout'].value}" + limitRender="#{richTooltipBean.attributes['limitRender'].value}" + mode="#{richTooltipBean.attributes['mode'].value}" + onbeforehide="#{richTooltipBean.attributes['onbeforehide'].value}" + onbeforeshow="#{richTooltipBean.attributes['onbeforeshow'].value}" + onclick="#{richTooltipBean.attributes['onclick'].value}" + ondblclick="#{richTooltipBean.attributes['ondblclick'].value}" + onhide="#{richTooltipBean.attributes['onhide'].value}" + onmousedown="#{richTooltipBean.attributes['onmousedown'].value}" + onmousemove="#{richTooltipBean.attributes['onmousemove'].value}" + onmouseout="#{richTooltipBean.attributes['onmouseout'].value}" + onmouseover="#{richTooltipBean.attributes['onmouseover'].value}" + onmouseup="#{richTooltipBean.attributes['onmouseup'].value}" + onbegin="#{richTooltipBean.attributes['onbegin'].value}" + onbeforedomupdate="#{richTooltipBean.attributes['onbeforedomupdate'].value}" + oncomplete="#{richTooltipBean.attributes['oncomplete'].value}" + onshow="#{richTooltipBean.attributes['onshow'].value}" + render="#{richTooltipBean.attributes['render'].value}" + rendered="#{richTooltipBean.attributes['rendered'].value}" + showDelay="#{richTooltipBean.attributes['showDelay'].value}" + showEvent="#{richTooltipBean.attributes['showEvent'].value}" + status="#{richTooltipBean.attributes['status'].value}" + style="#{richTooltipBean.attributes['style'].value}" + styleClass="#{richTooltipBean.attributes['styleClass'].value}" + title="#{richTooltipBean.attributes['title'].value}" + verticalOffset="#{richTooltipBean.attributes['verticalOffset'].value}" + zindex="#{richTooltipBean.attributes['zindex'].value}" + > + + Tooltip content (counter: #{richTooltipBean.counter}) + + </rich:tooltip> + </rich:panel> + </ui:define> <ui:define name="outOfTemplateAfter"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -37,78 +37,71 @@ </ui:define> <ui:define name="head"> - <h:outputStylesheet> - .sample-panel { - border: 1px solid black; - background: solid white; - } - </h:outputStylesheet> + <style type="text/css"> + .sample-panel { + border: 1px solid black; + background: white; + } + </style> </ui:define> <ui:define name="component"> - - <div id="regular-div" class="sample-panel">Div with clientId="regular-div"</div> - - <a4j:outputPanel styleClass="sample-panel" id="jsf-div" layout="block"> + + <div id="regular-div" class="sample-panel">Div with clientId="regular-div"</div> + + <a4j:outputPanel styleClass="sample-panel" id="jsf-div" layout="block"> Div with id="jsf-div", clientId="#{rich:clientId('jsf-div')}" - </a4j:outputPanel> - + </a4j:outputPanel> + <rich:panel id="panel" style="width: 200px"> - + Panel's content 3 (id="panel", clientId="#{rich:clientId('panel')}") - - <rich:tooltip id="tooltip" - attached="#{richTooltipBean.attributes['attached'].value}" - bypassUpdates="#{richTooltipBean.attributes['bypassUpdates'].value}" - data="#{richTooltipBean.attributes['data'].value}" - dir="#{richTooltipBean.attributes['dir'].value}" - direction="#{richTooltipBean.attributes['direction'].value}" - disabled="#{richTooltipBean.attributes['disabled'].value}" - execute="#{richTooltipBean.attributes['execute'].value}" - followMouse="#{richTooltipBean.attributes['followMouse'].value}" - hideDelay="#{richTooltipBean.attributes['hideDelay'].value}" - hideEvent="#{richTooltipBean.attributes['hideEvent'].value}" - horizontalOffset="#{richTooltipBean.attributes['horizontalOffset'].value}" - jointPoint="#{richTooltipBean.attributes['jointPoint'].value}" - lang="#{richTooltipBean.attributes['lang'].value}" - layout="#{richTooltipBean.attributes['layout'].value}" - limitRender="#{richTooltipBean.attributes['limitRender'].value}" - mode="#{richTooltipBean.attributes['mode'].value}" - onbeforehide="#{richTooltipBean.attributes['onbeforehide'].value}" - onbeforeshow="#{richTooltipBean.attributes['onbeforeshow'].value}" - onclick="#{richTooltipBean.attributes['onclick'].value}" - ondblclick="#{richTooltipBean.attributes['ondblclick'].value}" - onhide="#{richTooltipBean.attributes['onhide'].value}" - onmousedown="#{richTooltipBean.attributes['onmousedown'].value}" - onmousemove="#{richTooltipBean.attributes['onmousemove'].value}" - onmouseout="#{richTooltipBean.attributes['onmouseout'].value}" - onmouseover="#{richTooltipBean.attributes['onmouseover'].value}" - onmouseup="#{richTooltipBean.attributes['onmouseup'].value}" - onshow="#{richTooltipBean.attributes['onshow'].value}" - rendered="#{richTooltipBean.attributes['rendered'].value}" - showDelay="#{richTooltipBean.attributes['showDelay'].value}" - showEvent="#{richTooltipBean.attributes['showEvent'].value}" - status="#{richTooltipBean.attributes['status'].value}" - style="#{richTooltipBean.attributes['style'].value}" - styleClass="#{richTooltipBean.attributes['styleClass'].value}" - target="#{richTooltipBean.attributes['target'].value}" - title="#{richTooltipBean.attributes['title'].value}" - verticalOffset="#{richTooltipBean.attributes['verticalOffset'].value}" - zindex="#{richTooltipBean.attributes['zindex'].value}"> - - - Tooltip content - - </rich:tooltip> - - <!-- - - - - verticalOffset="#{richTooltipBean.attributes['verticalOffset'].value}" - --> - </rich:panel> - + + <rich:tooltip id="tooltip" + attached="#{richTooltipBean.attributes['attached'].value}" + bypassUpdates="#{richTooltipBean.attributes['bypassUpdates'].value}" + data="#{richTooltipBean.attributes['data'].value}" + dir="#{richTooltipBean.attributes['dir'].value}" + direction="#{richTooltipBean.attributes['direction'].value}" + disabled="#{richTooltipBean.attributes['disabled'].value}" + execute="#{richTooltipBean.attributes['execute'].value}" + followMouse="#{richTooltipBean.attributes['followMouse'].value}" + hideDelay="#{richTooltipBean.attributes['hideDelay'].value}" + hideEvent="#{richTooltipBean.attributes['hideEvent'].value}" + horizontalOffset="#{richTooltipBean.attributes['horizontalOffset'].value}" + jointPoint="#{richTooltipBean.attributes['jointPoint'].value}" + lang="#{richTooltipBean.attributes['lang'].value}" + layout="#{richTooltipBean.attributes['layout'].value}" + limitRender="#{richTooltipBean.attributes['limitRender'].value}" + mode="#{richTooltipBean.attributes['mode'].value}" + onbeforehide="#{richTooltipBean.attributes['onbeforehide'].value}" + onbeforeshow="#{richTooltipBean.attributes['onbeforeshow'].value}" + onclick="#{richTooltipBean.attributes['onclick'].value}" + ondblclick="#{richTooltipBean.attributes['ondblclick'].value}" + onhide="#{richTooltipBean.attributes['onhide'].value}" + onmousedown="#{richTooltipBean.attributes['onmousedown'].value}" + onmousemove="#{richTooltipBean.attributes['onmousemove'].value}" + onmouseout="#{richTooltipBean.attributes['onmouseout'].value}" + onmouseover="#{richTooltipBean.attributes['onmouseover'].value}" + onmouseup="#{richTooltipBean.attributes['onmouseup'].value}" + onshow="#{richTooltipBean.attributes['onshow'].value}" + rendered="#{richTooltipBean.attributes['rendered'].value}" + showDelay="#{richTooltipBean.attributes['showDelay'].value}" + showEvent="#{richTooltipBean.attributes['showEvent'].value}" + status="#{richTooltipBean.attributes['status'].value}" + style="#{richTooltipBean.attributes['style'].value}" + styleClass="#{richTooltipBean.attributes['styleClass'].value}" + target="#{richTooltipBean.attributes['target'].value}" + title="#{richTooltipBean.attributes['title'].value}" + verticalOffset="#{richTooltipBean.attributes['verticalOffset'].value}" + zindex="#{richTooltipBean.attributes['zindex'].value}"> + + + Tooltip content + + </rich:tooltip> + </rich:panel> + </ui:define> <ui:define name="outOfTemplateAfter"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/list.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/list.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -5,7 +5,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -34,7 +34,7 @@ <metamer:testPageLink id="simple" outcome="simple" value="Simple"> The simple sample of <b>rich:tree</b> usage including all its attributes. </metamer:testPageLink> - + <metamer:testPageLink id="treeAdaptors" outcome="treeAdaptors" value="Tree Adaptors"> The <b>rich:tree</b> with declarative model using <b>rich:treeModelRecursiveAdaptor</b> and <b>rich:treeModelAdaptor</b>. </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,10 +27,10 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richTree" /> - - <ui:define name="view"> - <f:metadata> + <ui:param name="componentId" value="richTree" /> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> @@ -39,280 +39,280 @@ </ui:define> <ui:define name="component"> - - <h3><b>rich:tree</b></h3> - - <p> - <rich:tree id="richTree" - nodeType="#{node.type}" - var="node" - value="#{richTreeBean.root}" - selection="#{richTreeBean.selection}" - selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" - toggleListener="#{richTreeListenerBean.processToggle}" - - data="#{richTreeBean.attributes['data'].value}" - dir="#{richTreeBean.attributes['dir'].value}" - execute="#{richTreeBean.attributes['execute'].value}" - handleClass="#{richTreeBean.attributes['handleClass'].value}" - iconClass="#{richTreeBean.attributes['iconClass'].value}" - iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}" - iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}" - iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}" - immediate="#{richTreeBean.attributes['immediate'].value}" - keepSaved="#{richTreeBean.attributes['keepSaved'].value}" - labelClass="#{richTreeBean.attributes['labelClass'].value}" - lang="#{richTreeBean.attributes['lang'].value}" - limitRender="#{richTreeBean.attributes['limitRender'].value}" - nodeClass="#{richTreeBean.attributes['nodeClass'].value}" - onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}" - onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}" - onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}" - onbegin="#{richTreeBean.attributes['onbegin'].value}" - onclick="#{richTreeBean.attributes['onclick'].value}" - oncomplete="#{richTreeBean.attributes['oncomplete'].value}" - ondblclick="#{richTreeBean.attributes['ondblclick'].value}" - onkeydown="#{richTreeBean.attributes['onkeydown'].value}" - onkeypress="#{richTreeBean.attributes['onkeypress'].value}" - onkeyup="#{richTreeBean.attributes['onkeyup'].value}" - onmousedown="#{richTreeBean.attributes['onmousedown'].value}" - onmousemove="#{richTreeBean.attributes['onmousemove'].value}" - onmouseout="#{richTreeBean.attributes['onmouseout'].value}" - onmouseover="#{richTreeBean.attributes['onmouseover'].value}" - onmouseup="#{richTreeBean.attributes['onmouseup'].value}" - onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}" - onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}" - render="#{richTreeBean.attributes['render'].value}" - rendered="#{richTreeBean.attributes['rendered'].value}" - selectionType="#{richTreeBean.attributes['selectionType'].value}" - status="#{richTreeBean.attributes['status'].value}" - style="#{richTreeBean.attributes['style'].value}" - styleClass="#{richTreeBean.attributes['styleClass'].value}" - title="#{richTreeBean.attributes['title'].value}" - toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}" - toggleType="#{richTreeBean.attributes['toggleType'].value}" - > - - <rich:treeNode type="country" - expanded="#{richTreeBean.expanded[node]}" - - dir="#{richTreeNodeBean.attributes[0]['dir'].value}" - handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}" - iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}" - iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}" - iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}" - iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}" - immediate="#{richTreeNodeBean.attributes[0]['immediate'].value}" - labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}" - lang="#{richTreeNodeBean.attributes[0]['lang'].value}" - onbeforetoggle="#{richTreeNodeBean.attributes[0]['onbeforetoggle'].value}" - onclick="#{richTreeNodeBean.attributes[0]['onclick'].value}" - ondblclick="#{richTreeNodeBean.attributes[0]['ondblclick'].value}" - onkeydown="#{richTreeNodeBean.attributes[0]['onkeydown'].value}" - onkeypress="#{richTreeNodeBean.attributes[0]['onkeypress'].value}" - onkeyup="#{richTreeNodeBean.attributes[0]['onkeyup'].value}" - onmousedown="#{richTreeNodeBean.attributes[0]['onmousedown'].value}" - onmousemove="#{richTreeNodeBean.attributes[0]['onmousemove'].value}" - onmouseout="#{richTreeNodeBean.attributes[0]['onmouseout'].value}" - onmouseover="#{richTreeNodeBean.attributes[0]['onmouseover'].value}" - onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}" - ontoggle="#{richTreeNodeBean.attributes[0]['ontoggle'].value}" - rendered="#{richTreeNodeBean.attributes[0]['rendered'].value}" - style="#{richTreeNodeBean.attributes[0]['style'].value}" - styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}" - title="#{richTreeNodeBean.attributes[0]['title'].value}" - > - <f:facet name="handleLoading"> - <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> - </f:facet> - #{node.name} - </rich:treeNode> - - <rich:treeNode type="company" - expanded="#{richTreeBean.expanded[node]}" - - dir="#{richTreeNodeBean.attributes[1]['dir'].value}" - handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}" - iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}" - iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}" - iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}" - iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}" - immediate="#{richTreeNodeBean.attributes[1]['immediate'].value}" - labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}" - lang="#{richTreeNodeBean.attributes[1]['lang'].value}" - onbeforetoggle="#{richTreeNodeBean.attributes[1]['onbeforetoggle'].value}" - onclick="#{richTreeNodeBean.attributes[1]['onclick'].value}" - ondblclick="#{richTreeNodeBean.attributes[1]['ondblclick'].value}" - onkeydown="#{richTreeNodeBean.attributes[1]['onkeydown'].value}" - onkeypress="#{richTreeNodeBean.attributes[1]['onkeypress'].value}" - onkeyup="#{richTreeNodeBean.attributes[1]['onkeyup'].value}" - onmousedown="#{richTreeNodeBean.attributes[1]['onmousedown'].value}" - onmousemove="#{richTreeNodeBean.attributes[1]['onmousemove'].value}" - onmouseout="#{richTreeNodeBean.attributes[1]['onmouseout'].value}" - onmouseover="#{richTreeNodeBean.attributes[1]['onmouseover'].value}" - onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}" - ontoggle="#{richTreeNodeBean.attributes[1]['ontoggle'].value}" - rendered="#{richTreeNodeBean.attributes[1]['rendered'].value}" - style="#{richTreeNodeBean.attributes[1]['style'].value}" - styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}" - title="#{richTreeNodeBean.attributes[1]['title'].value}" - > - <f:facet name="handleLoading"> - <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> - </f:facet> - - #{node.name} - </rich:treeNode> - - <rich:treeNode type="cd" - expanded="#{richTreeBean.expanded[node]}" - - dir="#{richTreeNodeBean.attributes[2]['dir'].value}" - handleClass="#{richTreeNodeBean.attributes[2]['handleClass'].value}" - iconClass="#{richTreeNodeBean.attributes[2]['iconClass'].value}" - iconCollapsed="#{richTreeNodeBean.attributes[2]['iconCollapsed'].value}" - iconExpanded="#{richTreeNodeBean.attributes[2]['iconExpanded'].value}" - iconLeaf="#{richTreeNodeBean.attributes[2]['iconLeaf'].value}" - immediate="#{richTreeNodeBean.attributes[2]['immediate'].value}" - labelClass="#{richTreeNodeBean.attributes[2]['labelClass'].value}" - lang="#{richTreeNodeBean.attributes[2]['lang'].value}" - onbeforetoggle="#{richTreeNodeBean.attributes[2]['onbeforetoggle'].value}" - onclick="#{richTreeNodeBean.attributes[2]['onclick'].value}" - ondblclick="#{richTreeNodeBean.attributes[2]['ondblclick'].value}" - onkeydown="#{richTreeNodeBean.attributes[2]['onkeydown'].value}" - onkeypress="#{richTreeNodeBean.attributes[2]['onkeypress'].value}" - onkeyup="#{richTreeNodeBean.attributes[2]['onkeyup'].value}" - onmousedown="#{richTreeNodeBean.attributes[2]['onmousedown'].value}" - onmousemove="#{richTreeNodeBean.attributes[2]['onmousemove'].value}" - onmouseout="#{richTreeNodeBean.attributes[2]['onmouseout'].value}" - onmouseover="#{richTreeNodeBean.attributes[2]['onmouseover'].value}" - onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}" - ontoggle="#{richTreeNodeBean.attributes[2]['ontoggle'].value}" - rendered="#{richTreeNodeBean.attributes[2]['rendered'].value}" - style="#{richTreeNodeBean.attributes[2]['style'].value}" - styleClass="#{richTreeNodeBean.attributes[2]['styleClass'].value}" - title="#{richTreeNodeBean.attributes[2]['title'].value}" - > - #{node.artist} - #{node.title} - </rich:treeNode> - </rich:tree> - </p> - - <h3><b>rich:tree</b> - with default tree nodes</h3> - <div>(uses toString on TreeNode as content)</div> - - <p> - - - <rich:tree id="richTreeDefaultNodes" - var="node" - value="#{richTreeBean.root}" - - dir="#{richTreeBean.attributes['dir'].value}" - lang="#{richTreeBean.attributes['lang'].value}" - onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}" - onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}" - onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}" - onbegin="#{richTreeBean.attributes['onbegin'].value}" - onclick="#{richTreeBean.attributes['onclick'].value}" - oncomplete="#{richTreeBean.attributes['oncomplete'].value}" - ondblclick="#{richTreeBean.attributes['ondblclick'].value}" - onkeydown="#{richTreeBean.attributes['onkeydown'].value}" - onkeypress="#{richTreeBean.attributes['onkeypress'].value}" - onkeyup="#{richTreeBean.attributes['onkeyup'].value}" - onmousedown="#{richTreeBean.attributes['onmousedown'].value}" - onmousemove="#{richTreeBean.attributes['onmousemove'].value}" - onmouseup="#{richTreeBean.attributes['onmouseup'].value}" - onmouseout="#{richTreeBean.attributes['onmouseout'].value}" - onmouseover="#{richTreeBean.attributes['onmouseover'].value}" - onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}" - onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}" - rendered="#{richTreeBean.attributes['rendered'].value}" - selection="#{richTreeBean.selection}" - selectionType="#{richTreeBean.attributes['selectionType'].value}" - style="#{richTreeBean.attributes['style'].value}" - styleClass="#{richTreeBean.attributes['styleClass'].value}" - title="#{richTreeBean.attributes['title'].value}" - toggleType="#{richTreeBean.attributes['toggleType'].value}" - iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}" - iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}" - iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}" - handleClass="#{richTreeBean.attributes['handleClass'].value}" - iconClass="#{richTreeBean.attributes['iconClass'].value}" - labelClass="#{richTreeBean.attributes['labelClass'].value}" - nodeClass="#{richTreeBean.attributes['nodeClass'].value}" - selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" - toggleListener="#{richTreeListenerBean.processToggle}" - render="#{richTreeBean.attributes['render'].value}" - execute="#{richTreeBean.attributes['execute'].value}" - toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}" - > - </rich:tree> - </p> + + <h3><b>rich:tree</b></h3> + + <p> + <rich:tree id="richTree" + nodeType="#{node.type}" + var="node" + value="#{richTreeBean.root}" + selection="#{richTreeBean.selection}" + selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" + toggleListener="#{richTreeListenerBean.processToggle}" + + data="#{richTreeBean.attributes['data'].value}" + dir="#{richTreeBean.attributes['dir'].value}" + execute="#{richTreeBean.attributes['execute'].value}" + handleClass="#{richTreeBean.attributes['handleClass'].value}" + iconClass="#{richTreeBean.attributes['iconClass'].value}" + iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}" + iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}" + iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}" + immediate="#{richTreeBean.attributes['immediate'].value}" + keepSaved="#{richTreeBean.attributes['keepSaved'].value}" + labelClass="#{richTreeBean.attributes['labelClass'].value}" + lang="#{richTreeBean.attributes['lang'].value}" + limitRender="#{richTreeBean.attributes['limitRender'].value}" + nodeClass="#{richTreeBean.attributes['nodeClass'].value}" + onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}" + onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}" + onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}" + onbegin="#{richTreeBean.attributes['onbegin'].value}" + onclick="#{richTreeBean.attributes['onclick'].value}" + oncomplete="#{richTreeBean.attributes['oncomplete'].value}" + ondblclick="#{richTreeBean.attributes['ondblclick'].value}" + onkeydown="#{richTreeBean.attributes['onkeydown'].value}" + onkeypress="#{richTreeBean.attributes['onkeypress'].value}" + onkeyup="#{richTreeBean.attributes['onkeyup'].value}" + onmousedown="#{richTreeBean.attributes['onmousedown'].value}" + onmousemove="#{richTreeBean.attributes['onmousemove'].value}" + onmouseout="#{richTreeBean.attributes['onmouseout'].value}" + onmouseover="#{richTreeBean.attributes['onmouseover'].value}" + onmouseup="#{richTreeBean.attributes['onmouseup'].value}" + onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}" + onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}" + render="#{richTreeBean.attributes['render'].value}" + rendered="#{richTreeBean.attributes['rendered'].value}" + selectionType="#{richTreeBean.attributes['selectionType'].value}" + status="#{richTreeBean.attributes['status'].value}" + style="#{richTreeBean.attributes['style'].value}" + styleClass="#{richTreeBean.attributes['styleClass'].value}" + title="#{richTreeBean.attributes['title'].value}" + toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}" + toggleType="#{richTreeBean.attributes['toggleType'].value}" + > + + <rich:treeNode type="country" + expanded="#{richTreeBean.expanded[node]}" + + dir="#{richTreeNodeBean.attributes[0]['dir'].value}" + handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}" + iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}" + iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}" + iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}" + iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}" + immediate="#{richTreeNodeBean.attributes[0]['immediate'].value}" + labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}" + lang="#{richTreeNodeBean.attributes[0]['lang'].value}" + onbeforetoggle="#{richTreeNodeBean.attributes[0]['onbeforetoggle'].value}" + onclick="#{richTreeNodeBean.attributes[0]['onclick'].value}" + ondblclick="#{richTreeNodeBean.attributes[0]['ondblclick'].value}" + onkeydown="#{richTreeNodeBean.attributes[0]['onkeydown'].value}" + onkeypress="#{richTreeNodeBean.attributes[0]['onkeypress'].value}" + onkeyup="#{richTreeNodeBean.attributes[0]['onkeyup'].value}" + onmousedown="#{richTreeNodeBean.attributes[0]['onmousedown'].value}" + onmousemove="#{richTreeNodeBean.attributes[0]['onmousemove'].value}" + onmouseout="#{richTreeNodeBean.attributes[0]['onmouseout'].value}" + onmouseover="#{richTreeNodeBean.attributes[0]['onmouseover'].value}" + onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}" + ontoggle="#{richTreeNodeBean.attributes[0]['ontoggle'].value}" + rendered="#{richTreeNodeBean.attributes[0]['rendered'].value}" + style="#{richTreeNodeBean.attributes[0]['style'].value}" + styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}" + title="#{richTreeNodeBean.attributes[0]['title'].value}" + > + <f:facet name="handleLoading"> + <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> + </f:facet> + #{node.name} + </rich:treeNode> + + <rich:treeNode type="company" + expanded="#{richTreeBean.expanded[node]}" + + dir="#{richTreeNodeBean.attributes[1]['dir'].value}" + handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}" + iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}" + iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}" + iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}" + iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}" + immediate="#{richTreeNodeBean.attributes[1]['immediate'].value}" + labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}" + lang="#{richTreeNodeBean.attributes[1]['lang'].value}" + onbeforetoggle="#{richTreeNodeBean.attributes[1]['onbeforetoggle'].value}" + onclick="#{richTreeNodeBean.attributes[1]['onclick'].value}" + ondblclick="#{richTreeNodeBean.attributes[1]['ondblclick'].value}" + onkeydown="#{richTreeNodeBean.attributes[1]['onkeydown'].value}" + onkeypress="#{richTreeNodeBean.attributes[1]['onkeypress'].value}" + onkeyup="#{richTreeNodeBean.attributes[1]['onkeyup'].value}" + onmousedown="#{richTreeNodeBean.attributes[1]['onmousedown'].value}" + onmousemove="#{richTreeNodeBean.attributes[1]['onmousemove'].value}" + onmouseout="#{richTreeNodeBean.attributes[1]['onmouseout'].value}" + onmouseover="#{richTreeNodeBean.attributes[1]['onmouseover'].value}" + onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}" + ontoggle="#{richTreeNodeBean.attributes[1]['ontoggle'].value}" + rendered="#{richTreeNodeBean.attributes[1]['rendered'].value}" + style="#{richTreeNodeBean.attributes[1]['style'].value}" + styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}" + title="#{richTreeNodeBean.attributes[1]['title'].value}" + > + <f:facet name="handleLoading"> + <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> + </f:facet> + + #{node.name} + </rich:treeNode> + + <rich:treeNode type="cd" + expanded="#{richTreeBean.expanded[node]}" + + dir="#{richTreeNodeBean.attributes[2]['dir'].value}" + handleClass="#{richTreeNodeBean.attributes[2]['handleClass'].value}" + iconClass="#{richTreeNodeBean.attributes[2]['iconClass'].value}" + iconCollapsed="#{richTreeNodeBean.attributes[2]['iconCollapsed'].value}" + iconExpanded="#{richTreeNodeBean.attributes[2]['iconExpanded'].value}" + iconLeaf="#{richTreeNodeBean.attributes[2]['iconLeaf'].value}" + immediate="#{richTreeNodeBean.attributes[2]['immediate'].value}" + labelClass="#{richTreeNodeBean.attributes[2]['labelClass'].value}" + lang="#{richTreeNodeBean.attributes[2]['lang'].value}" + onbeforetoggle="#{richTreeNodeBean.attributes[2]['onbeforetoggle'].value}" + onclick="#{richTreeNodeBean.attributes[2]['onclick'].value}" + ondblclick="#{richTreeNodeBean.attributes[2]['ondblclick'].value}" + onkeydown="#{richTreeNodeBean.attributes[2]['onkeydown'].value}" + onkeypress="#{richTreeNodeBean.attributes[2]['onkeypress'].value}" + onkeyup="#{richTreeNodeBean.attributes[2]['onkeyup'].value}" + onmousedown="#{richTreeNodeBean.attributes[2]['onmousedown'].value}" + onmousemove="#{richTreeNodeBean.attributes[2]['onmousemove'].value}" + onmouseout="#{richTreeNodeBean.attributes[2]['onmouseout'].value}" + onmouseover="#{richTreeNodeBean.attributes[2]['onmouseover'].value}" + onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}" + ontoggle="#{richTreeNodeBean.attributes[2]['ontoggle'].value}" + rendered="#{richTreeNodeBean.attributes[2]['rendered'].value}" + style="#{richTreeNodeBean.attributes[2]['style'].value}" + styleClass="#{richTreeNodeBean.attributes[2]['styleClass'].value}" + title="#{richTreeNodeBean.attributes[2]['title'].value}" + > + #{node.artist} - #{node.title} + </rich:treeNode> + </rich:tree> + </p> + + <h3><b>rich:tree</b> - with default tree nodes</h3> + <div>(uses toString on TreeNode as content)</div> + + <p> + + + <rich:tree id="richTreeDefaultNodes" + var="node" + value="#{richTreeBean.root}" + + dir="#{richTreeBean.attributes['dir'].value}" + lang="#{richTreeBean.attributes['lang'].value}" + onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}" + onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}" + onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}" + onbegin="#{richTreeBean.attributes['onbegin'].value}" + onclick="#{richTreeBean.attributes['onclick'].value}" + oncomplete="#{richTreeBean.attributes['oncomplete'].value}" + ondblclick="#{richTreeBean.attributes['ondblclick'].value}" + onkeydown="#{richTreeBean.attributes['onkeydown'].value}" + onkeypress="#{richTreeBean.attributes['onkeypress'].value}" + onkeyup="#{richTreeBean.attributes['onkeyup'].value}" + onmousedown="#{richTreeBean.attributes['onmousedown'].value}" + onmousemove="#{richTreeBean.attributes['onmousemove'].value}" + onmouseup="#{richTreeBean.attributes['onmouseup'].value}" + onmouseout="#{richTreeBean.attributes['onmouseout'].value}" + onmouseover="#{richTreeBean.attributes['onmouseover'].value}" + onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}" + onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}" + rendered="#{richTreeBean.attributes['rendered'].value}" + selection="#{richTreeBean.selection}" + selectionType="#{richTreeBean.attributes['selectionType'].value}" + style="#{richTreeBean.attributes['style'].value}" + styleClass="#{richTreeBean.attributes['styleClass'].value}" + title="#{richTreeBean.attributes['title'].value}" + toggleType="#{richTreeBean.attributes['toggleType'].value}" + iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}" + iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}" + iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}" + handleClass="#{richTreeBean.attributes['handleClass'].value}" + iconClass="#{richTreeBean.attributes['iconClass'].value}" + labelClass="#{richTreeBean.attributes['labelClass'].value}" + nodeClass="#{richTreeBean.attributes['nodeClass'].value}" + selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" + toggleListener="#{richTreeListenerBean.processToggle}" + render="#{richTreeBean.attributes['render'].value}" + execute="#{richTreeBean.attributes['execute'].value}" + toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}" + > + </rich:tree> + </p> </ui:define> <ui:define name="outOfTemplateAfter"> - - <a4j:commandButton id="expandAll" value="Expand All" action="#{richTreeBean.expandAll}" render="#{nestedComponentId}" /> - <a4j:commandButton id="collapseAll" value="Collapse All" action="#{richTreeBean.collapseAll}" render="#{nestedComponentId}" /> - - <a4j:outputPanel ajaxRendered="true"> - <h:panelGrid columns="2"> - - <h:outputLabel value="Test Loading Facet:" /> - <h:selectBooleanCheckbox id="loadingFacet" value="#{richTreeBean.testLoadingFacet}"> - <a4j:ajax render="#{nestedComponentId}" /> - </h:selectBooleanCheckbox> - - <h:outputLabel value="Delayed Render (1sec):" /> - <h:selectBooleanCheckbox value="#{richTreeBean.delayedRender}"> - <a4j:ajax /> - </h:selectBooleanCheckbox> - - <h:outputLabel value="Selection:" /> - <h:outputText id="selection" value="#{richTreeBean.selection}" /> - - <h:outputLabel value="Selection Change Event:" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}" /> - <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}"> - <h:outputLabel value="Client ID:" /> - <h:outputText id="selectionEventClientId" value="#{richTreeListenerBean.treeSelectionChangeEvent.component.id}" /> - - <h:outputLabel value="New Selection:" /> - <h:outputText id="selectionEventNewSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.newSelection}" /> - - <h:outputLabel value="Old Selection:" /> - <h:outputText id="selectionEventOldSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.oldSelection}" /> - </h:panelGrid> - - <h:outputLabel value="Tree Toggle Event:" rendered="#{not empty richTreeListenerBean.treeToggleEvent}" /> - <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeToggleEvent}"> - <h:outputLabel value="Client ID:" /> - <h:outputText id="toggleEventClientId" value="#{richTreeListenerBean.treeToggleEvent.component.id}" /> - - <h:outputLabel value="Collapsed:" /> - <h:outputText id="toggleEventCollapsed" value="#{richTreeListenerBean.treeToggleEvent.collapsed}" /> - - <h:outputLabel value="Expanded:" /> - <h:outputText id="toggleEventExpanded" value="#{richTreeListenerBean.treeToggleEvent.expanded}" /> - </h:panelGrid> - </h:panelGrid> - </a4j:outputPanel> - - <fieldset> - <legend>rich:tree</legend> - <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" /> + + <a4j:commandButton id="expandAll" value="Expand All" action="#{richTreeBean.expandAll}" render="#{nestedComponentId}" /> + <a4j:commandButton id="collapseAll" value="Collapse All" action="#{richTreeBean.collapseAll}" render="#{nestedComponentId}" /> + + <a4j:outputPanel ajaxRendered="true"> + <h:panelGrid columns="2"> + + <h:outputLabel value="Test Loading Facet:" /> + <h:selectBooleanCheckbox id="loadingFacet" value="#{richTreeBean.testLoadingFacet}"> + <a4j:ajax render="#{nestedComponentId}" /> + </h:selectBooleanCheckbox> + + <h:outputLabel value="Delayed Render (1sec):" /> + <h:selectBooleanCheckbox value="#{richTreeBean.delayedRender}"> + <a4j:ajax /> + </h:selectBooleanCheckbox> + + <h:outputLabel value="Selection:" /> + <h:outputText id="selection" value="#{richTreeBean.selection}" /> + + <h:outputLabel value="Selection Change Event:" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}" /> + <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}"> + <h:outputLabel value="Client ID:" /> + <h:outputText id="selectionEventClientId" value="#{richTreeListenerBean.treeSelectionChangeEvent.component.id}" /> + + <h:outputLabel value="New Selection:" /> + <h:outputText id="selectionEventNewSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.newSelection}" /> + + <h:outputLabel value="Old Selection:" /> + <h:outputText id="selectionEventOldSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.oldSelection}" /> + </h:panelGrid> + + <h:outputLabel value="Tree Toggle Event:" rendered="#{not empty richTreeListenerBean.treeToggleEvent}" /> + <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeToggleEvent}"> + <h:outputLabel value="Client ID:" /> + <h:outputText id="toggleEventClientId" value="#{richTreeListenerBean.treeToggleEvent.component.id}" /> + + <h:outputLabel value="Collapsed:" /> + <h:outputText id="toggleEventCollapsed" value="#{richTreeListenerBean.treeToggleEvent.collapsed}" /> + + <h:outputLabel value="Expanded:" /> + <h:outputText id="toggleEventExpanded" value="#{richTreeListenerBean.treeToggleEvent.expanded}" /> + </h:panelGrid> + </h:panelGrid> + </a4j:outputPanel> + + <fieldset> + <legend>rich:tree</legend> + <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" /> </fieldset> <fieldset> - <legend>rich:treeNode type="country"</legend> - <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="treeNode1Attributes" /> + <legend>rich:treeNode type="country"</legend> + <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="treeNode1Attributes" /> </fieldset> <fieldset> - <legend>rich:treeNode type="company"</legend> - <metamer:attributes value="#{richTreeNodeBean.attributes[1]}" id="treeNode2Attributes" /> + <legend>rich:treeNode type="company"</legend> + <metamer:attributes value="#{richTreeNodeBean.attributes[1]}" id="treeNode2Attributes" /> </fieldset> <fieldset> - <legend>rich:treeNode type="cd"</legend> - <metamer:attributes value="#{richTreeNodeBean.attributes[2]}" id="treeNode3Attributes" /> + <legend>rich:treeNode type="cd"</legend> + <metamer:attributes value="#{richTreeNodeBean.attributes[2]}" id="treeNode3Attributes" /> </fieldset> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-02-28 13:52:20 UTC (rev 21974) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-02-28 13:57:40 UTC (rev 21975) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. @@ -27,227 +27,227 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:param name="componentId" value="richTree" /> + <ui:param name="componentId" value="richTree" /> <ui:define name="view"> - <f:metadata> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> <f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" /> </f:metadata> </ui:define> - + <ui:define name="component"> - + <rich:tree id="richTree" - var="node" - selection="#{richTreeBean.selection}" - selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" - toggleListener="#{richTreeListenerBean.processToggle}" - - data="#{richTreeBean.attributes['data'].value}" - dir="#{richTreeBean.attributes['dir'].value}" - execute="#{richTreeBean.attributes['execute'].value}" - handleClass="#{richTreeBean.attributes['handleClass'].value}" - iconClass="#{richTreeBean.attributes['iconClass'].value}" - iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}" - iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}" - iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}" - immediate="#{richTreeBean.attributes['immediate'].value}" - keepSaved="#{richTreeBean.attributes['keepSaved'].value}" - labelClass="#{richTreeBean.attributes['labelClass'].value}" - lang="#{richTreeBean.attributes['lang'].value}" - limitRender="#{richTreeBean.attributes['limitRender'].value}" - nodeClass="#{richTreeBean.attributes['nodeClass'].value}" - onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}" - onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}" - onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}" - onbegin="#{richTreeBean.attributes['onbegin'].value}" - onclick="#{richTreeBean.attributes['onclick'].value}" - oncomplete="#{richTreeBean.attributes['oncomplete'].value}" - ondblclick="#{richTreeBean.attributes['ondblclick'].value}" - onkeydown="#{richTreeBean.attributes['onkeydown'].value}" - onkeypress="#{richTreeBean.attributes['onkeypress'].value}" - onkeyup="#{richTreeBean.attributes['onkeyup'].value}" - onmousedown="#{richTreeBean.attributes['onmousedown'].value}" - onmousemove="#{richTreeBean.attributes['onmousemove'].value}" - onmouseout="#{richTreeBean.attributes['onmouseout'].value}" - onmouseover="#{richTreeBean.attributes['onmouseover'].value}" - onmouseup="#{richTreeBean.attributes['onmouseup'].value}" - onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}" - onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}" - render="#{richTreeBean.attributes['render'].value}" - rendered="#{richTreeBean.attributes['rendered'].value}" - selectionType="#{richTreeBean.attributes['selectionType'].value}" - status="#{richTreeBean.attributes['status'].value}" - style="#{richTreeBean.attributes['style'].value}" - styleClass="#{richTreeBean.attributes['styleClass'].value}" - title="#{richTreeBean.attributes['title'].value}" - toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}" - toggleType="#{richTreeBean.attributes['toggleType'].value}" - > - <rich:treeNode expanded="#{richTreeModelRecursiveAdaptorBean.expanded[node.label]}"> - #{node.label} - </rich:treeNode> - - <rich:treeModelRecursiveAdaptor - roots="#{richTreeModelRecursiveAdaptorBean.rootNodes}" - nodes="#{richTreeModelRecursiveAdaptorBean.useMapModel ? node.recursiveMap : node.recursiveList}" - recursionOrder="#{richTreeModelRecursiveAdaptorBean.attributes['recursionOrder'].value}" - > - - <rich:treeNode - expanded="#{richTreeModelRecursiveAdaptorBean.expanded[node.label]}" - rendered="#{richTreeNodeBean.attributes[0]['rendered'].value || node.number != 1}" - iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}" - iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}" - iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}" - handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}" - iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}" - labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}" - styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}"> - <f:facet name="handleLoading"> - <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> - </f:facet> - <a4j:outputPanel id="panel"> - #{node.label} - </a4j:outputPanel> - </rich:treeNode> - - <rich:treeModelAdaptor - nodes="#{node.model.list}" - rendered="#{richTreeModelAdaptorBean.attributes['rendered'].value}"> - <rich:treeNode> - #{node.label} - </rich:treeNode> - </rich:treeModelAdaptor> - - <rich:treeModelAdaptor - nodes="#{node.model.map}" - rendered="#{richTreeModelAdaptorBean.attributes['rendered'].value}" - rowKeyConverter="treeAdaptorKeyConverter"> - <rich:treeNode> - #{node.label} - </rich:treeNode> - </rich:treeModelAdaptor> - - <rich:treeModelRecursiveAdaptor - roots="#{node.model.recursive}" - nodes="#{richTreeModelRecursiveAdaptorBean.useMapModel ? node.recursiveMap : node.recursiveList}" - rendered="#{richTreeModelRecursiveAdaptorBean.attributes['rendered'].value}"> - - <rich:treeNode - expanded="#{richTreeModelRecursiveAdaptorBean.expanded[node.label]}" - rendered="#{richTreeNodeBean.attributes[1]['rendered'].value || node.number != 1}" - iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}" - iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}" - iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}" - handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}" - iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}" - labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}" - styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}" - > - <f:facet name="handleLoading"> - <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> - </f:facet> - #{node.label} - </rich:treeNode> - </rich:treeModelRecursiveAdaptor> - - </rich:treeModelRecursiveAdaptor> - </rich:tree> + var="node" + selection="#{richTreeBean.selection}" + selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" + toggleListener="#{richTreeListenerBean.processToggle}" + + data="#{richTreeBean.attributes['data'].value}" + dir="#{richTreeBean.attributes['dir'].value}" + execute="#{richTreeBean.attributes['execute'].value}" + handleClass="#{richTreeBean.attributes['handleClass'].value}" + iconClass="#{richTreeBean.attributes['iconClass'].value}" + iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}" + iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}" + iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}" + immediate="#{richTreeBean.attributes['immediate'].value}" + keepSaved="#{richTreeBean.attributes['keepSaved'].value}" + labelClass="#{richTreeBean.attributes['labelClass'].value}" + lang="#{richTreeBean.attributes['lang'].value}" + limitRender="#{richTreeBean.attributes['limitRender'].value}" + nodeClass="#{richTreeBean.attributes['nodeClass'].value}" + onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}" + onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}" + onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}" + onbegin="#{richTreeBean.attributes['onbegin'].value}" + onclick="#{richTreeBean.attributes['onclick'].value}" + oncomplete="#{richTreeBean.attributes['oncomplete'].value}" + ondblclick="#{richTreeBean.attributes['ondblclick'].value}" + onkeydown="#{richTreeBean.attributes['onkeydown'].value}" + onkeypress="#{richTreeBean.attributes['onkeypress'].value}" + onkeyup="#{richTreeBean.attributes['onkeyup'].value}" + onmousedown="#{richTreeBean.attributes['onmousedown'].value}" + onmousemove="#{richTreeBean.attributes['onmousemove'].value}" + onmouseout="#{richTreeBean.attributes['onmouseout'].value}" + onmouseover="#{richTreeBean.attributes['onmouseover'].value}" + onmouseup="#{richTreeBean.attributes['onmouseup'].value}" + onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}" + onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}" + render="#{richTreeBean.attributes['render'].value}" + rendered="#{richTreeBean.attributes['rendered'].value}" + selectionType="#{richTreeBean.attributes['selectionType'].value}" + status="#{richTreeBean.attributes['status'].value}" + style="#{richTreeBean.attributes['style'].value}" + styleClass="#{richTreeBean.attributes['styleClass'].value}" + title="#{richTreeBean.attributes['title'].value}" + toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}" + toggleType="#{richTreeBean.attributes['toggleType'].value}" + > + <rich:treeNode expanded="#{richTreeModelRecursiveAdaptorBean.expanded[node.label]}"> + #{node.label} + </rich:treeNode> + + <rich:treeModelRecursiveAdaptor + roots="#{richTreeModelRecursiveAdaptorBean.rootNodes}" + nodes="#{richTreeModelRecursiveAdaptorBean.useMapModel ? node.recursiveMap : node.recursiveList}" + recursionOrder="#{richTreeModelRecursiveAdaptorBean.attributes['recursionOrder'].value}" + > + + <rich:treeNode + expanded="#{richTreeModelRecursiveAdaptorBean.expanded[node.label]}" + rendered="#{richTreeNodeBean.attributes[0]['rendered'].value || node.number != 1}" + iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}" + iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}" + iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}" + handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}" + iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}" + labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}" + styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}"> + <f:facet name="handleLoading"> + <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> + </f:facet> + <a4j:outputPanel id="panel"> + #{node.label} + </a4j:outputPanel> + </rich:treeNode> + + <rich:treeModelAdaptor + nodes="#{node.model.list}" + rendered="#{richTreeModelAdaptorBean.attributes['rendered'].value}"> + <rich:treeNode> + #{node.label} + </rich:treeNode> + </rich:treeModelAdaptor> + + <rich:treeModelAdaptor + nodes="#{node.model.map}" + rendered="#{richTreeModelAdaptorBean.attributes['rendered'].value}" + rowKeyConverter="treeAdaptorKeyConverter"> + <rich:treeNode> + #{node.label} + </rich:treeNode> + </rich:treeModelAdaptor> + + <rich:treeModelRecursiveAdaptor + roots="#{node.model.recursive}" + nodes="#{richTreeModelRecursiveAdaptorBean.useMapModel ? node.recursiveMap : node.recursiveList}" + rendered="#{richTreeModelRecursiveAdaptorBean.attributes['rendered'].value}"> + + <rich:treeNode + expanded="#{richTreeModelRecursiveAdaptorBean.expanded[node.label]}" + rendered="#{richTreeNodeBean.attributes[1]['rendered'].value || node.number != 1}" + iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}" + iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}" + iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}" + handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}" + iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}" + labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}" + styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}" + > + <f:facet name="handleLoading"> + <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" /> + </f:facet> + #{node.label} + </rich:treeNode> + </rich:treeModelRecursiveAdaptor> + + </rich:treeModelRecursiveAdaptor> + </rich:tree> </ui:define> <ui:define name="outOfTemplateAfter"> - - <a4j:outputPanel ajaxRendered="true"> - <h:panelGrid id="selectionOutput" columns="2"> - <h:outputLabel value="Test Loading Facet:" /> - <h:selectBooleanCheckbox id="loadingFacet" value="#{richTreeBean.testLoadingFacet}"> - <a4j:ajax render="#{nestedComponentId}" /> - </h:selectBooleanCheckbox> - - <h:outputLabel value="Delayed Render (1sec):" /> - <h:selectBooleanCheckbox value="#{richTreeBean.delayedRender}"> - <a4j:ajax /> - </h:selectBooleanCheckbox> - - <h:outputLabel value="Recursive Leaf Children Nullable:" /> - <h:selectBooleanCheckbox id="recursiveLeafChildrenNullable" value="#{richTreeModelRecursiveAdaptorBean.leafChildrenNullable}"> - <a4j:ajax render="#{nestedComponentId}" /> - </h:selectBooleanCheckbox> - - <h:outputLabel value="Recursive Model Representation:" /> - <h:selectOneRadio id="recursiveModelRepresentation" value="#{richTreeModelRecursiveAdaptorBean.useMapModel}"> - <f:selectItem itemLabel="List&lt;RecursiveNode&gt;" itemValue="false" /> - <f:selectItem itemLabel="Map&lt;Integer, RecursiveNode&gt;" itemValue="true" /> - - <a4j:ajax render="#{nestedComponentId}" /> - </h:selectOneRadio> - - <h:outputLabel value="Selection:" /> - <h:outputText id="selection" value="#{richTreeBean.selection}" /> - - <h:outputLabel value="Lazy Initialized:" /> - <h:outputText id="lazyInitialized" value="#{richTreeModelRecursiveAdaptorBean.lazyInitializedNodes}" /> - - <h:outputLabel value="Selection Change Event:" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}" /> - <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}"> - <h:outputLabel value="Client ID:" /> - <h:outputText id="selectionEventClientId" value="#{richTreeListenerBean.treeSelectionChangeEvent.component.id}" /> - - <h:outputLabel value="New Selection:" /> - <h:outputText id="selectionEventNewSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.newSelection}" /> - - <h:outputLabel value="Old Selection:" /> - <h:outputText id="selectionEventOldSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.oldSelection}" /> - </h:panelGrid> - - <h:outputLabel value="Tree Toggle Event:" rendered="#{not empty richTreeListenerBean.treeToggleEvent}" /> - <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeToggleEvent}"> - <h:outputLabel value="Client ID:" /> - <h:outputText id="toggleEventClientId" value="#{richTreeListenerBean.treeToggleEvent.component.id}" /> - - <h:outputLabel value="Collapsed:" /> - <h:outputText id="toggleEventCollapsed" value="#{richTreeListenerBean.treeToggleEvent.collapsed}" /> - - <h:outputLabel value="Expanded:" /> - <h:outputText id="toggleEventExpanded" value="#{richTreeListenerBean.treeToggleEvent.expanded}" /> - </h:panelGrid> - </h:panelGrid> - </a4j:outputPanel> - - <fieldset> - <legend>rich:tree</legend> - <metamer:attributes value="#{richTreeBean.attributes}" id="treeAttributes" /> - - <fieldset> - <legend>rich:treeModelRecursiveAdaptor [0]</legend> - - <fieldset> - <legend>rich:treeNode [0]</legend> - <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="node0Attributes" /> - </fieldset> - - <fieldset> - <legend>rich:treeModelAdaptor</legend> - <metamer:attributes value="#{richTreeModelAdaptorBean.attributes}" id="listAttributes" /> - </fieldset> - - <fieldset> - <legend>rich:treeModelRecursiveAdaptor [1]</legend> - <metamer:attributes value="#{richTreeModelRecursiveAdaptorBean.attributes}" id="recursiveAttributes" /> - - <fieldset> - <legend>rich:treeNode [1]</legend> - <metamer:attributes value="#{richTreeNodeBean.attributes[1]}" id="node1Attributes" /> - </fieldset> - </fieldset> - </fieldset> - </fieldset> - - </ui:define> + <a4j:outputPanel ajaxRendered="true"> + <h:panelGrid id="selectionOutput" columns="2"> + <h:outputLabel value="Test Loading Facet:" /> + <h:selectBooleanCheckbox id="loadingFacet" value="#{richTreeBean.testLoadingFacet}"> + <a4j:ajax render="#{nestedComponentId}" /> + </h:selectBooleanCheckbox> + + <h:outputLabel value="Delayed Render (1sec):" /> + <h:selectBooleanCheckbox value="#{richTreeBean.delayedRender}"> + <a4j:ajax /> + </h:selectBooleanCheckbox> + + <h:outputLabel value="Recursive Leaf Children Nullable:" /> + <h:selectBooleanCheckbox id="recursiveLeafChildrenNullable" value="#{richTreeModelRecursiveAdaptorBean.leafChildrenNullable}"> + <a4j:ajax render="#{nestedComponentId}" /> + </h:selectBooleanCheckbox> + + <h:outputLabel value="Recursive Model Representation:" /> + <h:selectOneRadio id="recursiveModelRepresentation" value="#{richTreeModelRecursiveAdaptorBean.useMapModel}"> + <f:selectItem itemLabel="List&lt;RecursiveNode&gt;" itemValue="false" /> + <f:selectItem itemLabel="Map&lt;Integer, RecursiveNode&gt;" itemValue="true" /> + + <a4j:ajax render="#{nestedComponentId}" /> + </h:selectOneRadio> + + <h:outputLabel value="Selection:" /> + <h:outputText id="selection" value="#{richTreeBean.selection}" /> + + <h:outputLabel value="Lazy Initialized:" /> + <h:outputText id="lazyInitialized" value="#{richTreeModelRecursiveAdaptorBean.lazyInitializedNodes}" /> + + <h:outputLabel value="Selection Change Event:" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}" /> + <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}"> + <h:outputLabel value="Client ID:" /> + <h:outputText id="selectionEventClientId" value="#{richTreeListenerBean.treeSelectionChangeEvent.component.id}" /> + + <h:outputLabel value="New Selection:" /> + <h:outputText id="selectionEventNewSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.newSelection}" /> + + <h:outputLabel value="Old Selection:" /> + <h:outputText id="selectionEventOldSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.oldSelection}" /> + </h:panelGrid> + + <h:outputLabel value="Tree Toggle Event:" rendered="#{not empty richTreeListenerBean.treeToggleEvent}" /> + <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeToggleEvent}"> + <h:outputLabel value="Client ID:" /> + <h:outputText id="toggleEventClientId" value="#{richTreeListenerBean.treeToggleEvent.component.id}" /> + + <h:outputLabel value="Collapsed:" /> + <h:outputText id="toggleEventCollapsed" value="#{richTreeListenerBean.treeToggleEvent.collapsed}" /> + + <h:outputLabel value="Expanded:" /> + <h:outputText id="toggleEventExpanded" value="#{richTreeListenerBean.treeToggleEvent.expanded}" /> + </h:panelGrid> + </h:panelGrid> + </a4j:outputPanel> + + <fieldset> + <legend>rich:tree</legend> + <metamer:attributes value="#{richTreeBean.attributes}" id="treeAttributes" /> + + <fieldset> + <legend>rich:treeModelRecursiveAdaptor [0]</legend> + + <fieldset> + <legend>rich:treeNode [0]</legend> + <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="node0Attributes" /> + </fieldset> + + <fieldset> + <legend>rich:treeModelAdaptor</legend> + <metamer:attributes value="#{richTreeModelAdaptorBean.attributes}" id="listAttributes" /> + </fieldset> + + <fieldset> + <legend>rich:treeModelRecursiveAdaptor [1]</legend> + <metamer:attributes value="#{richTreeModelRecursiveAdaptorBean.attributes}" id="recursiveAttributes" /> + + <fieldset> + <legend>rich:treeNode [1]</legend> + <metamer:attributes value="#{richTreeNodeBean.attributes[1]}" id="node1Attributes" /> + </fieldset> + </fieldset> + </fieldset> + </fieldset> + + </ui:define> + </ui:composition> </html> \ No newline at end of file