[seam-commits] Seam SVN: r8475 - trunk/seam-gen/view and 1 other directory.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Wed Jul 16 14:52:35 EDT 2008


Author: dan.j.allen
Date: 2008-07-16 14:52:35 -0400 (Wed, 16 Jul 2008)
New Revision: 8475

Modified:
   branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl
   trunk/seam-gen/view/editproperty.xhtml.ftl
Log:
JBSEAM-3171


Modified: branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl	2008-07-16 18:00:03 UTC (rev 8474)
+++ branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl	2008-07-16 18:52:35 UTC (rev 8475)
@@ -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,17 +29,13 @@
                     <a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
                 </h:inputText>
 <#elseif isTimestamp(componentProperty)>
-                <h:inputText id="${componentProperty.name}" 
-                           size="16"
+                <rich:calendar id="${componentProperty.name}"
 <#if !column.nullable>
                        required="true"
 </#if>
-                          value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                     <s:convertDateTime type="both" dateStyle="short"/>
-                     <a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
-                </h:inputText>
+                          value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy hh:mm a" />
 <#elseif isBigDecimal(componentProperty)>
-                <h:inputText id="${componentProperty.name}" 
+                <h:inputText id="${componentProperty.name}"
 <#if !column.nullable>
                        required="true"
 </#if>
@@ -48,7 +44,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 +87,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 +121,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 +130,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,17 +140,13 @@
                     <a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
                 </h:inputText>
 <#elseif isTimestamp(property)>
-                <h:inputText id="${property.name}" 
-                           size="16"
+                <rich:calendar id="${property.name}"
 <#if !column.nullable>
                        required="true"
 </#if>
-                          value="${'#'}{${homeName}.instance.${property.name}}">
-                    <s:convertDateTime type="both" dateStyle="short"/>
-                    <a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
-                </h:inputText>
+                          value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy hh:mm a"/>
 <#elseif isBigDecimal(property)>
-                <h:inputText id="${property.name}" 
+                <h:inputText id="${property.name}"
 <#if !column.nullable>
                        required="true"
 </#if>
@@ -163,7 +155,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 +198,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/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/editproperty.xhtml.ftl	2008-07-16 18:00:03 UTC (rev 8474)
+++ trunk/seam-gen/view/editproperty.xhtml.ftl	2008-07-16 18:52:35 UTC (rev 8475)
@@ -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>
@@ -29,15 +29,11 @@
                     <a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
                 </h:inputText>
 <#elseif isTimestamp(componentProperty)>
-                <h:inputText id="${componentProperty.name}"
-                           size="16"
+                <rich:calendar id="${componentProperty.name}"
 <#if !column.nullable>
                        required="true"
 </#if>
-                          value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                     <s:convertDateTime type="both" dateStyle="short"/>
-                     <a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
-                </h:inputText>
+                          value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy hh:mm a" />
 <#elseif isBigDecimal(componentProperty)>
                 <h:inputText id="${componentProperty.name}"
 <#if !column.nullable>
@@ -125,7 +121,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>
@@ -144,15 +140,11 @@
                     <a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
                 </h:inputText>
 <#elseif isTimestamp(property)>
-                <h:inputText id="${property.name}"
-                           size="16"
+                <rich:calendar id="${property.name}"
 <#if !column.nullable>
                        required="true"
 </#if>
-                          value="${'#'}{${homeName}.instance.${property.name}}">
-                    <s:convertDateTime type="both" dateStyle="short"/>
-                    <a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
-                </h:inputText>
+                          value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy hh:mm a"/>
 <#elseif isBigDecimal(property)>
                 <h:inputText id="${property.name}"
 <#if !column.nullable>




More information about the seam-commits mailing list