From: Chad B. <cwb...@us...> - 2008-03-28 23:17:30
|
User: cwbrandon Date: 08/03/28 16:17:36 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/portlet help.xhtml.vsl edit.xhtml.vsl Log: fix layout of edit/help pages Revision Changes Path 1.3 +6 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/help.xhtml.vsl Index: help.xhtml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/help.xhtml.vsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- help.xhtml.vsl 28 Mar 2008 21:28:41 -0000 1.2 +++ help.xhtml.vsl 28 Mar 2008 23:17:35 -0000 1.3 @@ -1,4 +1,7 @@ -<div xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"> +<div xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html"> +<ui:composition template="/layout/layout.xhtml"> + <ui:define name="content"> <strong><font size="4">Help with $useCase.name</font></strong><br /> - + </ui:define> </div> \ No newline at end of file 1.3 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/edit.xhtml.vsl Index: edit.xhtml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/edit.xhtml.vsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- edit.xhtml.vsl 28 Mar 2008 22:19:15 -0000 1.2 +++ edit.xhtml.vsl 28 Mar 2008 23:17:35 -0000 1.3 @@ -2,9 +2,9 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"> - <f:view> +<ui:composition template="/layout/layout.xhtml"> + <ui:define name="content"> <h:form> - <h:panelGrid columns="2"> #foreach ($attribute in $useCase.preferences.getAttributes(true)) <h:outputText value="#{messages['$attribute.messageKey']}:" style="font-weight: bold; text-align: right; width: 100%"/> <h:inputText value="#{${useCase.controller.beanName}.preferences.${attribute.name}}"/> @@ -12,5 +12,5 @@ </h:panelGrid> <h:commandButton value="#{messages['action.save']}" action="#{${useCase.controller.beanName}.setPortletModeView}"/> </h:form> - </f:view> + </ui:define> </div> \ No newline at end of file |