Author: dan.j.allen Date: 2008-10-28 18:01:50 -0400 (Tue, 28 Oct 2008) New Revision: 9459 Modified: trunk/seam-gen/icefaces/view/edit.xhtml trunk/seam-gen/icefaces/view/edit.xhtml.ftl trunk/seam-gen/view/edit.xhtml trunk/seam-gen/view/edit.xhtml.ftl Log: change name of Done button to Cancel when updating a managed entity Modified: trunk/seam-gen/icefaces/view/edit.xhtml =================================================================== --- trunk/seam-gen/icefaces/view/edit.xhtml 2008-10-28 21:58:47 UTC (rev 9458) +++ trunk/seam-gen/icefaces/view/edit.xhtml 2008-10-28 22:01:50 UTC (rev 9459) @@ -44,8 +44,8 @@ immediate="true" rendered="#{@homeName@.managed}"/> <s:button propagation="end" - id="edit@homeName@done" - value="Done" + id="edit@homeName@cancel" + value="Cancel" view="/@masterPageName@.xhtml"/> </div> </ice:form> Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl =================================================================== --- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-10-28 21:58:47 UTC (rev 9458) +++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-10-28 22:01:50 UTC (rev 9459) @@ -56,13 +56,13 @@ immediate="true" rendered="${'#'}{${homeName}.managed}"/> - <s:button id="done${homeName}" styleClass="iceCmdBtn" - value="Done" + <s:button id="cancelEdit${homeName}" styleClass="iceCmdBtn" + value="Cancel" propagation="end" view="/${pageName}.xhtml" rendered="${'#'}{${homeName}.managed}"/> - <s:button id="cancel${homeName}" styleClass="iceCmdBtn" + <s:button id="cancelAdd${homeName}" styleClass="iceCmdBtn" value="Cancel" propagation="end" view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml" Modified: trunk/seam-gen/view/edit.xhtml =================================================================== --- trunk/seam-gen/view/edit.xhtml 2008-10-28 21:58:47 UTC (rev 9458) +++ trunk/seam-gen/view/edit.xhtml 2008-10-28 22:01:50 UTC (rev 9459) @@ -40,8 +40,8 @@ immediate="true" rendered="#{@homeName@.managed}"/> <s:button propagation="end" - id="done" - value="Done" + id="cancel" + value="Cancel" view="/@masterPageName@.xhtml"/> </div> Modified: trunk/seam-gen/view/edit.xhtml.ftl =================================================================== --- trunk/seam-gen/view/edit.xhtml.ftl 2008-10-28 21:58:47 UTC (rev 9458) +++ trunk/seam-gen/view/edit.xhtml.ftl 2008-10-28 22:01:50 UTC (rev 9459) @@ -51,13 +51,13 @@ immediate="true" rendered="${'#'}{${homeName}.managed}"/> - <s:button id="done" - value="Done" + <s:button id="cancelEdit" + value="Cancel" propagation="end" view="/${pageName}.xhtml" rendered="${'#'}{${homeName}.managed}"/> - <s:button id="cancel" + <s:button id="cancelAdd" value="Cancel" propagation="end" view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"