[jboss-cvs] jboss-seam/seam-gen/view ...
Gavin King
gavin.king at jboss.com
Sun Mar 18 19:09:18 EDT 2007
User: gavin
Date: 07/03/18 19:09:18
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 s:decorateAll in seam-gen
Revision Changes Path
1.4 +13 -11 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edit.xhtml 16 Mar 2007 12:30:26 -0000 1.3
+++ edit.xhtml 18 Mar 2007 23:09:18 -0000 1.4
@@ -12,22 +12,24 @@
<h:messages globalOnly="true" styleClass="message"/>
- <h:form id="@componentName@">
+ <h:form id="@componentName at Form">
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
<s:validateAll>
- <div class="prop">
- <span class="name">Name</span>
- <span class="value">
- <s:decorate>
+ <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>
<h:inputText id="name" required="true"
value="#{@homeName at .instance.name}"/>
</s:decorate>
- </span>
- </div>
- </s:validateAll>
+ </s:decorateAll>
+ </s:decorateAll>
</rich:panel>
1.45 +5 -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.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- edit.xhtml.ftl 14 Mar 2007 16:09:52 -0000 1.44
+++ edit.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.45
@@ -25,12 +25,15 @@
<f:facet name="header">Edit ${entityName}</f:facet>
<s:validateAll>
- <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
+ <s:decorateAll labelColumnClass="name"
+ fieldColumnClass="value"
+ messageColumnClass="error"
+ rowClass="prop">
<#foreach property in pojo.allPropertiesIterator>
<#include "editproperty.xhtml.ftl">
</#foreach>
- </h:panelGrid>
+ </s:decorateAll>
</s:validateAll>
<div><span class="required">*</span> required fields</div>
1.11 +2 -12 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- editproperty.xhtml.ftl 16 Mar 2007 02:49:50 -0000 1.10
+++ editproperty.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.11
@@ -6,13 +6,8 @@
<#assign column = componentProperty.columnIterator.next()>
<#assign propertyType = componentProperty.value.typeName>
- <h:outputLabel for="${componentProperty.name}">
- ${componentProperty.name}
-<#if !column.nullable>
- <span class="required">*</span>
-</#if>
- </h:outputLabel>
<s:decorate id="${componentProperty.name}Decoration">
+ <f:facet name="label">${componentProperty.name}</f:facet>
<#if propertyType == "date">
<h:inputText id="${componentProperty.name}"
maxlength="10"
@@ -134,13 +129,8 @@
<#assign column = property.columnIterator.next()>
<#assign propertyType = property.value.typeName>
- <h:outputLabel for="${property.name}">
- ${property.name}
-<#if !column.nullable>
- <span class="required">*</span>
-</#if>
- </h:outputLabel>
<s:decorate id="${property.name}Decoration">
+ <f:facet name="label">${property.name}</f:facet>
<#if propertyType == "date">
<h:inputText id="${property.name}"
maxlength="10"
1.3 +24 -24 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- form.xhtml 14 Mar 2007 04:22:37 -0000 1.2
+++ form.xhtml 18 Mar 2007 23:09:18 -0000 1.3
@@ -13,24 +13,26 @@
<h:messages globalOnly="true" styleClass="message"/>
+ <h:form id="@componentName at Form">
+
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
- <h:form id="@componentName at Form">
-
- <div class="dialog">
<s:validateAll>
- <div class="prop">
- <span class="name">Value</span>
- <span class="value">
- <s:decorate>
+ <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>
<h:inputText id="value" required="true"
value="#{@componentName at .value}"/>
</s:decorate>
- </span>
- </div>
+ </s:decorateAll>
</s:validateAll>
- </div>
+
+ </rich:panel>
<div class="actionButtons">
<h:commandButton id="@methodName@" value="@methodName@"
@@ -39,8 +41,6 @@
</h:form>
- </rich:panel>
-
</ui:define>
</ui:composition>
1.19 +14 -9 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- list.xhtml.ftl 9 Mar 2007 23:55:07 -0000 1.18
+++ list.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.19
@@ -19,35 +19,40 @@
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
- <h:form id="${componentName}" styleClass="edit">
+ <h:form id="${componentName}Search" styleClass="edit">
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
- <div class="dialog">
- <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
+
+ <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:outputLabel for="${componentProperty.name}">${componentProperty.name}</h:outputLabel>
<h:inputText id="${componentProperty.name}"
- value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"/>
+ value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}">
+ <f:facet name="label">${componentProperty.name}</f:facet>
+ </h:inputText>
</#if>
</#foreach>
<#else>
<#if property.value.typeName == "string">
- <h:outputLabel for="${property.name}">${property.name}</h:outputLabel>
<h:inputText id="${property.name}"
- value="${'#'}{${listName}.${componentName}.${property.name}}"/>
+ value="${'#'}{${listName}.${componentName}.${property.name}}">
+ <f:facet name="label">${property.name}</f:facet>
+ </h:inputText>
</#if>
</#if>
</#if>
</#foreach>
- </h:panelGrid>
- </div>
+ </s:decorateAll>
+
</rich:simpleTogglePanel>
<div class="actionButtons">
1.20 +7 -4 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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- view.xhtml.ftl 14 Mar 2007 16:09:52 -0000 1.19
+++ view.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.20
@@ -21,16 +21,19 @@
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
- <div id="${componentName}" class="dialog">
- <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
+ <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>
- </h:panelGrid>
- </div>
+ </s:decorateAll>
+
</rich:panel>
<div class="actionButtons">
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- viewproperty.xhtml.ftl 10 Feb 2007 07:33:22 -0000 1.3
+++ viewproperty.xhtml.ftl 18 Mar 2007 23:09:18 -0000 1.4
@@ -3,8 +3,8 @@
<#foreach componentProperty in property.value.propertyIterator>
<#assign propertyType = componentProperty.value.typeName>
- <h:panelGroup>${componentProperty.name}</h:panelGroup>
<s:span id="${componentProperty.name}">
+ <f:facet name="label">${componentProperty.name}</f:facet>
<#if propertyType == "date">
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
@@ -33,8 +33,8 @@
<#else>
<#assign propertyType = property.value.typeName>
- <h:panelGroup>${property.name}</h:panelGroup>
<s:span id="${property.name}">
+ <f:facet name="label">${property.name}</f:facet>
<#if propertyType == "date">
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
More information about the jboss-cvs-commits
mailing list