[jboss-cvs] jboss-seam/seam-gen/view ...
Gavin King
gavin.king at jboss.com
Tue Mar 20 21:37:44 EDT 2007
User: gavin
Date: 07/03/20 21:37:44
Modified: seam-gen/view edit.xhtml edit.xhtml.ftl
editproperty.xhtml.ftl form.xhtml list.xhtml.ftl
view.xhtml.ftl viewproperty.xhtml.ftl
Log:
nicer :-)
Revision Changes Path
1.6 +2 -4 jboss-seam/seam-gen/view/edit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: edit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edit.xhtml 20 Mar 2007 04:17:33 -0000 1.5
+++ edit.xhtml 21 Mar 2007 01:37:44 -0000 1.6
@@ -19,10 +19,8 @@
<s:decorate id="nameDecoration" template="layout/edit.xhtml">
<ui:define name="label">Name</ui:define>
- <ui:define name="input">
<h:inputText id="name" required="true"
value="#{@homeName at .instance.name}"/>
- </ui:define>
</s:decorate>
<div style="clear:both"/>
1.47 +0 -2 jboss-seam/seam-gen/view/edit.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: edit.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.xhtml.ftl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- edit.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.46
+++ edit.xhtml.ftl 21 Mar 2007 01:37:44 -0000 1.47
@@ -23,7 +23,6 @@
<rich:panel>
<f:facet name="header">Edit ${entityName}</f:facet>
-
<#foreach property in pojo.allPropertiesIterator>
<#include "editproperty.xhtml.ftl">
</#foreach>
@@ -67,7 +66,6 @@
</div>
</h:form>
-
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
1.13 +138 -142 jboss-seam/seam-gen/view/editproperty.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: editproperty.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/editproperty.xhtml.ftl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- editproperty.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.12
+++ editproperty.xhtml.ftl 21 Mar 2007 01:37:44 -0000 1.13
@@ -8,7 +8,6 @@
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
- <ui:define name="input">
<#if propertyType == "date">
<h:inputText id="${componentProperty.name}"
maxlength="10"
@@ -124,7 +123,6 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration"/>
</h:inputText>
</#if>
- </ui:define>
</s:decorate>
</#foreach>
<#else>
@@ -133,7 +131,6 @@
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${property.name}</ui:define>
- <ui:define name="input">
<#if propertyType == "date">
<h:inputText id="${property.name}"
maxlength="10"
@@ -247,7 +244,6 @@
<a:support event="onblur" reRender="${property.name}Decoration"/>
</h:inputText>
</#if>
- </ui:define>
</s:decorate>
</#if>
</#if>
1.5 +2 -4 jboss-seam/seam-gen/view/form.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: form.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/form.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- form.xhtml 20 Mar 2007 04:17:33 -0000 1.4
+++ form.xhtml 21 Mar 2007 01:37:44 -0000 1.5
@@ -20,10 +20,8 @@
<s:decorate id="valueDecoration" template="layout/edit.xhtml">
<ui:define name="label">Value</ui:define>
- <ui:define name="input">
<h:inputText id="value" required="true"
value="#{@componentName at .value}"/>
- </ui:define>
</s:decorate>
<div style="clear:both"/>
1.21 +2 -6 jboss-seam/seam-gen/view/list.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: list.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/list.xhtml.ftl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- list.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.20
+++ list.xhtml.ftl 21 Mar 2007 01:37:44 -0000 1.21
@@ -30,9 +30,7 @@
<#if componentProperty.value.typeName == "string">
<s:decorate template="layout/display.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
- <ui:define name="value">
<h:inputText id="${componentProperty.name}" value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"/>
- </ui:define>
</s:decorate>
</#if>
@@ -41,9 +39,7 @@
<#if property.value.typeName == "string">
<s:decorate template="layout/display.xhtml">
<ui:define name="label">${property.name}</ui:define>
- <ui:define name="value">
<h:inputText id="${property.name}" value="${'#'}{${listName}.${componentName}.${property.name}}"/>
- </ui:define>
</s:decorate>
</#if>
1.22 +0 -2 jboss-seam/seam-gen/view/view.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: view.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/view.xhtml.ftl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- view.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.21
+++ view.xhtml.ftl 21 Mar 2007 01:37:44 -0000 1.22
@@ -20,7 +20,6 @@
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
-
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#include "viewproperty.xhtml.ftl">
@@ -42,7 +41,6 @@
value="Done"/>
</div>
-
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
1.6 +32 -36 jboss-seam/seam-gen/view/viewproperty.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: viewproperty.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/viewproperty.xhtml.ftl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- viewproperty.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.5
+++ viewproperty.xhtml.ftl 21 Mar 2007 01:37:44 -0000 1.6
@@ -5,7 +5,6 @@
<s:decorate id="${componentProperty.name}" template="layout/display.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
- <ui:define name="value">
<#if propertyType == "date">
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
@@ -29,7 +28,6 @@
<#else>
${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}
</#if>
- </ui:define>
</s:decorate>
</#foreach>
<#else>
@@ -37,7 +35,6 @@
<s:decorate id="${property.name}" template="layout/display.xhtml">
<ui:define name="label">${property.name}</ui:define>
- <ui:define name="value">
<#if propertyType == "date">
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
@@ -61,7 +58,6 @@
<#else>
${'#'}{${homeName}.instance.${property.name}}
</#if>
- </ui:define>
</s:decorate>
</#if>
</#if>
More information about the jboss-cvs-commits
mailing list