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

[Gavin King]

  User: gavin   
  Date: 06/12/16 06:37:52

  Modified:    seam-gen/view   list.page.xml.ftl list.xhtml.ftl
  Log:
  list screen ordering
  
  Revision  Changes    Path
  1.2       +1 -0      jboss-seam/seam-gen/view/list.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: list.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/list.page.xml.ftl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- list.page.xml.ftl	10 Dec 2006 16:53:28 -0000	1.1
  +++ list.page.xml.ftl	16 Dec 2006 11:37:52 -0000	1.2
  @@ -7,4 +7,5 @@
   <#assign listName = componentName + "List">
   <page>
      <param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
  +   <param name="order" value="${'#'}{${listName}.order}"/>
   </page>
  \ No newline at end of file
  
  
  
  1.8       +15 -6     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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- list.xhtml.ftl	10 Dec 2006 15:42:02 -0000	1.7
  +++ list.xhtml.ftl	16 Dec 2006 11:37:52 -0000	1.8
  @@ -31,14 +31,23 @@
   <#foreach property in pojo.allPropertiesIterator>
   <#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
           <h:column>
  -            <f:facet name="header">${property.name}</f:facet>
  +            <f:facet name="header">
  +                <s:link value="${property.name} ${'#'}{${listName}.order=='${property.name} asc' ? messages.down : ( ${listName}.order=='${property.name} desc' ? messages.up : '' )}" styleClass="columnHeader">
  +                    <f:param name="order" value="${'#'}{${listName}.order=='${property.name} asc' ? '${property.name} desc' : '${property.name} asc'}"/>
  +                </s:link>
  +            </f:facet>
               ${'#'}{${componentName}.${property.name}}
           </h:column>
   </#if>
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
           <h:column>
  -            <f:facet name="header">${property.name} ${parentPojo.identifierProperty.name}</f:facet>
  +            <f:facet name="header">
  +<#assign propertyPath = property.name + '.' + parentPojo.identifierProperty.name>
  +                <s:link value="${property.name} ${parentPojo.identifierProperty.name} ${'#'}{${listName}.order=='${propertyPath} asc' ? messages.down : ( ${listName}.order=='${propertyPath} desc' ? messages.up : '' )}" styleClass="columnHeader">
  +                    <f:param name="order" value="${'#'}{${listName}.order=='${propertyPath} asc' ? '${propertyPath} desc' : '${propertyPath} asc'}"/>
  +                </s:link>
  +            </f:facet>
               ${'#'}{${componentName}.${property.name}.${parentPojo.identifierProperty.name}}
           </h:column>
   </#if>
  @@ -58,14 +67,14 @@
         
           <s:link view="/${listPageName}.xhtml" 
               rendered="${'#'}{${listName}.previousExists}" 
  -               value="&lt;&lt; First Page"
  +               value="${'#'}{messages.left}${'#'}{messages.left} First Page"
                     id="firstPage">
             <f:param name="firstResult" value="0"/>
           </s:link>
           
           <s:link view="/${listPageName}.xhtml" 
               rendered="${'#'}{${listName}.previousExists}" 
  -               value="&lt; Previous Page"
  +               value="${'#'}{messages.left} Previous Page"
                     id="previousPage">
               <f:param name="firstResult" 
                       value="${'#'}{${listName}.previousFirstResult}"/>
  @@ -73,7 +82,7 @@
           
           <s:link view="/${listPageName}.xhtml" 
               rendered="${'#'}{${listName}.nextExists}" 
  -               value="Next Page &gt;"
  +               value="Next Page ${'#'}{messages.right}"
                     id="nextPage">
               <f:param name="firstResult" 
                       value="${'#'}{${listName}.nextFirstResult}"/>
  @@ -81,7 +90,7 @@
           
           <s:link view="/${listPageName}.xhtml" 
               rendered="${'#'}{${listName}.nextExists}" 
  -               value="Last Page &gt;&gt;"
  +               value="Last Page ${'#'}{messages.right}${'#'}{messages.right}"
                     id="lastPage">
               <f:param name="firstResult" 
                       value="${'#'}{${listName}.lastFirstResult}"/>