[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/03/27 13:59:52

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/messages
                        messages.properties.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
                        view-table.xhtml.vsl
  Log:
  improvements to portlet table
  
  Revision  Changes    Path
  1.9       +1 -0      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl
  
  Index: messages.properties.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- messages.properties.vsl	25 Feb 2008 14:23:20 -0000	1.8
  +++ messages.properties.vsl	27 Mar 2008 20:59:52 -0000	1.9
  @@ -149,6 +149,7 @@
   return.link.text=Return to AndroMDA Home
   
   table.results={0} Items found, displaying {1}, from {2} to {3}. Page {4} / {5}
  +table.results.none.found=No Items Found
   
   #foreach ($message in $applicationUseCase.allMessages.entrySet())
   $message.key=$message.value
  
  
  
  1.3       +6 -4      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl
  
  Index: view-table.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- view-table.xhtml.vsl	21 Mar 2008 22:46:03 -0000	1.2
  +++ view-table.xhtml.vsl	27 Mar 2008 20:59:52 -0000	1.3
  @@ -23,7 +23,7 @@
   
   <h:form>
   #set ($targetColumns = $table.targettedTableColumnNames)
  -<h:panelGroup rendered="#{!empty $table.name}">
  +<h:panelGroup>
       <lr:portletScroller id="${table.name}Scroller1"
               for="$table.name"
               fastStep="10"
  @@ -54,6 +54,7 @@
               <t:graphicImage url="/images/arrow-fr.gif" border="1" />
           </f:facet>
       </lr:portletScroller>
  +    <c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/>
       <lr:portletScroller id="${table.name}Scroller2"
               for="$table.name"
               rowsCountVar="rowsCount"
  @@ -63,7 +64,7 @@
               pageCountVar="pageCount"
               immediate="true"
               pageIndexVar="pageIndex">
  -        <h:outputFormat value="#{messages['table.results']}">
  +        <h:outputFormat value="#{messages['table.results']}" rendered="#{renderTable}">
               <f:param value="#{rowsCount}" />
               <f:param value="#{displayedRowsCountVar}" />
               <f:param value="#{firstRowIndex}" />
  @@ -71,8 +72,9 @@
               <f:param value="#{pageIndex}" />
               <f:param value="#{pageCount}" />
           </h:outputFormat>
  +        <h:outputText value="#{messages['table.results.none.found']}" rendered="#{${table.name} != null and !renderTable}"/>
       </lr:portletScroller>
  -    <lr:table value="#{${table.name}}" var="row" id="$table.name" sortable="true" rows="10">
  +    <lr:table value="#{${table.name}}" var="row" id="$table.name" sortable="true" rows="10" rendered="#{renderTable}">
   #if (!$table.tableColumns.empty)
   #foreach ($column in $table.tableColumns)
   #if($column.name)
  @@ -83,7 +85,7 @@
           <h:column>
               <f:facet name="header">
                   <t:commandSortHeader columnName="$columnName" arrow="true">
  -                    <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
  +                    <h:outputText value="#{renderTable}"/>
                   </t:commandSortHeader>
               </f:facet>
   #set ($tableColumnActions = $table.getTableColumnActions($columnName))