From: Chad B. <cwb...@us...> - 2008-03-21 22:46:06
|
User: cwbrandon Date: 08/03/21 15:46:03 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Log: add sortable flag Revision Changes Path 1.2 +5 -5 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.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- view-table.xhtml.vsl 21 Mar 2008 16:07:12 -0000 1.1 +++ view-table.xhtml.vsl 21 Mar 2008 22:46:03 -0000 1.2 @@ -24,7 +24,7 @@ <h:form> #set ($targetColumns = $table.targettedTableColumnNames) <h:panelGroup rendered="#{!empty $table.name}"> - <t:dataScroller id="${table.name}Scroller1" + <lr:portletScroller id="${table.name}Scroller1" for="$table.name" fastStep="10" pageCountVar="pageCount" @@ -53,8 +53,8 @@ <f:facet name="fastrewind"> <t:graphicImage url="/images/arrow-fr.gif" border="1" /> </f:facet> - </t:dataScroller> - <t:dataScroller id="${table.name}Scroller2" + </lr:portletScroller> + <lr:portletScroller id="${table.name}Scroller2" for="$table.name" rowsCountVar="rowsCount" displayedRowsCountVar="displayedRowsCountVar" @@ -71,8 +71,8 @@ <f:param value="#{pageIndex}" /> <f:param value="#{pageCount}" /> </h:outputFormat> - </t:dataScroller> - <lr:table value="#{${table.name}}" var="row" id="$table.name" rows="10"> + </lr:portletScroller> + <lr:table value="#{${table.name}}" var="row" id="$table.name" sortable="true" rows="10"> #if (!$table.tableColumns.empty) #foreach ($column in $table.tableColumns) #if($column.name) |
From: Chad B. <cwb...@us...> - 2008-03-27 20:59:48
|
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)) |
From: Chad B. <cwb...@us...> - 2008-03-27 21:46:08
|
User: cwbrandon Date: 08/03/27 14:46:14 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Log: fix render table link params Revision Changes Path 1.4 +12 -7 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.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- view-table.xhtml.vsl 27 Mar 2008 20:59:52 -0000 1.3 +++ view-table.xhtml.vsl 27 Mar 2008 21:46:14 -0000 1.4 @@ -1,14 +1,19 @@ ## ## This macro renders the <f:param> elements for a command link ## -#macro (renderTableCommandLinkParameters) +#macro (renderTableCommandLinkParameters $attribute) #foreach ($parameter in $action.parameters) #if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name)) #set ($parameterValue = "row.${parameter.name}") #else -#set ($parameterValue = "${actionFormKey}.${parameter.name}") +#set ($parameterValue = "$parameter.name") #end - <f:param name="$parameter.name" value="#{${parameterValue}}"/> +#if($attribute) +#set ($elementType = "attribute") +#else +#set ($elementType = "param") +#end + <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/> #end #end <div xmlns="http://www.w3.org/1999/xhtml" @@ -85,7 +90,7 @@ <h:column> <f:facet name="header"> <t:commandSortHeader columnName="$columnName" arrow="true"> - <h:outputText value="#{renderTable}"/> + <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/> </t:commandSortHeader> </f:facet> #set ($tableColumnActions = $table.getTableColumnActions($columnName)) @@ -97,7 +102,7 @@ <a:convertDateTime pattern="$defaultDateFormat"/> #end </h:outputText> -#renderTableCommandLinkParameters() +#renderTableCommandLinkParameters(false) </h:commandLink> #else <h:outputText value="#{row.${columnName}}"> @@ -123,7 +128,7 @@ <h:column> <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}"> <h:outputText value="#{messages['$action.trigger.messageKey']}"/> -#renderTableCommandLinkParameters() +#renderTableCommandLinkParameters(false) </h:commandLink> </h:column> #end @@ -134,7 +139,7 @@ <h:column> <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}" styleClass="buttonLink"> <h:outputText value="#{messages['$action.trigger.messageKey']}" /> -#renderTableCommandLinkParameters() +#renderTableCommandLinkParameters(true) </h:commandLink> </h:column> #end |
From: Chad B. <cwb...@us...> - 2008-03-27 21:58:29
|
User: cwbrandon Date: 08/03/27 14:58:35 Modified: andromda-jsf2/src/main/resources/META-INF/andromda cartridge.xml andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes view-table.jspf.vsl andromda-jsf2/src/main/resources/templates/jsf2/views/facelets view-table.xhtml.vsl andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Added: andromda-jsf2/src/main/resources/templates/jsf2/views renderTableCommandLinkParameters.vm Log: move renderTableCommandLinkParameters into its on vm file Revision Changes Path 1.16 +3 -1 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml Index: cartridge.xml =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -r1.15 -r1.16 --- cartridge.xml 27 Mar 2008 18:34:45 -0000 1.15 +++ cartridge.xml 27 Mar 2008 21:58:35 -0000 1.16 @@ -4,6 +4,7 @@ <macrolibrary name="templates/jsf2/controllers/Controller.java.vm"/> <macrolibrary name="templates/jsf2/views/renderActionFormInput.vm"/> <macrolibrary name="templates/jsf2/views/renderActionCommandLinkParameter.vm"/> + <macrolibrary name="templates/jsf2/views/renderTableCommandLinkParameters.vm"/> <macrolibrary name="templates/jsf2/forms/formMacros.vm"/> <macrolibrary name="templates/jsf2/forms/formImplMacros.vm"/> <macrolibrary name="templates/jsf2/configuration/validation.xml.vm"/> @@ -1074,7 +1075,8 @@ outlet="managed-beans" overwrite="true" outputToSingleFile="true" - outputCondition="portlet"> + outputCondition="portlet" + outputOnEmptyElements="false"> <modelElements> <modelElement variable="applicationUseCases"> <type name="org.andromda.metafacades.uml.FrontEndUseCase"> 1.5 +0 -18 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-table.jspf.vsl Index: view-table.jspf.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-table.jspf.vsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- view-table.jspf.vsl 25 Feb 2008 14:35:32 -0000 1.4 +++ view-table.jspf.vsl 27 Mar 2008 21:58:35 -0000 1.5 @@ -1,21 +1,3 @@ -## -## This macro renders the <f:param> elements for a command link -## -#macro (renderTableCommandLinkParameters $attribute) -#foreach ($parameter in $action.parameters) -#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name)) -#set ($parameterValue = "row.${parameter.name}") -#else -#set ($parameterValue = "$parameter.name") -#end -#if($attribute) -#set ($elementType = "attribute") -#else -#set ($elementType = "param") -#end - <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/> -#end -#end <h:form> #set ($targetColumns = $table.targettedTableColumnNames) <tr:table allDetailsEnabled="true" var="row" rowBandingInterval="1" value="#{${table.name}}" rows="#{${preferencesBeanName}.maxTableRows}" width="90%"> 1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderTableCommandLinkParameters.vm Index: renderTableCommandLinkParameters.vm =================================================================== ## ## This macro renders the <f:param> elements for a command link ## #macro (renderTableCommandLinkParameters $attribute) #foreach ($parameter in $action.parameters) #if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name)) #set ($parameterValue = "row.${parameter.name}") #else #set ($parameterValue = "$parameter.name") #end #if($attribute) #set ($elementType = "attribute") #else #set ($elementType = "param") #end <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/> #end #end 1.7 +0 -18 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl Index: view-table.xhtml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -r1.6 -r1.7 --- view-table.xhtml.vsl 25 Feb 2008 14:32:34 -0000 1.6 +++ view-table.xhtml.vsl 27 Mar 2008 21:58:35 -0000 1.7 @@ -1,21 +1,3 @@ -## -## This macro renders the <f:param> elements for a command link -## -#macro (renderTableCommandLinkParameters $attribute) -#foreach ($parameter in $action.parameters) -#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name)) -#set ($parameterValue = "row.${parameter.name}") -#else -#set ($parameterValue = "$parameter.name") -#end -#if($attribute) -#set ($elementType = "attribute") -#else -#set ($elementType = "param") -#end - <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/> -#end -#end <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" 1.5 +0 -18 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.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- view-table.xhtml.vsl 27 Mar 2008 21:46:14 -0000 1.4 +++ view-table.xhtml.vsl 27 Mar 2008 21:58:35 -0000 1.5 @@ -1,21 +1,3 @@ -## -## This macro renders the <f:param> elements for a command link -## -#macro (renderTableCommandLinkParameters $attribute) -#foreach ($parameter in $action.parameters) -#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name)) -#set ($parameterValue = "row.${parameter.name}") -#else -#set ($parameterValue = "$parameter.name") -#end -#if($attribute) -#set ($elementType = "attribute") -#else -#set ($elementType = "param") -#end - <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/> -#end -#end <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" |
From: Chad B. <cwb...@us...> - 2008-03-27 23:39:13
|
User: cwbrandon Date: 08/03/27 16:39:18 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Log: fix button support in portlet table Revision Changes Path 1.6 +4 -7 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.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- view-table.xhtml.vsl 27 Mar 2008 21:58:35 -0000 1.5 +++ view-table.xhtml.vsl 27 Mar 2008 23:39:18 -0000 1.6 @@ -78,8 +78,7 @@ #set ($tableColumnActions = $table.getTableColumnActions($columnName)) #if (!$tableColumnActions.empty) #set ($action = $tableColumnActions.iterator().next()) - <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}" styleClass="columnLink"> - <h:outputText value="#{row.${columnName}}"> + <h:commandLink value="#{row.${columnName}}" action="#{${action.controller.beanName}.${action.triggerName}}"> #if ($column.type.dateType) <a:convertDateTime pattern="$defaultDateFormat"/> #end @@ -108,8 +107,7 @@ #foreach ($action in $table.tableHyperlinkActions) #if (!$action.tableLinkColumnName) <h:column> - <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}"> - <h:outputText value="#{messages['$action.trigger.messageKey']}"/> + <h:commandLink value="#{messages['$action.trigger.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}"> #renderTableCommandLinkParameters(false) </h:commandLink> </h:column> @@ -119,10 +117,9 @@ #foreach ($action in $table.tableFormActions) #if (!$action.tableLinkColumnName) <h:column> - <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}" styleClass="buttonLink"> - <h:outputText value="#{messages['$action.trigger.messageKey']}" /> + <h:commandButton value="#{messages['$action.trigger.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}" actionListener="#{${action.controller.beanName}.action}"> #renderTableCommandLinkParameters(true) - </h:commandLink> + </h:commandButton> </h:column> #end #end |
From: Chad B. <cwb...@us...> - 2008-04-10 16:01:47
|
User: cwbrandon Date: 08/04/10 09:01:48 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Log: get rid of border from navigation images Revision Changes Path 1.8 +6 -6 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.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- view-table.xhtml.vsl 2 Apr 2008 22:37:47 -0000 1.7 +++ view-table.xhtml.vsl 10 Apr 2008 16:01:48 -0000 1.8 @@ -23,22 +23,22 @@ paginatorActiveColumnStyle="font-weight:bold;" immediate="true"> <f:facet name="first"> - <t:graphicImage url="/images/arrow-first.gif" border="1" /> + <t:graphicImage url="/images/arrow-first.gif"/> </f:facet> <f:facet name="last"> - <t:graphicImage url="/images/arrow-last.gif" border="1" /> + <t:graphicImage url="/images/arrow-last.gif"/> </f:facet> <f:facet name="previous"> - <t:graphicImage url="/images/arrow-previous.gif" border="1" /> + <t:graphicImage url="/images/arrow-previous.gif"/> </f:facet> <f:facet name="next"> - <t:graphicImage url="/images/arrow-next.gif" border="1" /> + <t:graphicImage url="/images/arrow-next.gif"/> </f:facet> <f:facet name="fastforward"> - <t:graphicImage url="/images/arrow-ff.gif" border="1" /> + <t:graphicImage url="/images/arrow-ff.gif"/> </f:facet> <f:facet name="fastrewind"> - <t:graphicImage url="/images/arrow-fr.gif" border="1" /> + <t:graphicImage url="/images/arrow-fr.gif"/> </f:facet> </lr:portletScroller> <c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/> |
From: Chad B. <cwb...@us...> - 2008-04-25 19:39:19
|
User: cwbrandon Date: 08/04/25 12:39:22 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Log: fix table empty check for pageable vs non-pageable tables Revision Changes Path 1.10 +4 -0 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.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- view-table.xhtml.vsl 18 Apr 2008 21:56:33 -0000 1.9 +++ view-table.xhtml.vsl 25 Apr 2008 19:39:22 -0000 1.10 @@ -40,7 +40,11 @@ <t:graphicImage url="/images/arrow-fr.gif"/> </f:facet> </t:dataScroller> +#if ($table.pageableTable) <c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/> +#else + <c:set var="renderTable" value="#{!empty ${table.name}}"/> +#end <t:dataScroller id="${table.name}Scroller2" for="$table.name" rowsCountVar="rowsCount" |
From: Chad B. <cwb...@us...> - 2008-08-27 21:59:34
|
User: cwbrandon Date: 08/08/27 14:59:46 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl Log: change default scroll images Revision Changes Path 1.11 +6 -6 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.10 retrieving revision 1.11 diff -u -w -r1.10 -r1.11 --- view-table.xhtml.vsl 25 Apr 2008 19:39:22 -0000 1.10 +++ view-table.xhtml.vsl 27 Aug 2008 21:59:46 -0000 1.11 @@ -22,22 +22,22 @@ paginatorActiveColumnStyle="font-weight:bold;" immediate="true"> <f:facet name="first"> - <t:graphicImage url="/images/arrow-first.gif"/> + |< </f:facet> <f:facet name="last"> - <t:graphicImage url="/images/arrow-last.gif"/> + >| </f:facet> <f:facet name="previous"> - <t:graphicImage url="/images/arrow-previous.gif"/> + < </f:facet> <f:facet name="next"> - <t:graphicImage url="/images/arrow-next.gif"/> + > </f:facet> <f:facet name="fastforward"> - <t:graphicImage url="/images/arrow-ff.gif"/> + >> </f:facet> <f:facet name="fastrewind"> - <t:graphicImage url="/images/arrow-fr.gif"/> + << </f:facet> </t:dataScroller> #if ($table.pageableTable) |