3:32 a.m.
Author: jharting
Date: 2009-04-03 04:32:14 -0400 (Fri, 03 Apr 2009)
New Revision: 10288
Modified:
trunk/seam-gen/icefaces/view/edit.xhtml.ftl
trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
trunk/seam-gen/icefaces/view/form.xhtml
trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl
trunk/seam-gen/icefaces/view/list.xhtml.ftl
trunk/seam-gen/icefaces/view/login.xhtml
trunk/seam-gen/icefaces/view/view.xhtml.ftl
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/layout/menu.xhtml
trunk/seam-gen/view/layout/menu.xhtml.ftl
trunk/seam-gen/view/list.xhtml.ftl
trunk/seam-gen/view/login.xhtml
Log:
JBQA-2232 added and unified ids in seam-gen
Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2009-04-03 08:32:14 UTC (rev 10288)
@@ -16,7 +16,7 @@
<ui:define name="body">
- <ice:form id="${componentName}editForm" styleClass="edit">
+ <ice:form id="${componentName}" styleClass="edit">
<ice:panelGroup id="edit${componentName}GroupId"
styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
@@ -39,24 +39,24 @@
<div class="actionButtons">
- <ice:commandButton id="save${homeName}"
+ <ice:commandButton id="save"
value="Save"
action="${'#'}{${homeName}.persist}"
disabled="${'#'}{!${homeName}.wired}"
rendered="${'#'}{!${homeName}.managed}"/>
- <ice:commandButton id="update${homeName}"
+ <ice:commandButton id="update"
value="Save"
action="${'#'}{${homeName}.update}"
rendered="${'#'}{${homeName}.managed}"/>
- <ice:commandButton id="delete${homeName}"
+ <ice:commandButton id="delete"
value="Delete"
action="${'#'}{${homeName}.remove}"
immediate="true"
rendered="${'#'}{${homeName}.managed}"/>
- <s:button id="cancelEdit${homeName}"
styleClass="iceCmdBtn"
+ <s:button id="cancelEdit" styleClass="iceCmdBtn"
value="Cancel"
propagation="end"
view="/${pageName}.xhtml"
@@ -157,7 +157,7 @@
<#if parentPojo.shortName!=pojo.shortName>
<div class="actionButtons">
<s:button value="Select ${property.name}"
- id="editSelectButton${property.name}Id"
+ id="selectParent"
view="/${parentPageName}List.xhtml">
<f:param name="from" value="${pageName}Edit"/>
</s:button>
Modified: trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl 2009-04-03 06:14:04 UTC (rev
10287)
+++ trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl 2009-04-03 08:32:14 UTC (rev
10288)
@@ -10,7 +10,7 @@
<s:decorate id="${componentProperty.name}Field"
template="layout/edit.xhtml">
<ui:define
name="label">${label(componentProperty.name)}</ui:define>
<#if isDate(componentProperty)>
- <ice:selectInputDate
id="${componentProperty.name}Id"
+ <ice:selectInputDate id="${componentProperty.name}"
renderAsPopup="true"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -22,7 +22,7 @@
<s:convertDateTime type="date"/>
</ice:selectInputDate>
<#elseif isTime(componentProperty)>
- <ice:inputText id="${componentProperty.name}Id"
+ <ice:inputText id="${componentProperty.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -31,7 +31,7 @@
<s:convertDateTime type="time"/>
</ice:inputText>
<#elseif isTimestamp(componentProperty)>
- <ice:inputText id="${componentProperty.name}Id"
+ <ice:inputText id="${componentProperty.name}"
size="16"
<#if !column.nullable>
required="true"
@@ -40,7 +40,7 @@
<s:convertDateTime type="both"
dateStyle="short"/>
</ice:inputText>
<#elseif isBigDecimal(componentProperty)>
- <ice:inputText id="${componentProperty.name}Id"
+ <ice:inputText id="${componentProperty.name}"
partialSubmit="true"
<#if !column.nullable>
required="true"
@@ -49,7 +49,7 @@
size="${column.precision+7}">
</ice:inputText>
<#elseif isBigInteger(componentProperty)>
- <ice:inputText id="${componentProperty.name}Id"
+ <ice:inputText id="${componentProperty.name}"
partialSubmit="true"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -125,7 +125,7 @@
<s:decorate id="${property.name}Field"
template="layout/edit.xhtml">
<ui:define
name="label">${label(property.name)}</ui:define>
<#if isDate(property)>
- <ice:selectInputDate id="${property.name}Id"
+ <ice:selectInputDate id="${property.name}"
renderAsPopup="true"
<#if propertyIsId>
@@ -138,7 +138,7 @@
<s:convertDateTime type="date"/>
</ice:selectInputDate>
<#elseif isTime(property)>
- <ice:inputText id="${property.name}Id"
+ <ice:inputText id="${property.name}"
size="5"
partialSubmit="true"
<#if !column.nullable>
@@ -148,7 +148,7 @@
<s:convertDateTime type="time"/>
</ice:inputText>
<#elseif isTimestamp(property)>
- <ice:inputText id="${property.name}Id"
+ <ice:inputText id="${property.name}"
size="16"
partialSubmit="true"
<#if !column.nullable>
@@ -158,7 +158,7 @@
<s:convertDateTime type="both"
dateStyle="short"/>
</ice:inputText>
<#elseif isBigDecimal(property)>
- <ice:inputText id="${property.name}Id"
+ <ice:inputText id="${property.name}"
partialSubmit="true"
<#if !column.nullable>
required="true"
@@ -167,7 +167,7 @@
size="${column.precision+7}">
</ice:inputText>
<#elseif isBigInteger(property)>
- <ice:inputText id="${property.name}Id"
+ <ice:inputText id="${property.name}"
partialSubmit="true"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -178,7 +178,7 @@
value="${'#'}{${homeName}.instance.${property.name}}"
size="${column.precision+6}"/>
<#elseif isBoolean(property)>
- <ice:selectBooleanCheckbox id="${property.name}Id"
+ <ice:selectBooleanCheckbox id="${property.name}"
partialSubmit="true"
<#if !column.nullable>
required="true"
@@ -210,7 +210,7 @@
<#else>
<#assign size = column.length>
</#if>
- <ice:inputText id="${property.name}Id"
+ <ice:inputText id="${property.name}"
partialSubmit="true"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -224,7 +224,7 @@
</ice:inputText>
</#if>
<#else>
- <ice:inputText id="${property.name}Id"
+ <ice:inputText id="${property.name}"
partialSubmit="true"
<#if !column.nullable>
required="true"
Modified: trunk/seam-gen/icefaces/view/form.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/form.xhtml 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/icefaces/view/form.xhtml 2009-04-03 08:32:14 UTC (rev 10288)
@@ -10,7 +10,7 @@
<ui:define name="body">
- <ice:form id="@componentName@formId">
+ <ice:form id="@componentName@Form">
<ice:panelGroup id="formSearchGroupId"
styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2009-04-03 06:14:04 UTC (rev
10287)
+++ trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2009-04-03 08:32:14 UTC (rev
10288)
@@ -26,7 +26,7 @@
<ice:panelGroup id="rightMenuId">
<h:outputText id="menuWelcomeId"
value="signed in as: ${'#'}{credentials.username}"
rendered="${'#'}{identity.loggedIn}"/>
<s:link view="/login.xhtml"
id="menuLoginId" value="Login" rendered="${'#'}{not
identity.loggedIn}" propagation="none"/>
- <s:link view="/home.xhtml"
id="menulogoutId" action="${'#'}{identity.logout}"
value="Logout" rendered="${'#'}{identity.loggedIn}"
propagation="none"/>
+ <s:link view="/home.xhtml"
id="menuLogoutId" action="${'#'}{identity.logout}"
value="Logout" rendered="${'#'}{identity.loggedIn}"
propagation="none"/>
</ice:panelGroup>
</ice:panelGrid>
</td>
Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl 2009-04-03 08:32:14 UTC (rev 10288)
@@ -19,7 +19,7 @@
<ui:define name="body">
- <ice:form id="list${componentName}FormId"
styleClass="edit">
+ <ice:form id="${componentName}Search" styleClass="edit">
<ice:panelGroup id="searchGroup"
styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
@@ -37,7 +37,7 @@
<#if isString(componentProperty)>
<s:decorate id="${componentProperty.name}decId"
template="layout/display.xhtml">
<ui:define
name="label">${label(componentProperty.name)}</ui:define>
- <ice:inputText id="${componentProperty.name}TextId"
+ <ice:inputText id="${componentProperty.name}"
value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"
partialSubmit="true"/>
</s:decorate>
@@ -48,7 +48,7 @@
<#if isString(property)>
<s:decorate id="${property.name}decId"
template="layout/display.xhtml">
<ui:define
name="label">${label(property.name)}</ui:define>
- <ice:inputText id="list${property.name}TextId"
+ <ice:inputText id="${property.name}"
value="${'#'}{${listName}.${componentName}.${property.name}}"
partialSubmit="true"/>
</s:decorate>
@@ -63,7 +63,7 @@
<div class="actionButtons">
- <ice:commandButton id="listSearchButtonId"
value="Search" action="/${listPageName}.xhtml"/>
+ <ice:commandButton id="search" value="Search"
action="/${listPageName}.xhtml"/>
</div>
</ice:panelGroup>
</ice:form>
@@ -76,7 +76,7 @@
<ice:outputText value="The ${componentName} search returned no results."
rendered="${'#'}{empty ${listName}.resultList}"/>
- <ice:dataTable id="${listName}TableId"
+ <ice:dataTable id="${listName}"
var="${componentName}"
value="${'#'}{${listName}.resultList}"
resizable="true"
@@ -146,7 +146,7 @@
<f:facet name="header">Action</f:facet>
<s:link view="/${'#'}{empty from ? '${pageName}' :
from}.xhtml"
value="${'#'}{empty from ? 'View' :
'Select'}"
- id="list${componentName}ViewId">
+ id="${componentName}">
<#if pojo.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
<f:param
name="${componentName}${componentProperty.name?cap_first}"
@@ -158,10 +158,10 @@
</#if>
</s:link>
${'#'}{' '}
- <s:link view="/${editPageName}.xhtml"
+ <s:link view="/${editPageName}.xhtml"
value="Edit"
- id="list${componentName}EditId"
- rendered="${'#'}{empty from}">
+ id="${componentName}Edit"
+ rendered="${'#'}{empty from}">
<#if pojo.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
<f:param
name="${componentName}${componentProperty.name?cap_first}"
@@ -215,7 +215,7 @@
<s:div styleClass="actionButtons" rendered="${'#'}{empty
from}">
<s:button view="/${editPageName}.xhtml"
- id="listCreate${componentName}Id"
+ id="create"
value="Create ${componentName}">
<#assign idName = componentName + pojo.identifierProperty.name?cap_first>
<#if c2j.isComponent(pojo.identifierProperty)>
Modified: trunk/seam-gen/icefaces/view/login.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/login.xhtml 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/icefaces/view/login.xhtml 2009-04-03 08:32:14 UTC (rev 10288)
@@ -10,7 +10,7 @@
<ui:define name="body">
- <ice:form id="loginFormId">
+ <ice:form id="loginForm">
<ice:panelGroup id="loginPanelGroupId"
styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
@@ -39,7 +39,7 @@
</ice:panelGroup>
<div class="actionButtons">
- <ice:commandButton id="loginButtonId" value="Login"
action="#{identity.login}"/>
+ <ice:commandButton id="submit" value="Login"
action="#{identity.login}"/>
</div>
</ice:form>
Modified: trunk/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/view.xhtml.ftl 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/icefaces/view/view.xhtml.ftl 2009-04-03 08:32:14 UTC (rev 10288)
@@ -39,11 +39,11 @@
<div id="view${editPageName}searchButtons"
class="actionButtons">
<s:button view="/${editPageName}.xhtml"
- id="viewEdit${editPageName}"
styleClass="iceCmdBtn"
+ id="edit" styleClass="iceCmdBtn"
value="Edit"/>
<s:button view="/${'#'}{empty ${componentName}From ?
'${masterPageName}' : ${componentName}From}.xhtml"
- id="viewDone${editPageName}"
styleClass="iceCmdBtn"
+ id="done" styleClass="iceCmdBtn"
value="Done"/>
</div>
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2009-04-03 08:32:14 UTC (rev 10288)
@@ -133,7 +133,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: trunk/seam-gen/view/layout/menu.xhtml
===================================================================
--- trunk/seam-gen/view/layout/menu.xhtml 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/view/layout/menu.xhtml 2009-04-03 08:32:14 UTC (rev 10288)
@@ -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: #{credentials.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:
#{credentials.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: trunk/seam-gen/view/layout/menu.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/layout/menu.xhtml.ftl 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/view/layout/menu.xhtml.ftl 2009-04-03 08:32:14 UTC (rev 10288)
@@ -7,23 +7,24 @@
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>
<rich:dropDownMenu showDelay="250" hideDelay="0"
submitMode="none">
<f:facet name="label">Browse data</f:facet>
<#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
- <rich:menuItem>
- <s:link view="/${entity.shortName}List.xhtml"
- value="${entity.shortName} List"
- includePageParams="false"
- propagation="none"/>
- </rich:menuItem>
+ <rich:menuItem>
+ <s:link view="/${entity.shortName}List.xhtml"
+ value="${entity.shortName} List"
+ id="${entity.shortName}Id"
+ includePageParams="false"
+ propagation="none"/>
+ </rich:menuItem>
</#foreach>
</rich:dropDownMenu>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
- <h:outputText value="signed in as:
${'#'}{credentials.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:
${'#'}{credentials.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: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/view/list.xhtml.ftl 2009-04-03 08:32:14 UTC (rev 10288)
@@ -133,7 +133,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: trunk/seam-gen/view/login.xhtml
===================================================================
--- trunk/seam-gen/view/login.xhtml 2009-04-03 06:14:04 UTC (rev 10287)
+++ trunk/seam-gen/view/login.xhtml 2009-04-03 08:32:14 UTC (rev 10288)
@@ -10,7 +10,7 @@
<ui:define name="body">
- <h:form id="login">
+ <h:form id="loginForm">
<rich:panel>
<f:facet name="header">Login</f:facet>
@@ -38,7 +38,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>