[jboss-cvs] jboss-seam/seam-gen/view ...
Gavin King
gavin.king at jboss.com
Sat Feb 10 02:33:22 EST 2007
User: gavin
Date: 07/02/10 02:33:22
Modified: seam-gen/view edit.xhtml.ftl editproperty.xhtml.ftl
list.xhtml.ftl login.xhtml view.xhtml.ftl
viewproperty.xhtml.ftl
Log:
use panelGrid
Revision Changes Path
1.36 +4 -4 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.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- edit.xhtml.ftl 10 Feb 2007 05:24:45 -0000 1.35
+++ edit.xhtml.ftl 10 Feb 2007 07:33:22 -0000 1.36
@@ -23,14 +23,14 @@
<h:form id="${componentName}" styleClass="edit">
<div class="dialog">
- <table>
<s:validateAll>
+ <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
<#foreach property in pojo.allPropertiesIterator>
<#include "editproperty.xhtml.ftl">
</#foreach>
+ </h:panelGrid>
</s:validateAll>
- </table>
</div>
<div class="actionButtons">
1.4 +108 -120 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- editproperty.xhtml.ftl 10 Feb 2007 06:23:49 -0000 1.3
+++ editproperty.xhtml.ftl 10 Feb 2007 07:33:22 -0000 1.4
@@ -6,11 +6,7 @@
<#assign column = componentProperty.columnIterator.next()>
<#assign propertyType = componentProperty.value.typeName>
- <tr class="prop">
- <td class="name">
<h:outputLabel for="${componentProperty.name}">${componentProperty.name}</h:ouputLabel>
- </td>
- <td class="value">
<s:decorate>
<#if propertyType == "date">
<h:inputText id="${componentProperty.name}"
@@ -117,18 +113,12 @@
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
</#if>
</s:decorate>
- </td>
- </tr>
</#foreach>
<#else>
<#assign column = property.columnIterator.next()>
<#assign propertyType = property.value.typeName>
- <tr class="prop">
- <td class="name">
<h:outputLabel for="${property.name}">${property.name}</h:outputLabel>
- </td>
- <td class="value">
<s:decorate>
<#if propertyType == "date">
<h:inputText id="${property.name}"
@@ -235,8 +225,6 @@
value="${'#'}{${homeName}.instance.${property.name}}"/>
</#if>
</s:decorate>
- </td>
- </tr>
</#if>
</#if>
</#if>
1.16 +11 -20 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- list.xhtml.ftl 10 Feb 2007 06:23:49 -0000 1.15
+++ list.xhtml.ftl 10 Feb 2007 07:33:22 -0000 1.16
@@ -24,39 +24,30 @@
<h:form id="${componentName}" styleClass="edit">
<div class="dialog">
- <table>
+ <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
+
<#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">
- <tr class="prop">
- <td class="name">
<h:outputLabel for="${componentProperty.name}">${componentProperty.name}</h:outputLabel>
- </td>
- <td class="value">
<h:inputText id="${componentProperty.name}"
value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"/>
- </td>
- </tr>
+
</#if>
</#foreach>
<#else>
<#if property.value.typeName == "string">
- <tr class="prop">
- <td class="name">
<h:outputLabel for="${property.name}">${property.name}</h:outputLabel>
- </td>
- <td class="value">
<h:inputText id="${property.name}"
value="${'#'}{${listName}.${componentName}.${property.name}}"/>
- </td>
- </tr>
+
</#if>
</#if>
</#if>
</#foreach>
- </table>
+ </h:panelGrid>
</div>
<div class="actionButtons">
1.6 +11 -29 jboss-seam/seam-gen/view/login.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: login.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/login.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- login.xhtml 10 Feb 2007 06:27:16 -0000 1.5
+++ login.xhtml 10 Feb 2007 07:33:22 -0000 1.6
@@ -17,35 +17,17 @@
<h:form id="login">
<div class="dialog">
- <table>
- <tr class="prop">
- <td class="name">
+ <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
<h:outputLabel for="username">Username</h:outputLabel>
- </td>
- <td class="value">
<h:inputText id="username"
value="#{identity.username}"/>
- </td>
- </tr>
- <tr class="prop">
- <td class="name">
<h:outputLabel for="password">Password</h:outputLabel>
- </td>
- <td class="value">
<h:inputSecret id="password"
value="#{identity.password}"/>
- </td>
- </tr>
- <tr class="prop">
- <td class="name">
<h:outputLabel for="rememberMe">Remember me</h:outputLabel>
- </td>
- <td class="value">
<h:selectBooleanCheckbox id="rememberMe"
value="#{identity.rememberMe}"/>
- </td>
- </tr>
- </table>
+ </h:panelGrid>
</div>
<div class="actionButtons">
1.15 +2 -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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- view.xhtml.ftl 10 Feb 2007 05:06:10 -0000 1.14
+++ view.xhtml.ftl 10 Feb 2007 07:33:22 -0000 1.15
@@ -21,14 +21,14 @@
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
<div id="${componentName}" class="dialog">
- <table>
+ <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
- </table>
+ </h:panelGrid>
</div>
<div class="actionButtons">
1.3 +38 -42 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- viewproperty.xhtml.ftl 10 Feb 2007 04:38:43 -0000 1.2
+++ viewproperty.xhtml.ftl 10 Feb 2007 07:33:22 -0000 1.3
@@ -3,9 +3,8 @@
<#foreach componentProperty in property.value.propertyIterator>
<#assign propertyType = componentProperty.value.typeName>
- <tr class="prop">
- <td class="name">${componentProperty.name}</td>
- <td class="value" id="${componentProperty.name}">
+ <h:panelGroup>${componentProperty.name}</h:panelGroup>
+ <s:span id="${componentProperty.name}">
<#if propertyType == "date">
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
@@ -29,15 +28,13 @@
<#else>
${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}
</#if>
- </td>
- </tr>
+ </s:span>
</#foreach>
<#else>
<#assign propertyType = property.value.typeName>
- <tr class="prop">
- <td class="name">${property.name}</td>
- <td class="value" id="${property.name}">
+ <h:panelGroup>${property.name}</h:panelGroup>
+ <s:span id="${property.name}">
<#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>
- </td>
- </tr>
+ </s:span>
</#if>
</#if>
More information about the jboss-cvs-commits
mailing list