Author: manaRH Date: 2012-09-17 10:27:40 -0400 (Mon, 17 Sep 2012) New Revision: 15150 Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/roledetail.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/rolemanager.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/userdetail.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/usermanager.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/home.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.xhtml.ftl Log: JBSEAM-5039 some additional fixes for styled generated pages Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml 2012-09-17 14:27:40 UTC (rev 15150) @@ -248,12 +248,12 @@ <include name="jbpm.cfg.xml" /> <include name="META-INF/orm.xml" /> <include name="*.skin.properties" if="richfaces.present"/> - <include name="**/*.xcss" if="richfaces.present"/> + <include name="**/*.ecss" if="richfaces.present"/> </fileset> - <!-- move XCSS into classpath for now + <!-- move ECSS into classpath for now loading from web context only works in JBoss AS 4 --> <fileset dir="${basedir}/view"> - <include name="**/*.xcss" if="richfaces.present"/> + <include name="**/*.ecss" if="richfaces.present"/> </fileset> </copy> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml 2012-09-17 14:27:40 UTC (rev 15150) @@ -227,12 +227,12 @@ <include name="messages*.properties"/> <include name="*.skin.properties" if="richfaces.present"/> <include name="*_theme.properties"/> - <include name="**/*.xcss" if="richfaces.present"/> + <include name="**/*.ecss" if="richfaces.present"/> </fileset> - <!-- move XCSS into classpath for now + <!-- move ECSS into classpath for now loading from web context only works in JBoss AS 4 --> <fileset dir="${basedir}/view"> - <include name="**/*.xcss" if="richfaces.present"/> + <include name="**/*.ecss" if="richfaces.present"/> </fileset> </copy> <copy todir="${war.dir}/WEB-INF" Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-09-17 14:27:40 UTC (rev 15150) @@ -1108,7 +1108,7 @@ <include name="login.page.xml"/> <include name="index.html"/> <include name="layout/*"/> - <include name="stylesheet/*"/> + <include name="resources/*"/> <exclude name="**/*.ftl"/> </fileset> <filterset refid="project"/> @@ -1237,7 +1237,7 @@ <copy todir="${project.home}/view"> <fileset dir="${templates.dir}/view"> <include name="useradmin/**"/> - <include name="stylesheet/useradmin.css"/> + <include name="resources/useradmin.css"/> <include name="img/btn*"/> <include name="img/true.png"/> <include name="img/false.png"/> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/roledetail.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/roledetail.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/roledetail.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -9,7 +9,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> </ui:define> <ui:define name="body"> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/rolemanager.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/rolemanager.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/rolemanager.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -9,7 +9,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> <script type="text/javascript"> function confirmDelete() { Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/userdetail.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/userdetail.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/userdetail.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -9,7 +9,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> </ui:define> <ui:define name="body"> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/usermanager.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/usermanager.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/view/useradmin/usermanager.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -9,7 +9,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> <script type="text/javascript"> function confirmDelete() Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/home.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/home.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/home.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -8,7 +8,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> </ui:define> <ui:define name="body"> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -9,7 +9,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> </ui:define> <ui:define name="body"> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml 2012-09-17 14:27:40 UTC (rev 15150) @@ -9,7 +9,7 @@ template="/layout/template.xhtml"> <ui:define name="head"> - <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/> + <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/> <script type="text/javascript"> function confirmDelete() { Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.xhtml.ftl =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.xhtml.ftl 2012-09-17 14:27:25 UTC (rev 15149) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.xhtml.ftl 2012-09-17 14:27:40 UTC (rev 15150) @@ -56,7 +56,7 @@ <#assign parentName = parentPojo.shortName?uncap_first> <rich:tab> - <f:facet name="label"> + <f:facet name="header"> <h:panelGroup><h:graphicImage value="/img/manytoone.gif" style="vertical-align: middle; padding-right: 4px;"/>${label(property.name)}</h:panelGroup> </f:facet> <div class="association" id="${property.name}Parent"> @@ -126,7 +126,7 @@ <#if c2h.isOneToManyCollection(property)> <rich:tab> - <f:facet name="label"> + <f:facet name="header"> <h:panelGroup><h:graphicImage value="/img/onetomany.gif" style="vertical-align: middle; padding-right: 4px;"/>${label(property.name)}</h:panelGroup> </f:facet> <h:form styleClass="association" id="${property.name}Children">