[jboss-cvs] jboss-seam/seam-gen/view ...

[Gavin King]

  User: gavin   
  Date: 06/11/07 01:57:44

  Modified:    seam-gen/view   edit.xhtml.ftl list.xhtml.ftl
  Log:
  slightly better conversation model
  
  Revision  Changes    Path
  1.3       +13 -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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- edit.xhtml.ftl	7 Nov 2006 06:34:24 -0000	1.2
  +++ edit.xhtml.ftl	7 Nov 2006 06:57:44 -0000	1.3
  @@ -21,12 +21,13 @@
       
       <h:form id="${componentName}">
           <div class="dialog">
  +        <table>
           <s:validateAll>
   <#foreach property in pojo.allPropertiesIterator>
   <#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
  -            <div class="prop">
  -                <span class="name">${property.name}</span>
  -                <span class="value">
  +            <tr class="prop">
  +                <td class="name">${property.name}</td>
  +                <td class="value">
                       <s:decorate>
   <#if property.equals(pojo.identifierProperty)>
   <#if property.value.identifierGeneratorStrategy == "assigned">
  @@ -56,11 +57,12 @@
   </#if>
   </#if>
                       </s:decorate>
  -                </span>
  -            </div>
  +                </td>
  +            </tr>
   </#if>
   </#foreach>
           </s:validateAll>
  +        </table>
           </div>
           <div class="actionButtons">
               <h:commandButton id="save" value="Save" 
  @@ -69,9 +71,11 @@
               <h:commandButton id="update" value="Save" 
                   action="${'#'}{${homeName}.update}"
                   rendered="${'#'}{${homeName}.managed}"/>    			  
  -            <h:commandButton id="delete" value="Delete" 
  +            <s:link id="delete" value="Delete" 
                   action="${'#'}{${homeName}.remove}"
  -                rendered="${'#'}{${homeName}.managed}"/>
  +                rendered="${'#'}{${homeName}.managed}"
  +                propagation="end" linkStyle="button"
  +                view="/${masterPageName}.xhtml"/>
               <s:link id="done" value="Done" linkStyle="button"
                   propagation="end" view="/${masterPageName}.xhtml"/>			  
           </div>
  @@ -109,7 +113,7 @@
   </#foreach>
                  <h:column>
                      <f:facet name="header">action</f:facet>
  -		           <s:link id="${parentName}" value="View" view="/${parentPageName}.xhtml">
  +		           <s:link id="${parentName}" value="View" view="/${parentPageName}.xhtml" propagation="nest">
   		               <f:param name="${parentName}Id" value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
   		           </s:link>
                  </h:column>
  @@ -137,7 +141,7 @@
   </#foreach>
               <h:column>
                   <f:facet name="header">action</f:facet>
  -		        <s:link id="${childName}" value="Select" view="/${childPageName}.xhtml">
  +		        <s:link id="${childName}" value="Select" view="/${childPageName}.xhtml" propagation="nest">
   		            <f:param name="${childName}Id" value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
   		        </s:link>
               </h:column>
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- list.xhtml.ftl	7 Nov 2006 05:18:57 -0000	1.1
  +++ list.xhtml.ftl	7 Nov 2006 06:57:44 -0000	1.2
  @@ -41,7 +41,7 @@
   </#foreach>
           <h:column>
               <f:facet name="header">action</f:facet>
  -            <s:link id="${componentName}" value="Select" view="/${pageName}.xhtml">
  +            <s:link id="${componentName}" value="Select" view="/${pageName}.xhtml" propagation="begin">
                   <f:param name="${componentName}Id" value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/>
               </s:link>
           </h:column>