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

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

  User: cwbrandon
  Date: 08/04/18 14:56:33

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
                        view-action.xhtml.vsl
                        renderPortletActionFormInput.vm
                        view-table.xhtml.vsl
  Log:
  get rid of lr specific tags (for now)
  
  Revision  Changes    Path
  1.6       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl
  
  Index: view-action.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-action.xhtml.vsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- view-action.xhtml.vsl	15 Apr 2008 16:31:05 -0000	1.5
  +++ view-action.xhtml.vsl	18 Apr 2008 21:56:33 -0000	1.6
  @@ -42,9 +42,9 @@
   #end
       </h:panelGrid>
       <h:panelGroup>
  -        <lr:commandButton value="#{messages['$action.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}"/>
  +        <h:commandButton value="#{messages['$action.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}"/>
   #if ($action.resettable)
  -        <lr:commandButton value="#{messages['$action.trigger.resetMessageKey']}" type="reset"/>
  +        <h:commandButton value="#{messages['$action.trigger.resetMessageKey']}" type="reset"/>
   #end
       </h:panelGroup>
       <a:validator#if(!$clientValidation) client="false"#end/>
  
  
  
  1.3       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm
  
  Index: renderPortletActionFormInput.vm
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- renderPortletActionFormInput.vm	9 Apr 2008 00:28:17 -0000	1.2
  +++ renderPortletActionFormInput.vm	18 Apr 2008 21:56:33 -0000	1.3
  @@ -18,7 +18,7 @@
   #set ($backingListName = ${parameter.getBackingListName($ownerParameter)})
   #set ($backingValueName = ${parameter.getBackingValueName($ownerParameter)})
   #end
  -        <lr:formLabel value="#{messages['$parameter.messageKey']}:" />
  +        <h:outputLabel for="$propertyId" value="#{messages['$parameter.messageKey']}:" />
   #set ($formValuePropertyName = "${formName}.${valuePropertyName}")
   #if (!$parameter.table && !($parameter.inputHidden || $ownerParameter.inputHidden))
   #if ($parameter.type.dateType)
  
  
  
  1.9       +7 -8      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.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- view-table.xhtml.vsl	10 Apr 2008 16:01:48 -0000	1.8
  +++ view-table.xhtml.vsl	18 Apr 2008 21:56:33 -0000	1.9
  @@ -4,14 +4,13 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:c="http://java.sun.com/jstl/core"
        xmlns:t="http://myfaces.apache.org/tomahawk"
  -     xmlns:a="http://www.andromda.org/cartridges/jsf"
  -     xmlns:lr="http://www.liferay.com/jsf/facelets">
  +     xmlns:a="http://www.andromda.org/cartridges/jsf">
   <ui:composition>
   
   <h:form>
   #set ($targetColumns = $table.targettedTableColumnNames)
   <h:panelGroup>
  -    <lr:portletScroller id="${table.name}Scroller1"
  +    <t:dataScroller id="${table.name}Scroller1"
               for="$table.name"
               fastStep="10"
               pageCountVar="pageCount"
  @@ -40,9 +39,9 @@
           <f:facet name="fastrewind">
               <t:graphicImage url="/images/arrow-fr.gif"/>
           </f:facet>
  -    </lr:portletScroller>
  +    </t:dataScroller>
       <c:set var="renderTable" value="#{${table.name} != null and !${table.name}['empty']}"/>
  -    <lr:portletScroller id="${table.name}Scroller2"
  +    <t:dataScroller id="${table.name}Scroller2"
               for="$table.name"
               rowsCountVar="rowsCount"
               displayedRowsCountVar="displayedRowsCountVar"
  @@ -60,8 +59,8 @@
               <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" rendered="#{renderTable}">
  +    </t:dataScroller>
  +    <t:dataTable 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)
  @@ -123,7 +122,7 @@
           </h:column>
   #end
   #end
  -    </lr:table>
  +    </t:dataTable>
   </h:panelGroup>
   </h:form>
   </ui:composition>