[jboss-cvs] jboss-seam/seam-gen/view ...
Gavin King
gavin.king at jboss.com
Tue Mar 20 00:17:33 EDT 2007
User: gavin
Date: 07/03/20 00:17:33
Modified: seam-gen/view edit.xhtml edit.xhtml.ftl
editproperty.xhtml.ftl form.xhtml list.xhtml.ftl
view.xhtml.ftl viewproperty.xhtml.ftl
Log:
use the new s:decorate
Revision Changes Path
1.5 +9 -13 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edit.xhtml 18 Mar 2007 23:09:18 -0000 1.4
+++ edit.xhtml 20 Mar 2007 04:17:33 -0000 1.5
@@ -17,19 +17,15 @@
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
- <s:validateAll>
- <s:decorateAll labelColumnClass="name"
- fieldColumnClass="value"
- messageColumnClass="error"
- rowClass="prop"
- id="@componentName at FormDecoration">
- <s:decorate id="nameDecoration">
- <f:facet name="label">Name</f:facet>
+ <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>
- </s:decorateAll>
- </s:decorateAll>
+
+ <div style="clear:both"/>
</rich:panel>
1.46 +4 -9 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.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- edit.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.45
+++ edit.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.46
@@ -24,19 +24,14 @@
<rich:panel>
<f:facet name="header">Edit ${entityName}</f:facet>
- <s:validateAll>
- <s:decorateAll labelColumnClass="name"
- fieldColumnClass="value"
- messageColumnClass="error"
- rowClass="prop">
<#foreach property in pojo.allPropertiesIterator>
<#include "editproperty.xhtml.ftl">
</#foreach>
- </s:decorateAll>
- </s:validateAll>
-
- <div><span class="required">*</span> required fields</div>
+ <div style="clear:both">
+ <span class="required">*</span>
+ required fields
+ </div>
</rich:panel>
1.12 +10 -6 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- editproperty.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.11
+++ editproperty.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.12
@@ -6,8 +6,9 @@
<#assign column = componentProperty.columnIterator.next()>
<#assign propertyType = componentProperty.value.typeName>
- <s:decorate id="${componentProperty.name}Decoration">
- <f:facet name="label">${componentProperty.name}</f:facet>
+ <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"
@@ -123,14 +124,16 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration"/>
</h:inputText>
</#if>
+ </ui:define>
</s:decorate>
</#foreach>
<#else>
<#assign column = property.columnIterator.next()>
<#assign propertyType = property.value.typeName>
- <s:decorate id="${property.name}Decoration">
- <f:facet name="label">${property.name}</f:facet>
+ <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"
@@ -244,6 +247,7 @@
<a:support event="onblur" reRender="${property.name}Decoration"/>
</h:inputText>
</#if>
+ </ui:define>
</s:decorate>
</#if>
</#if>
1.4 +9 -13 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- form.xhtml 18 Mar 2007 23:09:18 -0000 1.3
+++ form.xhtml 20 Mar 2007 04:17:33 -0000 1.4
@@ -18,19 +18,15 @@
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
- <s:validateAll>
- <s:decorateAll labelColumnClass="name"
- fieldColumnClass="value"
- messageColumnClass="error"
- rowClass="prop"
- id="@componentName at FormDecoration">
- <s:decorate id="valueDecoration">
- <f:facet name="label">Value</f:facet>
+ <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>
- </s:decorateAll>
- </s:validateAll>
+
+ <div style="clear:both"/>
</rich:panel>
1.20 +12 -14 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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- list.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.19
+++ list.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.20
@@ -23,35 +23,33 @@
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
- <s:decorateAll rowClass="prop"
- labelColumnClass="name"
- fieldColumnClass="value"
- id="${componentName}SearchCriteria">
-
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if componentProperty.value.typeName == "string">
- <h:inputText id="${componentProperty.name}"
- value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}">
- <f:facet name="label">${componentProperty.name}</f:facet>
- </h:inputText>
+ <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>
</#foreach>
<#else>
<#if property.value.typeName == "string">
- <h:inputText id="${property.name}"
- value="${'#'}{${listName}.${componentName}.${property.name}}">
- <f:facet name="label">${property.name}</f:facet>
- </h:inputText>
+ <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>
</#if>
</#if>
</#foreach>
- </s:decorateAll>
</rich:simpleTogglePanel>
1.21 +1 -6 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- view.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.20
+++ view.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.21
@@ -21,18 +21,13 @@
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
- <s:decorateAll labelColumnClass="name"
- fieldColumnClass="value"
- rowClass="prop"
- styleClass="dialog"
- id="${componentName}">
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
- </s:decorateAll>
+ <div style="clear:both"/>
</rich:panel>
1.5 +10 -6 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- viewproperty.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.4
+++ viewproperty.xhtml.ftl 20 Mar 2007 04:17:33 -0000 1.5
@@ -3,8 +3,9 @@
<#foreach componentProperty in property.value.propertyIterator>
<#assign propertyType = componentProperty.value.typeName>
- <s:span id="${componentProperty.name}">
- <f:facet name="label">${componentProperty.name}</f:facet>
+ <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"/>
@@ -28,13 +29,15 @@
<#else>
${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}
</#if>
- </s:span>
+ </ui:define>
+ </s:decorate>
</#foreach>
<#else>
<#assign propertyType = property.value.typeName>
- <s:span id="${property.name}">
- <f:facet name="label">${property.name}</f:facet>
+ <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"/>
@@ -58,6 +61,7 @@
<#else>
${'#'}{${homeName}.instance.${property.name}}
</#if>
- </s:span>
+ </ui:define>
+ </s:decorate>
</#if>
</#if>
More information about the jboss-cvs-commits
mailing list