[seam-commits] Seam SVN: r7916 - in trunk/seam-gen/view: layout and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sun Apr 13 08:47:56 EDT 2008
Author: shane.bryzak at jboss.com
Date: 2008-04-13 08:47:56 -0400 (Sun, 13 Apr 2008)
New Revision: 7916
Modified:
trunk/seam-gen/view/action.xhtml
trunk/seam-gen/view/conversation.xhtml
trunk/seam-gen/view/edit.page.xml.ftl
trunk/seam-gen/view/edit.xhtml
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/editproperty.xhtml.ftl
trunk/seam-gen/view/error.xhtml
trunk/seam-gen/view/form.xhtml
trunk/seam-gen/view/home.xhtml
trunk/seam-gen/view/layout/template.xhtml
trunk/seam-gen/view/list.page.xml.ftl
trunk/seam-gen/view/list.xhtml
trunk/seam-gen/view/list.xhtml.ftl
trunk/seam-gen/view/login.xhtml
trunk/seam-gen/view/page.xhtml
trunk/seam-gen/view/query.xhtml
trunk/seam-gen/view/stylesheet/theme.css
trunk/seam-gen/view/view.page.xml.ftl
trunk/seam-gen/view/view.xhtml.ftl
Log:
JBSEAM-2160
Modified: trunk/seam-gen/view/action.xhtml
===================================================================
--- trunk/seam-gen/view/action.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/action.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -8,21 +8,21 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<h:form id="@componentName at Form">
-
- <h:commandButton id="@methodName@" value="@methodName@!"
- action="#{@componentName at .@methodName@}"/>
-
+
+ <h:commandButton id="@methodName@" value="@methodName@!"
+ action="#{@componentName at .@methodName@}"/>
+
</h:form>
-
+
</rich:panel>
</ui:define>
Modified: trunk/seam-gen/view/conversation.xhtml
===================================================================
--- trunk/seam-gen/view/conversation.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/conversation.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -7,36 +7,36 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
-
+
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<div class="dialog">
<div class="prop">
<span class="name">Value</span>
<span class="value">#{@componentName at .value}</span>
</div>
</div>
-
+
<div style="clear:both"/>
-
+
</rich:panel>
-
+
<h:form id="@componentName@">
<div class="actionButtons">
- <h:commandButton id="begin" value="Begin"
- action="#{@componentName at .begin}"/>
- <h:commandButton id="inc" value="Increment"
- action="#{@componentName at .increment}"/>
- <h:commandButton id="end" value="End"
- action="#{@componentName at .end}"/>
+ <h:commandButton id="begin" value="Begin"
+ action="#{@componentName at .begin}"/>
+ <h:commandButton id="inc" value="Increment"
+ action="#{@componentName at .increment}"/>
+ <h:commandButton id="end" value="End"
+ action="#{@componentName at .end}"/>
</div>
</h:form>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/edit.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/edit.page.xml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/edit.page.xml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -9,11 +9,11 @@
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"
no-conversation-view-id="/${masterPageName}.xhtml"
login-required="true">
-
+
<begin-conversation join="true"/>
-
+
<action execute="${'#'}{${homeName}.wire}"/>
-
+
<param name="${componentName}From"/>
<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
<#if c2j.isComponent(pojo.identifierProperty)>
@@ -33,15 +33,15 @@
<end-conversation/>
<redirect view-id="/${pageName}.xhtml"/>
</navigation>
-
+
<navigation from-action="${'#'}{${homeName}.update}">
<end-conversation/>
<redirect view-id="/${pageName}.xhtml"/>
</navigation>
-
+
<navigation from-action="${'#'}{${homeName}.remove}">
<end-conversation/>
<redirect view-id="/${masterPageName}.xhtml"/>
</navigation>
-
+
</page>
Modified: trunk/seam-gen/view/edit.xhtml
===================================================================
--- trunk/seam-gen/view/edit.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/edit.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -7,48 +7,48 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message"/>
-
+
<h:form id="@componentName at Form">
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<s:decorate id="nameDecoration" template="layout/edit.xhtml">
<ui:define name="label">Name</ui:define>
<h:inputText id="name" required="true"
value="#{@homeName at .instance.name}"/>
</s:decorate>
-
+
<div style="clear:both"/>
-
+
</rich:panel>
<div class="actionButtons">
- <h:commandButton id="save"
- value="Save"
+ <h:commandButton id="save"
+ value="Save"
action="#{@homeName at .persist}"
- rendered="#{!@homeName at .managed}"/>
- <h:commandButton id="update"
- value="Save"
+ rendered="#{!@homeName at .managed}"/>
+ <h:commandButton id="update"
+ value="Save"
action="#{@homeName at .update}"
- rendered="#{@homeName at .managed}"/>
- <h:commandButton id="delete"
- value="Delete"
+ rendered="#{@homeName at .managed}"/>
+ <h:commandButton id="delete"
+ value="Delete"
action="#{@homeName at .remove}"
immediate="true"
rendered="#{@homeName at .managed}"/>
- <s:button propagation="end"
- id="done"
+ <s:button propagation="end"
+ id="done"
value="Done"
view="/@masterPageName at .xhtml"/>
</div>
-
+
</h:form>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
@@ -14,52 +14,52 @@
xmlns:a="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
<h:form id="${componentName}" styleClass="edit">
-
+
<rich:panel>
<f:facet name="header">${'#'}{${homeName}.managed ? 'Edit' : 'Add'} ${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
<#include "editproperty.xhtml.ftl">
</#foreach>
-
+
<div style="clear:both">
- <span class="required">*</span>
+ <span class="required">*</span>
required fields
</div>
-
+
</rich:panel>
-
+
<div class="actionButtons">
- <h:commandButton id="save"
- value="Save"
+ <h:commandButton id="save"
+ value="Save"
action="${'#'}{${homeName}.persist}"
disabled="${'#'}{!${homeName}.wired}"
- rendered="${'#'}{!${homeName}.managed}"/>
-
- <h:commandButton id="update"
- value="Save"
+ rendered="${'#'}{!${homeName}.managed}"/>
+
+ <h:commandButton id="update"
+ value="Save"
action="${'#'}{${homeName}.update}"
rendered="${'#'}{${homeName}.managed}"/>
-
- <h:commandButton id="delete"
- value="Delete"
+
+ <h:commandButton id="delete"
+ value="Delete"
action="${'#'}{${homeName}.remove}"
immediate="true"
rendered="${'#'}{${homeName}.managed}"/>
-
- <s:button id="done"
+
+ <s:button id="done"
value="Done"
propagation="end"
view="/${pageName}.xhtml"
rendered="${'#'}{${homeName}.managed}"/>
-
- <s:button id="cancel"
+
+ <s:button id="cancel"
value="Cancel"
propagation="end"
view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
@@ -82,19 +82,19 @@
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
-
+
<#if property.optional>
<rich:tab label="${property.name}">
<#else>
<rich:tab label="${property.name} *" labelClass="required">
</#if>
<div class="association" id="${property.name}Parent">
-
- <h:outputText value="There is no ${property.name} associated with this ${componentName}."
+
+ <h:outputText value="There is no ${property.name} associated with this ${componentName}."
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
-
- <rich:dataTable var="${parentName}"
- value="${'#'}{${homeName}.instance.${property.name}}"
+
+ <rich:dataTable var="${parentName}"
+ value="${'#'}{${homeName}.instance.${property.name}}"
rendered="${'#'}{${homeName}.instance.${property.name} != null}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
@@ -119,31 +119,31 @@
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link view="/${parentPageName}.xhtml"
- id="view${parentName}"
- value="View"
+ <s:link view="/${parentPageName}.xhtml"
+ id="view${parentName}"
+ value="View"
propagation="none">
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
- <f:param name="${parentName}${util.upper(componentProperty.name)}"
+ <f:param name="${parentName}${util.upper(componentProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
+ <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
</#if>
</s:link>
@@ -157,7 +157,7 @@
<f:param name="from" value="${pageName}Edit"/>
</s:button>
</div>
-
+
</#if>
</div>
</rich:tab>
@@ -166,17 +166,17 @@
<rich:tab label="${property.name}">
<div class="association" id="${property.name}Children">
-
+
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
<#assign childPageName = childPojo.shortName>
<#assign childEditPageName = childPojo.shortName + "Edit">
<#assign childName = util.lower(childPojo.shortName)>
- <h:outputText value="There are no ${property.name} associated with this ${componentName}."
+ <h:outputText value="There are no ${property.name} associated with this ${componentName}."
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
-
- <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
- rendered="${'#'}{not empty ${homeName}.${property.name}}"
+
+ <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
+ var="${childName}"
+ rendered="${'#'}{not empty ${homeName}.${property.name}}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
@@ -198,33 +198,33 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link view="/${childPageName}.xhtml"
- id="select${childName}"
+ <s:link view="/${childPageName}.xhtml"
+ id="select${childName}"
value="Select"
propagation="none">
<#if childPojo.isComponent(childPojo.identifierProperty)>
<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
- <f:param name="${childName}${util.upper(componentProperty.name)}"
+ <f:param name="${childName}${util.upper(componentProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
+ <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</rich:dataTable>
-
+
</div>
-
+
<f:subview rendered="${'#'}{${homeName}.managed}" id="${property.name}">
<div class="actionButtons">
- <s:button id="add${childName}"
+ <s:button id="add${childName}"
value="Add ${childName}"
view="/${childEditPageName}.xhtml"
propagation="none">
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
<f:param name="${childName}From" value="${entityName}"/>
</s:button>
Modified: trunk/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/editproperty.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/editproperty.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -10,7 +10,7 @@
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
<#if isDate(componentProperty)>
- <rich:calendar id="${componentProperty.name}"
+ <rich:calendar id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -19,7 +19,7 @@
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy" />
<#elseif isTime(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -29,7 +29,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
size="16"
<#if !column.nullable>
required="true"
@@ -39,7 +39,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigDecimal(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if !column.nullable>
required="true"
</#if>
@@ -48,7 +48,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigInteger(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -91,7 +91,7 @@
<#else>
<#assign size = column.length>
</#if>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -125,7 +125,7 @@
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${property.name}</ui:define>
<#if isDate(property)>
- <rich:calendar id="${property.name}"
+ <rich:calendar id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -134,7 +134,7 @@
</#if>
value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy" />
<#elseif isTime(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -144,7 +144,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
size="16"
<#if !column.nullable>
required="true"
@@ -154,7 +154,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigDecimal(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if !column.nullable>
required="true"
</#if>
@@ -163,7 +163,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigInteger(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -206,7 +206,7 @@
<#else>
<#assign size = column.length>
</#if>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
Modified: trunk/seam-gen/view/error.xhtml
===================================================================
--- trunk/seam-gen/view/error.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/error.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -11,8 +11,8 @@
<h1>Error</h1>
<p>Something bad happened :-(</p>
-
+
<h:messages styleClass="message"/>
-
-</ui:define>
+
+</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/form.xhtml
===================================================================
--- trunk/seam-gen/view/form.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/form.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -8,33 +8,33 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
-
+
<h:form id="@componentName at Form">
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<s:decorate id="valueDecoration" template="layout/edit.xhtml">
<ui:define name="label">Value</ui:define>
<h:inputText id="value" required="true"
value="#{@componentName at .value}"/>
</s:decorate>
-
+
<div style="clear:both"/>
-
+
</rich:panel>
<div class="actionButtons">
- <h:commandButton id="@methodName@" value="@methodName@"
- action="#{@componentName at .@methodName@}"/>
+ <h:commandButton id="@methodName@" value="@methodName@"
+ action="#{@componentName at .@methodName@}"/>
</div>
</h:form>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/home.xhtml
===================================================================
--- trunk/seam-gen/view/home.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/home.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -11,7 +11,7 @@
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
-
+
<rich:panel>
<f:facet name="header">Welcome!</f:facet>
<p>This empty shell application includes:</p>
@@ -29,6 +29,6 @@
<li>Internationalization support</li>
</ul>
</rich:panel>
-
-</ui:define>
+
+</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/view/layout/template.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/layout/template.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -19,14 +19,14 @@
<ui:param name="projectName" value="@projectName@"/>
</ui:include>
- <div class="body">
- <ui:insert name="body"/>
- </div>
+ <div class="body">
+ <ui:insert name="body"/>
+ </div>
- <div class="footer">
- Powered by <a href="http://jboss.com/products/seam">Seam</a>.
- Generated by seam-gen.
- </div>
+ <div class="footer">
+ Powered by <a href="http://jboss.com/products/seam">Seam</a>.
+ Generated by seam-gen.
+ </div>
</body>
</html>
Modified: trunk/seam-gen/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/list.page.xml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/list.page.xml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -2,15 +2,15 @@
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
-
-<#include "../util/TypeInfo.ftl">
+
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
<param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
<param name="sort" value="${'#'}{${listName}.orderColumn}"/>
<param name="dir" value="${'#'}{${listName}.orderDirection}"/>
-
+
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
Modified: trunk/seam-gen/view/list.xhtml
===================================================================
--- trunk/seam-gen/view/list.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/list.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -7,21 +7,21 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message"/>
-
+
<rich:panel>
<f:facet name="header">@masterPageName@</f:facet>
-
+
<div class="results">
-
- <h:outputText value="No @componentName@ exists"
+
+ <h:outputText value="No @componentName@ exists"
rendered="#{empty @listName at .resultList}"/>
-
+
<h:dataTable id="@listName@" var="@componentName@"
- value="#{@listName at .resultList}"
+ value="#{@listName at .resultList}"
rendered="#{not empty @listName at .resultList}">
<h:column>
<f:facet name="header">Id</f:facet>
@@ -29,25 +29,25 @@
</h:column>
<h:column>
<f:facet name="header">Name</f:facet>
- <s:link id="@componentName@"
- value="#{@componentName at .name}"
+ <s:link id="@componentName@"
+ value="#{@componentName at .name}"
view="/@pageName at .xhtml">
- <f:param name="@componentName at Id"
+ <f:param name="@componentName at Id"
value="#{@componentName at .id}"/>
</s:link>
</h:column>
</h:dataTable>
-
+
</div>
-
+
</rich:panel>
-
+
<div class="actionButtons">
- <s:button id="done"
+ <s:button id="done"
value="Create @componentName@"
- view="/@pageName at .xhtml"/>
+ view="/@pageName at .xhtml"/>
</div>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/list.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,7 +1,7 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<#include "../util/TypeInfo.ftl">
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
@@ -16,15 +16,15 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
+
<h:form id="${componentName}Search" styleClass="edit">
-
+
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
-
+
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
@@ -48,25 +48,25 @@
</#if>
</#if>
</#foreach>
-
+
</rich:simpleTogglePanel>
-
+
<div class="actionButtons">
<h:commandButton id="search" value="Search" action="/${listPageName}.xhtml"/>
</div>
-
+
</h:form>
-
+
<rich:panel>
<f:facet name="header">${entityName} search results</f:facet>
<div class="results" id="${componentName}List">
- <h:outputText value="The ${componentName} search returned no results."
+ <h:outputText value="The ${componentName} search returned no results."
rendered="${'#'}{empty ${listName}.resultList}"/>
-
- <rich:dataTable id="${listName}"
+
+ <rich:dataTable id="${listName}"
var="${componentName}"
- value="${'#'}{${listName}.resultList}"
+ value="${'#'}{${listName}.resultList}"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
@@ -81,7 +81,7 @@
<h:column>
<f:facet name="header">
<s:link styleClass="columnHeader"
- value="${property.name} ${'#'}{${listName}.orderColumn=='${property.name}' ? (${listName}.orderDirection=='desc' ? messages.down : messages.up) : ''}">
+ value="${property.name} ${'#'}{${listName}.orderColumn=='${property.name}' ? (${listName}.orderDirection=='desc' ? messages.down : messages.up) : ''}">
<f:param name="sort" value="${property.name}" />
<f:param name="dir" value="${'#'}{${listName}.orderDirection=='asc' ? 'desc' : 'asc'}"/>
</s:link>
@@ -121,16 +121,16 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link view="/${'#'}{empty from ? '${pageName}' : from}.xhtml"
- value="Select"
+ <s:link view="/${'#'}{empty from ? '${pageName}' : from}.xhtml"
+ value="Select"
id="${componentName}">
<#if pojo.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
- <f:param name="${componentName}${util.upper(componentProperty.name)}"
+ <f:param name="${componentName}${util.upper(componentProperty.name)}"
value="${'#'}{${componentName}.${pojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/>
</#if>
</s:link>
@@ -139,45 +139,45 @@
</div>
</rich:panel>
-
+
<div class="tableControl">
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.previousExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.previousExists}"
value="${'#'}{messages.left}${'#'}{messages.left} First Page"
id="firstPage">
<f:param name="firstResult" value="0"/>
</s:link>
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.previousExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.previousExists}"
value="${'#'}{messages.left} Previous Page"
id="previousPage">
- <f:param name="firstResult"
+ <f:param name="firstResult"
value="${'#'}{${listName}.previousFirstResult}"/>
</s:link>
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.nextExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.nextExists}"
value="Next Page ${'#'}{messages.right}"
id="nextPage">
- <f:param name="firstResult"
+ <f:param name="firstResult"
value="${'#'}{${listName}.nextFirstResult}"/>
</s:link>
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.nextExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.nextExists}"
value="Last Page ${'#'}{messages.right}${'#'}{messages.right}"
id="lastPage">
- <f:param name="firstResult"
+ <f:param name="firstResult"
value="${'#'}{${listName}.lastFirstResult}"/>
</s:link>
-
+
</div>
-
+
<s:div styleClass="actionButtons" rendered="${'#'}{empty from}">
<s:button view="/${editPageName}.xhtml"
- id="create"
+ id="create"
value="Create ${componentName}">
<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
<#if c2j.isComponent(pojo.identifierProperty)>
@@ -190,7 +190,7 @@
</#if>
</s:button>
</s:div>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/login.xhtml
===================================================================
--- trunk/seam-gen/view/login.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/login.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -9,42 +9,42 @@
template="layout/template.xhtml">
<ui:define name="body">
-
+
<h:messages styleClass="message"/>
-
+
<h:form id="login">
-
+
<rich:panel>
<f:facet name="header">Login</f:facet>
-
+
<p>Please login here</p>
-
+
<div class="dialog">
<h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
<h:outputLabel for="username">Username</h:outputLabel>
- <h:inputText id="username"
+ <h:inputText id="username"
value="#{identity.username}"/>
<h:outputLabel for="password">Password</h:outputLabel>
- <h:inputSecret id="password"
+ <h:inputSecret id="password"
value="#{identity.password}"/>
<h:outputLabel for="rememberMe">Remember me</h:outputLabel>
- <h:selectBooleanCheckbox id="rememberMe"
+ <h:selectBooleanCheckbox id="rememberMe"
value="#{identity.rememberMe}"/>
</h:panelGrid>
</div>
-
+
<p>
<i>Note - </i> Please use demo/password to log in the first time. After logging in you may then
use the User Manager link to manage user accounts.
</p>
-
+
</rich:panel>
-
+
<div class="actionButtons">
<h:commandButton value="Login" action="#{identity.login}"/>
</div>
-
+
</h:form>
- </ui:define>
+ </ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/page.xhtml
===================================================================
--- trunk/seam-gen/view/page.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/page.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
Modified: trunk/seam-gen/view/query.xhtml
===================================================================
--- trunk/seam-gen/view/query.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/query.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -6,15 +6,15 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h1>@beanName@ results</h1>
<p>Generated query page</p>
-
+
<h:messages globalOnly="true" styleClass="message"/>
-
- <h:outputText value="No results from search"
+
+ <h:outputText value="No results from search"
rendered="#{empty @componentName at .resultList}"/>
<f:subview id="results" rendered="#{not empty @componentName at .resultList}">
<h:dataTable id="@componentName@"
Modified: trunk/seam-gen/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/view/stylesheet/theme.css 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/stylesheet/theme.css 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,43 +1,43 @@
body {
- font-size: 12px;
+ font-size: 12px;
}
a:active, a:link, a:visited {
- color: #0D5798;
+ color: #0D5798;
}
a:hover {
- color: #8CAFCD;
+ color: #8CAFCD;
}
input, textarea {
- border: 1px solid #BBBBBB;
- font-size: 10px;
- background: #F0F8FF;
- color: black;
+ border: 1px solid #BBBBBB;
+ font-size: 10px;
+ background: #F0F8FF;
+ color: black;
}
input[type='submit'], input[type='button'] {
- background: #4477AA;
- color: white;
- margin: 5px;
- border-color: gray;
+ background: #4477AA;
+ color: white;
+ margin: 5px;
+ border-color: gray;
}
.tableControl, .actionButtons {
- width: 100%;
+ width: 100%;
}
.tableControl a {
- padding-left: 10px;
+ padding-left: 10px;
}
.tableControl {
- text-align: right;
+ text-align: right;
}
.footer {
- text-align: center;
- font-size: 10px;
+ text-align: center;
+ font-size: 10px;
}
.rich-table {
@@ -45,20 +45,20 @@
}
h1 {
- font-family: Arial,sans-serif;
- color: #578BB8;
- font-size: 1.6em;
- margin-top: 0;
+ font-family: Arial,sans-serif;
+ color: #578BB8;
+ font-size: 1.6em;
+ margin-top: 0;
}
body {
- margin: 0px;
- font-family: Arial,sans-serif;
- color: #616161;
+ margin: 0px;
+ font-family: Arial,sans-serif;
+ color: #616161;
}
.body {
- padding: 30px;
+ padding: 30px;
}
.columnHeader:hover
@@ -67,51 +67,51 @@
}
.message {
- border: 1px solid #FFCC00;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F8FF;
- font-size: 12px;
+ border: 1px solid #FFCC00;
+ padding: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: #F0F8FF;
+ font-size: 12px;
}
.name {
- vertical-align: top;
- font-weight: bold;
- width: 115px;
- float: left;
- padding: 5px;
- margin-top: 3px;
- clear: left;
+ vertical-align: top;
+ font-weight: bold;
+ width: 115px;
+ float: left;
+ padding: 5px;
+ margin-top: 3px;
+ clear: left;
}
.value {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
.error {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
.errors {
- color: red;
- vertical-align: middle;
+ color: red;
+ vertical-align: middle;
}
img.errors {
- padding-right: 5px;
+ padding-right: 5px;
}
.errors input {
- border: 1px solid red;
+ border: 1px solid red;
}
.errors textarea {
- border: 1px solid red;
+ border: 1px solid red;
}
.required {
- color: red;
- padding-left: 2px;
+ color: red;
+ padding-left: 2px;
}
.rich-stglpanel-body {
overflow: auto;
-}
+}
Modified: trunk/seam-gen/view/view.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/view.page.xml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/view.page.xml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -2,7 +2,7 @@
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
-
+
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign homeName = componentName + "Home">
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
@@ -13,11 +13,11 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
+
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
@@ -27,13 +27,13 @@
</#foreach>
<div style="clear:both"/>
-
+
</rich:panel>
-
- <div class="actionButtons">
- <s:button view="/${editPageName}.xhtml"
- id="edit"
+ <div class="actionButtons">
+
+ <s:button view="/${editPageName}.xhtml"
+ id="edit"
value="Edit"/>
<s:button view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
@@ -59,12 +59,12 @@
<rich:tab label="${property.name}">
<div class="association" id="${property.name}Parent">
-
- <h:outputText value="There is no ${property.name} associated with this ${componentName}."
+
+ <h:outputText value="There is no ${property.name} associated with this ${componentName}."
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
-
- <rich:dataTable var="${parentName}"
- value="${'#'}{${homeName}.instance.${property.name}}"
+
+ <rich:dataTable var="${parentName}"
+ value="${'#'}{${homeName}.instance.${property.name}}"
rendered="${'#'}{${homeName}.instance.${property.name} != null}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
@@ -89,36 +89,36 @@
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link id="view${parentName}"
- value="View"
+ <s:link id="view${parentName}"
+ value="View"
view="/${parentPageName}.xhtml">
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
- <f:param name="${parentName}${util.upper(componentProperty.name)}"
+ <f:param name="${parentName}${util.upper(componentProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
+ <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
</#if>
</s:link>
</h:column>
</rich:dataTable>
-
+
</div>
</rich:tab>
</#if>
@@ -126,7 +126,7 @@
<rich:tab label="${property.name}">
<div class="association" id="${property.name}Children">
-
+
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
<#assign childPageName = childPojo.shortName>
<#assign childEditPageName = childPojo.shortName + "Edit">
@@ -134,10 +134,10 @@
<#assign childHomeName = childName + "Home">
<h:outputText value="There are no ${property.name} associated with this ${componentName}."
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
-
- <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
- rendered="${'#'}{not empty ${homeName}.${property.name}}"
+
+ <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
+ var="${childName}"
+ rendered="${'#'}{not empty ${homeName}.${property.name}}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
@@ -159,40 +159,40 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link id="select${childName}"
- value="Select"
+ <s:link id="select${childName}"
+ value="Select"
view="/${childPageName}.xhtml">
<#if childPojo.isComponent(childPojo.identifierProperty)>
<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
- <f:param name="${childName}${util.upper(componentProperty.name)}"
+ <f:param name="${childName}${util.upper(componentProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
+ <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</rich:dataTable>
-
+
</div>
-
+
<div class="actionButtons">
- <s:button
+ <s:button
value="Add ${childName}"
view="/${childEditPageName}.xhtml">
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
<f:param name="${childName}From" value="${entityName}"/>
</s:button>
- </div>
+ </div>
</rich:tab>
</#if>
</#foreach>
<#if hasAssociations>
</rich:tabPanel>
-</#if>
+</#if>
</ui:define>
</ui:composition>
More information about the seam-commits
mailing list