Author: lfryc(a)redhat.com
Date: 2011-02-22 09:30:48 -0500 (Tue, 22 Feb 2011)
New Revision: 21869
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Log:
fixed templates - item renamed as less conflicting names in format
container<template>Item
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{templateBean.dataTableModel}"
var="item" id="containerA4JRepeat1">
- <li><h:panelGroup columns="1" rendered="#{item ==
'row 1'}">
+ <a4j:repeat value="#{templateBean.dataTableModel}"
var="containerA4JRepeatItem" id="containerA4JRepeat1">
+ <li><h:panelGroup columns="1"
rendered="#{containerA4JRepeatItem == 'row 1'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item !=
'row 1'}" /></li>
+ <h:outputText value="#{containerA4JRepeatItem}"
rendered="#{containerA4JRepeatItem != 'row 1'}" /></li>
</a4j:repeat>
</ul>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{templateBean.dataTableModel}"
var="item" id="containerA4JRepeat2">
- <li><h:panelGroup columns="1" rendered="#{item ==
'row 2'}">
+ <a4j:repeat value="#{templateBean.dataTableModel}"
var="containerA4JRepeatItem" id="containerA4JRepeat2">
+ <li><h:panelGroup columns="1"
rendered="#{containerA4JRepeatItem == 'row 2'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item !=
'row 2'}" /></li>
+ <h:outputText value="#{containerA4JRepeatItem}"
rendered="#{containerA4JRepeatItem != 'row 2'}" /></li>
</a4j:repeat>
</ul>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <h:dataTable value="#{templateBean.dataTableModel}"
var="item" id="containerHDataTable1">
+ <h:dataTable value="#{templateBean.dataTableModel}"
var="containerHDataTableItem" id="containerHDataTable1">
<h:column>
<f:facet name="header">
<h:outputText value="JSF Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row
1'}">
+ <h:panelGroup columns="1"
rendered="#{containerHDataTableItem == 'row 1'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item !=
'row 1'}" />
+ <h:outputText value="#{containerHDataTableItem}"
rendered="#{containerHDataTableItem != 'row 1'}" />
</h:column>
</h:dataTable>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <h:dataTable value="#{templateBean.dataTableModel}"
var="item" id="containerHDataTable1">
+ <h:dataTable value="#{templateBean.dataTableModel}"
var="containerHDataTableItem" id="containerHDataTable1">
<h:column>
<f:facet name="header">
<h:outputText value="JSF Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row
2'}">
+ <h:panelGroup columns="1"
rendered="#{containerHDataTableItem == 'row 2'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item !=
'row 2'}" />
+ <h:outputText value="#{containerHDataTableItem}"
rendered="#{containerHDataTableItem != 'row 2'}" />
</h:column>
</h:dataTable>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <rich:dataTable value="#{templateBean.dataTableModel}"
var="item" id="containerRichDataTable1" rowKeyVar="row">
+ <rich:dataTable value="#{templateBean.dataTableModel}"
var="containerRichDataTableItem" id="containerRichDataTable1"
rowKeyVar="row">
<rich:column>
<f:facet name="header">
<h:outputText value="Rich Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row
1'}">
+ <h:panelGroup columns="1"
rendered="#{containerRichDataTableItem == 'row 1'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item !=
'row 1'}" />
+ <h:outputText value="#{containerRichDataTableItem}"
rendered="#{containerRichDataTableItem != 'row 1'}" />
</rich:column>
</rich:dataTable>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <rich:dataTable value="#{templateBean.dataTableModel}"
var="item" id="containerRichDataTable2" rowKeyVar="row">
+ <rich:dataTable value="#{templateBean.dataTableModel}"
var="containerRichDataTableItem" id="containerRichDataTable2"
rowKeyVar="row">
<rich:column>
<f:facet name="header">
<h:outputText value="Rich Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row
2'}">
+ <h:panelGroup columns="1"
rendered="#{containerRichDataTableItem == 'row 2'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item !=
'row 2'}" />
+ <h:outputText value="#{containerRichDataTableItem}"
rendered="#{containerRichDataTableItem != 'row 2'}" />
</rich:column>
</rich:dataTable>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}"
var="uiRepeatTemplateItem" id="containerUiRepeat1">
- <li><h:panelGroup columns="1"
rendered="#{uiRepeatTemplateItem == 'row 1'}">
+ <ui:repeat value="#{templateBean.dataTableModel}"
var="containerUiRepeatItem" id="containerUiRepeat1">
+ <li><h:panelGroup columns="1"
rendered="#{containerUiRepeatItem == 'row 1'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{uiRepeatTemplateItem}"
rendered="#{uiRepeatTemplateItem != 'row 1'}" /></li>
+ <h:outputText value="#{containerUiRepeatItem}"
rendered="#{containerUiRepeatItem != 'row 1'}" /></li>
</ui:repeat>
</ol>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-02-22
14:30:05 UTC (rev 21868)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-02-22
14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}"
var="uiRepeatTemplateItem" id="containerUiRepeat2">
- <li><h:panelGroup columns="1"
rendered="#{uiRepeatTemplateItem == 'row 2'}">
+ <ui:repeat value="#{templateBean.dataTableModel}"
var="containerUiRepeatItem" id="containerUiRepeat2">
+ <li><h:panelGroup columns="1"
rendered="#{containerUiRepeatItem == 'row 2'}">
<ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{uiRepeatTemplateItem}"
rendered="#{uiRepeatTemplateItem != 'row 2'}" /></li>
+ <h:outputText value="#{containerUiRepeatItem}"
rendered="#{containerUiRepeatItem != 'row 2'}" /></li>
</ui:repeat>
</ol>
Show replies by date