Author: manaRH
Date: 2009-04-28 07:14:04 -0400 (Tue, 28 Apr 2009)
New Revision: 10674
Modified:
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/login.xhtml
Log:
JBPAPP-1899
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl 2009-04-28 11:13:00
UTC (rev 10673)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl 2009-04-28 11:14:04
UTC (rev 10674)
@@ -134,7 +134,7 @@
<#if parentPojo.shortName!=pojo.shortName>
<div class="actionButtons">
- <s:button value="${'#'}{${homeName}.instance.${property.name}
!= null ? 'Change' : 'Select'} ${property.name}"
+ <s:button id="${'#'}{${homeName}.instance.${property.name} !=
null ? 'changeParent' : 'selectParent'}"
value="${'#'}{${homeName}.instance.${property.name} != null ?
'Change' : 'Select'} ${property.name}"
view="/${parentPageName}List.xhtml">
<f:param name="from" value="${pageName}Edit"/>
</s:button>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml 2009-04-28
11:13:00 UTC (rev 10673)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml 2009-04-28
11:14:04 UTC (rev 10674)
@@ -7,12 +7,12 @@
xmlns:rich="http://richfaces.org/rich">
<rich:toolBarGroup>
<h:outputText value="#{projectName}:"/>
- <s:link view="/home.xhtml" value="Home"
propagation="none"/>
+ <s:link id="menuHomeId" view="/home.xhtml"
value="Home" propagation="none"/>
</rich:toolBarGroup>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
- <h:outputText value="signed in as: #{identity.username}"
rendered="#{identity.loggedIn}"/>
- <s:link view="/login.xhtml" value="Login"
rendered="#{not identity.loggedIn}" propagation="none"/>
- <s:link view="/home.xhtml" action="#{identity.logout}"
value="Logout" rendered="#{identity.loggedIn}"
propagation="none"/>
+ <h:outputText id="menuWelcomeId" value="signed in as:
#{identity.username}" rendered="#{identity.loggedIn}"/>
+ <s:link id="menuLoginId" view="/login.xhtml"
value="Login" rendered="#{not identity.loggedIn}"
propagation="none"/>
+ <s:link id="menuLogoutId" view="/home.xhtml"
action="#{identity.logout}" value="Logout"
rendered="#{identity.loggedIn}" propagation="none"/>
</rich:toolBarGroup>
</rich:toolBar>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml.ftl 2009-04-28
11:13:00 UTC (rev 10673)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/menu.xhtml.ftl 2009-04-28
11:14:04 UTC (rev 10674)
@@ -7,18 +7,19 @@
xmlns:rich="http://richfaces.org/rich">
<rich:toolBarGroup>
<h:outputText value="${'#'}{projectName}:"/>
- <s:link view="/home.xhtml" value="Home"
propagation="none"/>
+ <s:link id="menuHomeId" view="/home.xhtml"
value="Home" propagation="none"/>
</rich:toolBarGroup>
<#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
<s:link view="/${entity.shortName}List.xhtml"
value="${entity.shortName} List"
+ id="${entity.shortName}Id"
includePageParams="false"
propagation="none"/>
</#foreach>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
- <h:outputText value="signed in as:
${'#'}{identity.username}"
rendered="${'#'}{identity.loggedIn}"/>
- <s:link view="/login.xhtml" value="Login"
rendered="${'#'}{not identity.loggedIn}"
propagation="none"/>
- <s:link view="/home.xhtml"
action="${'#'}{identity.logout}" value="Logout"
rendered="${'#'}{identity.loggedIn}" propagation="none"/>
+ <h:outputText id="menuWelcomeId" value="signed in as:
${'#'}{identity.username}"
rendered="${'#'}{identity.loggedIn}"/>
+ <s:link id="menuLoginId" view="/login.xhtml"
value="Login" rendered="${'#'}{not identity.loggedIn}"
propagation="none"/>
+ <s:link id="menuLogoutId" view="/home.xhtml"
action="${'#'}{identity.logout}" value="Logout"
rendered="${'#'}{identity.loggedIn}" propagation="none"/>
</rich:toolBarGroup>
</rich:toolBar>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl 2009-04-28 11:13:00
UTC (rev 10673)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl 2009-04-28 11:14:04
UTC (rev 10674)
@@ -127,7 +127,7 @@
<s:link view="/${'#'}{empty from ? '${pageName}' :
from}.xhtml"
value="${'#'}{empty from ? 'View' :
'Select'}"
propagation="${'#'}{empty from ? 'none' :
'default'}"
- id="${componentName}">
+ id="${componentName}ViewId">
<#if pojo.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
<f:param
name="${componentName}${componentProperty.name?cap_first}"
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/login.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/login.xhtml 2009-04-28 11:13:00 UTC
(rev 10673)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/login.xhtml 2009-04-28 11:14:04 UTC
(rev 10674)
@@ -12,7 +12,7 @@
<!-- <h:messages styleClass="message"/>-->
- <h:form id="login">
+ <h:form id="loginForm">
<rich:panel>
<f:facet name="header">Login</f:facet>
@@ -40,7 +40,7 @@
</rich:panel>
<div class="actionButtons">
- <h:commandButton value="Login"
action="#{identity.login}"/>
+ <h:commandButton id="submit" value="Login"
action="#{identity.login}"/>
</div>
</h:form>