Author: lfryc(a)redhat.com Date: 2011-02-17 10:08:29 -0500 (Thu, 17 Feb 2011) New Revision: 21736 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.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/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/a4jOutputPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/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/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/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/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/commandButton/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.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/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/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/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/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/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.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/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/richFileUpload/simple.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/simple.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/tabPanel.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.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/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.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 modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml Log: refactored - metadata should be immediate child of UIViewRoot (RFPL-1135) 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -25,16 +25,19 @@ 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="head"> - <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/a4jAjax/hCommandButton.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"/> <h:commandButton id="commandButton" value="Submit" > 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"/> <a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"/> <h:commandLink id="commandLink" value="Submit"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid columns="2"> <h:inputText id="input" value="#{a4jAjaxBean.input}"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputSecret id="input" value="#{a4jAjaxBean.input}"> <a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"> <a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputTextarea id="input" value="#{a4jAjaxBean.input}"> <a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectBooleanCheckbox id="selectBooleanCheckbox" value="#{a4jAjaxBean.boolVal}"> <a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectManyCheckbox id="selectManyCheckbox" value="#{a4jAjaxBean.cars}"> <f:selectItem itemValue="Audi" itemLabel="Audi"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectManyListbox id="selectManyListbox" value="#{a4jAjaxBean.cars}"> <f:selectItem itemValue="Audi"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectManyMenu id="selectManyMenu" value="#{a4jAjaxBean.cars}" > <f:selectItem itemValue="Audi" itemLabel="Audi"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectOneListbox id="selectOneListbox" value="#{a4jAjaxBean.car}"> <f:selectItem itemValue="Audi"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectOneMenu id="selectOneMenu" value="#{a4jAjaxBean.car}" > <f:selectItem itemValue="Audi" itemLabel="Audi"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:selectOneRadio id="selectOneRadio" value="#{a4jAjaxBean.car}"> <f:selectItem itemValue="Audi" itemLabel="Audi"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,14 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> <script type="text/javascript"> function add(element) { element.innerHTML = 1 + parseInt(element.innerHTML); @@ -42,9 +44,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,14 +28,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> <script type="text/javascript"> function add(element) { element.innerHTML = 1 + parseInt(element.innerHTML); @@ -43,9 +45,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:queue id="queue1" name="namedQueue" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,14 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> <script type="text/javascript"> function add(element) { element.innerHTML = 1 + parseInt(element.innerHTML); @@ -42,9 +44,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,14 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> <script type="text/javascript"> function add(element) { element.innerHTML = 1 + parseInt(element.innerHTML); @@ -42,9 +44,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="panel" columns="2"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="panel" columns="2"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,19 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jJSFunction.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <fieldset id="outputFieldset"> <legend>standard outputs</legend> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,19 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jLog.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:inputText id="nameInput" styleClass="nameInput" value="#{a4jLogBean.name}" /> <a4j:commandButton id="submitButton" value="Submit" render="out" execute="@form" /> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jMediaOutput.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jMediaOutput.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jMediaOutput.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jMediaOutput.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:commandButton id="button" value="Increase Counter" action="#{a4jOutputPanelBean.increaseCounterAction}"/> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,20 +27,19 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="a4jParam.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:commandButton id="button1" value="A4J Command Button" render="output1,output2" > 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,21 +27,21 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> <f:viewParam name="enabled" value="#{a4jPollBean.attributes['enabled'].value}" /> </f:metadata> + </ui:define> + + <ui:define name="head"> <h:outputStylesheet library="css" name="a4jPoll.css"/> <h:outputScript library="script" name="date-format.js" /> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGroup id="pollPanel"> <a4j:poll id="poll" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jPush.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jPush.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,13 +29,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="head"> - <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="a4jQueue.css" /> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,13 +29,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="head"> - <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="a4jQueue.css" /> <script type="text/javascript"> function add(element) { @@ -44,12 +47,8 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> - - + <a4j:queue id="a4jQueue" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,14 +26,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="a4jRegion.css" /> <script type="text/javascript">/*<![CDATA[*/ @@ -53,9 +55,6 @@ /*]]>*/</script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid columns="2"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jRegion.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jRegion.css" /> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,17 +26,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jRepeat.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jRepeat.css" /> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jRepeat.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jRepeat.css" /> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,18 +29,15 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:form id="componentForm"> <fieldset style="height: 3em"><legend>status 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,18 +26,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <a4j:jsFunction id="statusFunction1" name="statusFunction1" status="status1" action="#{a4jStatusBean.delay}" /> <a4j:jsFunction id="statusFunction2" name="statusFunction2" status="status2" action="#{a4jStatusBean.delay}" /> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,9 +28,9 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="status" /> - - <ui:define name="head"> - <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/viewUsage.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,18 +29,15 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <fieldset style="height: 3em"> <legend>status (outside form)</legend> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,18 +26,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="panel" columns="2"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="hDataTable.css"/> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="hDataTable.css"/> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="hDataTable.css"/> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="hDataTable.css"/> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="hDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:accordion id="accordion" activeItem="#{richAccordionBean.attributes['activeItem'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:accordion id="accordion" activeItem="item3"> <rich:accordionItem id="item1" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:autocomplete id="autocomplete" autofill="#{richAutocompleteBean.attributes['autofill'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,13 +26,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> .yellowDay { background: yellow !important; @@ -49,9 +52,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <div style="padding: 250px"> <rich:calendar id="calendar" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> .yellowDay { background: yellow !important; @@ -78,9 +81,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <div style="padding: 250px"> <rich:calendar id="calendar" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> .yellowDay { background: yellow !important; @@ -78,9 +81,6 @@ </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <div style="padding: 250px"> <rich:calendar id="calendar" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> #{nonexistingbean.aaa} 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:collapsiblePanel id="collapsiblePanel" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,19 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - <br/> - </ui:define> - <ui:define name="component"> <rich:dataTable id="dataTable" value="#{richSubTableBean.lists}" var="list" keepSaved="true"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:dataTable id="dataTable" value="#{richSubTableBean.lists}" var="list" keepSaved="true"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,9 +28,9 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,9 +28,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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/richCollapsibleSubTableToggler/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,9 +27,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,9 +28,9 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,9 +28,9 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,19 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - - </ui:define> - <ui:define name="component"> <rich:dataTable id="richDataTable" rendered="true" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,9 +29,9 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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/richColumnGroup/body.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:dataTable id="richDataTable" rows="10" value="#{model.employees}" var="record"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:dataTable id="richDataTable" rows="10" value="#{model.employees}" var="record"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richComponentControl.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> - <br/> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richComponentControl.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richDataGrid.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richDataGrid.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richDataGrid.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richDataGrid.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richDataGrid.css" /> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataScroller.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,13 +29,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,13 +29,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,12 +29,15 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - <ui:define name="head"> - <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="richDataTable.css"/> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richDataTable" /> - - <ui:define name="head"> - <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="richDataTable.css"/> </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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -32,21 +32,19 @@ <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"> - <f:metadata> - <f:viewParam name="templates" value="#{templateBean.templates}"> - <f:converter converterId="templatesListConverter" /> - </f:viewParam> - <f:event type="preRenderView" - listener="#{richTreeBean.preRenderView}" /> - </f:metadata> <h:outputStylesheet library="css" name="richDragBehavior.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:dragIndicator id="indicator" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -32,21 +32,19 @@ <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"> - <f:metadata> - <f:viewParam name="templates" value="#{templateBean.templates}"> - <f:converter converterId="templatesListConverter" /> - </f:viewParam> - <f:event type="preRenderView" - listener="#{richTreeBean.preRenderView}" /> - </f:metadata> <h:outputStylesheet library="css" name="richDragBehavior.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:dragIndicator id="indicator" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> .rf-ddm-lbl-unsel { border:1px solid #{a4jSkin.panelBorderColor} !important; @@ -49,9 +52,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid styleClass="vertical-menu-cell" columnClasses="optionList" columns="1" cellspacing="0" cellpadding="0"> <rich:dropDownMenu id="menu1" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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 { margin-bottom: -4px; @@ -49,9 +52,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:toolbar id="toolbar" height="26px"> <rich:dropDownMenu id="menu1" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -32,15 +32,16 @@ <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"> - <f:metadata> - <f:viewParam name="templates" value="#{templateBean.templates}"> - <f:converter converterId="templatesListConverter" /> - </f:viewParam> - <f:event type="preRenderView" - listener="#{richTreeBean.preRenderView}" /> - </f:metadata> <h:outputStylesheet library="css" name="richDragBehavior.css" /> </ui:define> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt-c { height: 30px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt-c { height: 70px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt { width: 215px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,13 +29,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt-c { height: 30px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,13 +29,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt { width: 300px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt { width: 300px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt { width: 215px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt-c { height: 30px !important; 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,13 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richEDT" /> - - <ui:define name="head"> - <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"> .rf-edt-c { height: 30px !important; Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:fileUpload id="fileUpload" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,20 +26,19 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richFunctions.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <f:subview id="subview"> <h:outputLabel value="input: " for="input" /> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:popupPanel id="popupPanel" resizeable="true" header="Popup panel shown using rich:componentControl and rich:hashParam"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inplaceInput id="inplaceInput" changedStateClass="#{richInplaceInputBean.attributes['changedStateClass'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inplaceInput id="inplaceInput" changedStateClass="#{richInplaceInputBean.attributes['changedStateClass'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inplaceSelect id="inplaceSelect" changedStateClass="#{richInplaceSelectBean.attributes['changedStateClass'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inplaceSelect id="inplaceSelect" changedStateClass="#{richInplaceSelectBean.attributes['changedStateClass'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inputNumberSlider id="slider" accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inputNumberSlider id="slider" accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,21 +27,21 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> <script type="text/javascript"> testedComponentId = "#{rich:clientId('spinner')}"; </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inputNumberSpinner id="spinner" accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,21 +27,21 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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"> <script type="text/javascript"> testedComponentId = "#{rich:clientId('spinner')}"; </script> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:inputNumberSpinner id="spinner" accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richJQuery.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richJQuery.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,15 +28,17 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richList" /> - - <ui:define name="head"> - <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="richList.css" /> - </ui:define> <ui:define name="outOfTemplateBefore"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,15 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richList.css" /> - </ui:define> <ui:define name="outOfTemplateBefore"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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 { margin-bottom: -4px; @@ -49,9 +52,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:toolbar id="toolbar" height="26px" width="500px;"> <rich:dropDownMenu id="menu1" menu="ajax"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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 { margin-bottom: -4px; @@ -49,9 +52,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:toolbar id="toolbar" height="26px"> <rich:dropDownMenu id="menu1" mode="ajax"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,13 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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 { margin-bottom: -4px; @@ -49,9 +52,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:toolbar id="toolbar" height="26px"> <rich:dropDownMenu id="menu1" mode="ajax"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,20 +26,20 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="richPanel.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <style type="text/css"> .rf-panel-header { 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,17 +26,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richPanel.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richPanel.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richPanel.css"/> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="richPanel.css"/> </ui:define> <ui:define name="component"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:panelMenu id="panelMenu" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:panelMenu id="panelMenu" style="width: 300px;" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:panelMenu id="panelMenu" style="width: 250px; " 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,18 +29,15 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="dontRenderForm" value="true" /> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:commandButton id="openPanelButton" value="Call the popup"> <rich:componentControl target="popupPanel" operation="show" /> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:commandButton id="openPanelButton" value="Call the popup"> <rich:componentControl target="popupPanel" operation="show" /> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:progressBar id="progressBar" data="#{richProgressBarBean.attributes['data'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <script type="text/javascript"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="settingsPanel" columns="2"> Children rendered: <h:selectBooleanCheckbox id="childrenRendered" value="#{richProgressBarBean.childrenRendered}" onclick="submit()" /> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:select id="select" converterMessage="#{richSelectBean.attributes['converterMessage'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:select id="select" converterMessage="#{richSelectBean.attributes['converterMessage'].value}" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:tabPanel id="tabPanel"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:tabPanel id="tabPanel" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="panel1Controls" columns="6"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="panel1Controls" columns="6"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:panelGrid id="panel1Controls" columns="6"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -26,18 +26,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:commandLink id="tcLink1" value="Toggle Panel Item 1"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:outputText id="time" value="#{phasesBean.date}"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,18 +27,15 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h:commandLink id="tcLink1" value="Toggle Panel Item 1"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,12 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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 { margin-right: 2px; @@ -46,9 +50,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:toolbar id="toolbar" 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,12 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - <ui:define name="head"> - <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 { margin-right: 2px; @@ -46,9 +50,6 @@ </style> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:toolbar id="toolbar" height="28"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,14 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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> .sample-panel { border: 1px solid black; @@ -43,9 +45,6 @@ </h:outputStylesheet> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <rich:panel id="panel" style="width: 200px"> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,14 +27,16 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <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> .sample-panel { border: 1px solid black; @@ -43,9 +45,6 @@ </h:outputStylesheet> </ui:define> - <ui:define name="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <div id="regular-div" class="sample-panel">Div with clientId="regular-div"</div> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -28,20 +28,16 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richTree" /> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <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="outOfTemplateBefore"> - </ui:define> - <ui:define name="component"> <h3><b>rich:tree</b></h3> 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-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -29,18 +29,14 @@ <ui:composition template="/templates/template.xhtml"> <ui:param name="componentId" value="richTree" /> - <ui:define name="head"> - <f:metadata> + <ui:define name="view"> + <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="outOfTemplateBefore"> - </ui:define> <ui:define name="component"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -27,17 +27,17 @@ --> <ui:composition template="/templates/template.xhtml"> - - <ui:define name="head"> - <f:metadata> + + <ui:define name="view"> + <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jRepeat.css" /> </ui:define> - <ui:define name="outOfTemplateBefore"> + <ui:define name="head"> + <h:outputStylesheet library="css" name="a4jRepeat.css" /> </ui:define> <ui:define name="component"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2011-02-17 15:08:16 UTC (rev 21735) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2011-02-17 15:08:29 UTC (rev 21736) @@ -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:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:c="http://java.sun.com/jsp/jstl/core"> + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:f="http://java.sun.com/jsf/core"> <!-- JBoss, Home of Professional Open Source @@ -25,7 +25,11 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + + <f:view> + + <ui:insert name="view"/> + <h:head> <title><ui:insert name="pageTitle">Metamer</ui:insert></title> <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" /> @@ -35,9 +39,11 @@ <h:outputStylesheet library="css" name="common.ecss" /> <h:outputScript library="script" name="common.js" /> <ui:insert name="head"/> + </h:head> <h:body> + <h:form id="executeCheckerForm"> <h:selectBooleanCheckbox id="executeChecker" value="#{richBean.executeChecker}" style="display: none" /> </h:form> @@ -88,4 +94,6 @@ </div> </h:body> + + </f:view> </html>