[seam-commits] Seam SVN: r8705 - in trunk/seam-gen/icefaces: resources/WEB-INF and 4 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Aug 15 13:51:07 EDT 2008


Author: jguglielmin
Date: 2008-08-15 13:51:06 -0400 (Fri, 15 Aug 2008)
New Revision: 8705

Removed:
   trunk/seam-gen/icefaces/src/TimerBean.java
Modified:
   trunk/seam-gen/icefaces/build-scripts/.classpath
   trunk/seam-gen/icefaces/build-scripts/build-war.xml
   trunk/seam-gen/icefaces/build-scripts/build.xml
   trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml
   trunk/seam-gen/icefaces/resources/WEB-INF/components.xml
   trunk/seam-gen/icefaces/resources/WEB-INF/web.xml
   trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
   trunk/seam-gen/icefaces/view/layout/menu.xhtml
   trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl
   trunk/seam-gen/icefaces/view/layout/template.xhtml
   trunk/seam-gen/icefaces/view/login.xhtml
   trunk/seam-gen/icefaces/view/query.xhtml
   trunk/seam-gen/icefaces/view/stylesheet/theme.css
Log:
update stylesheet/theme.css, include more ICEfaces components as default, remove footer with TimerBean, ICE-3407

Modified: trunk/seam-gen/icefaces/build-scripts/.classpath
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/.classpath	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/build-scripts/.classpath	2008-08-15 17:51:06 UTC (rev 8705)
@@ -17,7 +17,6 @@
     <classpathentry kind="lib" path="lib/antlr.jar"/>
     <classpathentry kind="lib" path="lib/jgroups.jar"/>
     <classpathentry kind="lib" path="lib/commons-logging.jar"/>
-    <classpathentry kind="lib" path="lib/jstl.jar"/>
     <classpathentry kind="lib" path="lib/jsf-api.jar"/>
     <classpathentry kind="lib" path="lib/servlet-api.jar"/>
     <classpathentry kind="lib" path="lib/testng.jar"/>

Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -45,7 +45,7 @@
         <mkdir dir="${classes.action.dir}" />
         <mkdir dir="${dist.dir}" />
         <!-- if a .groovy file is in model or action, set groovy.present -->
-        <available property="groovy.present" value="true" file="">
+        <available property="groovy.present" value="true" file="" searchparents="true">
           <filepath>
             <fileset dir="${src.action.dir}">
               <include name="**/*.groovy"/>
@@ -145,6 +145,10 @@
             </fileset>
         </copy>
         
+        <copy tofile="${war.dir}/components.properties" 
+              file="${basedir}/resources/components-${profile}.properties"
+              overwrite="true"/>
+
         <copy tofile="${war.dir}/WEB-INF/classes/META-INF/persistence.xml" 
               file="${basedir}/resources/META-INF/persistence-${profile}-war.xml"
               overwrite="true"/>
@@ -164,10 +168,6 @@
                 <exclude name="classes/**/*.class"/>
                 <exclude name="classes/**/*.groovy"/>
             </fileset>
-            <filterset>
-                <filter token="debug"       value="${debug}" />
-                <filter token="jndiPattern" value="${project.name}/#{ejbName}/local"/>
-            </filterset>
         </copy>
         
         <copy todir="${war.dir}/WEB-INF">
@@ -301,6 +301,7 @@
                 <exclude name="META-INF/persistence*.xml"/>
                 <exclude name="import*.sql"/>
                 <exclude name="${project.name}-*-ds.xml"/>
+                <exclude name="components-*.properties"/>
             </fileset>
         </copy>
         <copy tofile="${test.dir}/META-INF/persistence.xml" 
@@ -309,6 +310,9 @@
         <copy tofile="${test.dir}/import.sql" 
               file="${basedir}/resources/import-test.sql"
               overwrite="true"/>
+        <copy tofile="${test.dir}/components.properties" 
+              file="${basedir}/resources/components-test.properties"
+              overwrite="true"/>
         <copy todir="${test.dir}" flatten="true">
             <fileset dir="${src.test.dir}">
                 <include name="**/*Test.xml" />

Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -81,6 +81,7 @@
                 <copy todir="${jar.dir}">
                         <fileset dir="${basedir}/resources">
                                 <include name="seam.properties" />
+                                <include name="*.drl" />
                         </fileset>
                 </copy>
                 <copy todir="${jar.dir}/META-INF">
@@ -101,16 +102,15 @@
                 <copy todir="${war.dir}">
                         <fileset dir="${basedir}/view" />
                 </copy>
+                <copy tofile="${war.dir}/components.properties" 
+                      file="${basedir}/resources/components-${profile}.properties"
+                      overwrite="true"/>
                 <copy todir="${war.dir}/WEB-INF">
                         <fileset dir="${basedir}/resources/WEB-INF">
                                 <include name="*.*"/>
                                 <include name="classes/**/*.*"/>
                                 <exclude name="classes/**/*.class"/>
                         </fileset>
-                        <filterset>
-                            <filter token="debug" value="${debug}" />
-                            <filter token="jndiPattern" value="${project.name}/#{ejbName}/local" />
-                        </filterset>
                 </copy>         
                 <copy todir="${war.dir}/WEB-INF">
                         <fileset dir="${basedir}/resources/WEB-INF">
@@ -135,9 +135,8 @@
                 <copy todir="${ear.dir}">
                         <fileset dir="${basedir}/resources">
                                 <include name="*jpdl.xml" />
-                                <include name="hibernate.cfg.xml" />
+                                <include name="*hibernate.cfg.xml" />
                                 <include name="jbpm.cfg.xml" />
-                                <include name="*.drl" />
                         </fileset>
                         <fileset dir="${lib.dir}">
                                 <include name="jboss-seam.jar" />
@@ -275,6 +274,7 @@
                                 <exclude name="META-INF/persistence*.xml"/>
                                 <exclude name="import*.sql"/>
                                 <exclude name="${project.name}-*-ds.xml"/>
+                                <exclude name="components-*.properties"/>
                         </fileset>
                 </copy>
                 <copy tofile="${test.dir}/META-INF/persistence.xml" 
@@ -283,6 +283,9 @@
                 <copy tofile="${test.dir}/import.sql" 
                         file="${basedir}/resources/import-test.sql"
                    overwrite="true"/>
+                <copy tofile="${test.dir}/components.properties" 
+                        file="${basedir}/resources/components-test.properties"
+                   overwrite="true"/>
                 <copy todir="${test.dir}" flatten="true">
                         <fileset dir="${src.test.dir}">
                                 <include name="**/*Test.xml" />

Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml
===================================================================
--- trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -34,8 +34,8 @@
        <drools:rule-files><value>/security.drl</value></drools:rule-files>
    </drools:rule-base>
 
+   <security:rule-based-permission-resolver security-rules="#{securityRules}"/> 
    <security:identity authenticate-method="#{authenticator.authenticate}"
-                           security-rules="#{securityRules}"
                               remember-me="true"/>
                               
    <event type="org.jboss.seam.security.notLoggedIn">

Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components.xml
===================================================================
--- trunk/seam-gen/icefaces/resources/WEB-INF/components.xml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/resources/WEB-INF/components.xml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -33,9 +33,10 @@
        </drools:rule-files>
    </drools:rule-base>
 
-   <security:identity authenticate-method="#{authenticator.authenticate}"
-                           security-rules="#{securityRules}"/>
+   <security:rule-based-permission-resolver security-rules="#{securityRules}"/> 
    
+   <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/>
+   
    <event type="org.jboss.seam.security.notLoggedIn">
        <action execute="#{redirect.captureCurrentView}"/>
    </event>

Modified: trunk/seam-gen/icefaces/resources/WEB-INF/web.xml
===================================================================
--- trunk/seam-gen/icefaces/resources/WEB-INF/web.xml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/resources/WEB-INF/web.xml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -34,7 +34,7 @@
     <!-- Facelets development mode (disable in production) -->
     <context-param>
         <param-name>facelets.DEVELOPMENT</param-name>
-        <param-value>true</param-value>
+        <param-value>@debug@</param-value>
     </context-param>
     
     <context-param>

Deleted: trunk/seam-gen/icefaces/src/TimerBean.java
===================================================================
--- trunk/seam-gen/icefaces/src/TimerBean.java	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/src/TimerBean.java	2008-08-15 17:51:06 UTC (rev 8705)
@@ -1,56 +0,0 @@
-/*
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * "The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations under
- * the License.
- *
- * The Original Code is ICEfaces 1.5 open source software code, released
- * November 5, 2006. The Initial Developer of the Original Code is ICEsoft
- * Technologies Canada, Corp. Portions created by ICEsoft are Copyright (C)
- * 2004-2006 ICEsoft Technologies Canada, Corp. All Rights Reserved.
- *
- * Contributor(s): _____________________.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"
- * License), in which case the provisions of the LGPL License are
- * applicable instead of those above. If you wish to allow use of your
- * version of this file only under the terms of the LGPL License and not to
- * allow others to use your version of this file under the MPL, indicate
- * your decision by deleting the provisions above and replace them with
- * the notice and other provisions required by the LGPL License. If you do
- * not delete the provisions above, a recipient may use your version of
- * this file under either the MPL or the LGPL License."
- *
- */
-package @actionPackage@;
-
-
-import javax.ejb.Local;
-import com.icesoft.faces.context.effects.Effect;
-/**
- * @author ICEsoft Technologies, Inc.
- */
- at Local
-public interface TimerBean {
-
-    public String getCurrentTime();
-    public String getRenderMode();
-    public void remove();
-    public String getCurrentConversation();
-
-	public String getLongRunning();
-    public boolean getExpanded();
-    public void setExpanded(boolean expanded);
-    public boolean isVisibility() ;
-    public void setVisibility(boolean visibility);
-    public String toggleExpanded();
-    public Effect getExpandEffect();
-}

Modified: trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl	2008-08-15 17:51:06 UTC (rev 8705)
@@ -18,8 +18,8 @@
 <#if !column.nullable>
                        required="true"
 </#if>
-                          value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">                                         value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                                
+                                value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> 
+                               <s:convertDateTime type="date"/>                                                          
                            </ice:selectInputDate>
 <#elseif isTime(componentProperty)>
                         <ice:inputText id="${componentProperty.name}Id" 
@@ -76,7 +76,7 @@
 <#else>
 <#assign rows = (column.length/80)?int>
 </#if>
-                <h:inputTextarea id="${componentProperty.name}"
+                <ice:inputTextarea id="${componentProperty.name}"
                                cols="80"
                                rows="${rows}"
 <#if propertyIsId>
@@ -135,6 +135,7 @@
                        required="true"
 </#if>
                                   value="${'#'}{${homeName}.instance.${property.name}}">
+                                    <s:convertDateTime type="date"/> 
                          </ice:selectInputDate>
 <#elseif isTime(property)>
                         <ice:inputText id="${property.name}Id" 
@@ -193,7 +194,7 @@
 <#else>
 <#assign rows = (column.length/80)?int>
 </#if>
-                <h:inputTextarea id="${property.name}"
+                <ice:inputTextarea id="${property.name}"
                                cols="80"
                                rows="${rows}"
 <#if propertyIsId>

Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/layout/menu.xhtml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/layout/menu.xhtml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -5,6 +5,10 @@
 		xmlns:f="http://java.sun.com/jsf/core"
 		xmlns:ice="http://www.icesoft.com/icefaces/component"  
 		xmlns:s="http://jboss.com/products/seam/taglib">
+  <ice:panelGroup id="menuPanelGroup" styleClass="formBorderHighlight">
+	<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	   <tr>
+		 <td class="iceDatTblColHdr2">
                    <ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu">
                             <ice:panelGroup id="menuPanelGroupLeft" >                                       
                                 <h:outputText id="menuProjectName" value="#{projectName}:"/>
@@ -18,5 +22,9 @@
                                 <s:link id="menuLogoutId" view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
                             </ice:panelGroup>
                  </ice:panelGrid>
+           </td>
+		</tr>
+	</table>            
+  </ice:panelGroup>		
       
 </div>

Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl	2008-08-15 17:51:06 UTC (rev 8705)
@@ -5,9 +5,12 @@
 		xmlns:f="http://java.sun.com/jsf/core"
 		xmlns:ice="http://www.icesoft.com/icefaces/component"  
 		xmlns:s="http://jboss.com/products/seam/taglib">
-
-	<ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu">
-                <ice:panelGroup id="leftMenuId" >
+  <ice:panelGroup id="menuPanelGroup" styleClass="formBorderHighlight">
+    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+	   <td class="iceDatTblColHdr2">
+	      <ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu">
+                 <ice:panelGroup id="leftMenuId" >
                         <ice:outputText id="menuProjectNameId" value="${'#'}{projectName}:"/>
                             <s:link id="menuHomeId" view="/home.xhtml" value="Home"/>
 <#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
@@ -17,13 +20,16 @@
 	 					propagation="none"/>
 </#foreach>         
                     <!-- @newMenuItem@ -->
- 		 </ice:panelGroup>
+ 		     </ice:panelGroup>
                  <ice:panelGroup id="rightMenuId">
                                 <h:outputText id="menuWelcomeId" value="Welcome,${'#'}{identity.username}" rendered="${'#'}{identity.loggedIn}"/>
                                 <s:link view="/login.xhtml" id="menuLoginId" value="Login" rendered="${'#'}{not identity.loggedIn}" />
                                 <s:link view="/home.xhtml" id="menulogoutId" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}"/>
                 </ice:panelGroup>
             </ice:panelGrid>
-			
+         </td>
+      </tr>
+    </table>
+  </ice:panelGroup>
 </div>
 

Modified: trunk/seam-gen/icefaces/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/layout/template.xhtml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/layout/template.xhtml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -12,14 +12,13 @@
         doctypeSystem="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>  
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>@projectName@</title>
-    <link rel='stylesheet' type='text/css' href='./xmlhttp/css/xp/xp.css'/>
+    <link rel='stylesheet' type='text/css' href='./xmlhttp/css/rime/rime.css'/>
     <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
     
     
 </head>
+  <body>
 
-<body>
-
     <ui:include src="menu.xhtml">
         <ui:param name="projectName" value="@projectName@"/>
     </ui:include>
@@ -30,65 +29,25 @@
 	</div>
 
         <div class="footer">
-            Powered by &#160; <a href="http://jboss.com/products/seam">Seam</a> &#160; and &#160; 
-            <a href="http://icefaces.org">ICEfaces</a> &#160; Generated by icefaces-seam-gen <br>     
-            </br>
-            <ice:form id="timerForm">
-            <!-- had to take the place of panelCollapsible until page parameters no longer lost
-                 with jsf1.2 and seam2.0.0.beta1 -->
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                    <td>
-                        <!-- main table -->
-                        <table border="0" cellspacing="0" cellpadding="0">
-                            <tr>
-                                <td class="tabbedContainerHeaderControl" >
-                                    <ice:commandButton
-				        id="templateExpandPanelButtonId"
-                                        partialSubmit="true"
-                                        image="img/orange-toggle-#{timer.expanded}.gif"
-                                        immediate="true" 
-                                        action="#{timer.toggleExpanded}"
-                                        style="width: 20px; height: 20px;"/>
-                                </td>
-                                <td class="iceDatTblColHdr2">
-                                    <ice:outputText id="templatePanelId" value="Timer and Program Info Panel"/>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="1" align="left" class="tabbedContainerContent">
-                        <ice:panelGroup id="templatePanelGroupId" effect="#{timer.expandEffect}" visible="#{timer.visibility}" >
-                            <table width="100%" border="1" cellspacing="0" cellpadding="1">
-                                <tr>
-                                    <td>
-                                        Current time is:
-                                        <ice:outputText id="templateTimeId" value="#{timer.currentTime}"/>
-                                    </td>
-                                    <td>Synchronous Render Mode:&nbsp;
-                                        <ice:outputText id="templateRenderModeId" value="#{timer.renderMode}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>Current Conversation Id:
-                                        <ice:outputText id="templateConversationId"
-                                            value="#{timer.currentConversation}"/>
-                                    </td>
-                                    <td>Is Long Running?
-                                        <ice:outputText id="timerLongRunningId" value="#{timer.longRunning}"/>
-                                    </td>
-                                </tr>
-                            </table>
-                            
-                        </ice:panelGroup>
-                    </td>
-                </tr>
-            </table>
-   
-        </ice:form>
-	 <table width="100%" cellpadding="0" cellspacing="0">
+			<div style="margin-bottom: 5px;">
+            Powered by
+			#{_}<a href="http://jboss.com/products/seam">Seam</a> and
+            #{_}<a href="http://icefaces.org">ICEfaces</a>
+			- Generated by icefaces-seam-gen
+               <ice:panelGroup rendered="#{identity.loggedIn}">
+            #{_}
+            [#{identity.username}]
+               </ice:panelGroup>
+               <ice:panelGroup rendered="#{init.debug}">
+            <br />
+            <s:link view="/debug.xhtml" propagation="none" value="Debug Console"/>
+            #{' - '}
+    <!--    <s:link action="#{webSession.invalidate}" value="Terminate Session" propagation="none"/> -->
+            		<br/>
+		<strong>conversation:</strong> id = #{conversation.id}, long running? #{conversation.longRunning}, nested? #{conversation.nested ? 'yes' : 'no'}, parent id = #{conversation.nested ? conversation.parentId : 'n/a'}
+              </ice:panelGroup> 
+            </div>                 
+	   <table width="100%" cellpadding="0" cellspacing="0">
            <tr>
               <td class="showcaseFooter">ICEsoft Technologies
                     Inc. &#160; &#8226; &#160; Toll Free: 1-877-263-3822 USA and Canada <br />
@@ -96,6 +55,5 @@
            </tr>
        </table>               
     </div>
-
-</body>
+  </body>
 </html>

Modified: trunk/seam-gen/icefaces/view/login.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/login.xhtml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/login.xhtml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -26,22 +26,22 @@
             <p>Please login using any username and password</p>
 
                     <div class="dialog">
-                        <h:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value">
+                 <ice:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value">
                     <h:outputLabel for="username">Username</h:outputLabel>
-                    <h:inputText id="username" 
+                    <ice:inputText id="username" 
                               value="#{identity.username}"/>
                     <h:outputLabel for="password">Password</h:outputLabel>
-                    <h:inputSecret id="password" 
+                    <ice:inputSecret id="password" 
                                 value="#{identity.password}"/>
                     <h:outputLabel for="rememberMe">Remember me</h:outputLabel>
-                    <h:selectBooleanCheckbox id="rememberMe" 
+                    <ice:selectBooleanCheckbox id="rememberMe" 
                                           value="#{identity.rememberMe}"/>
-                </h:panelGrid>
+                </ice:panelGrid>
             </div>
   
       </ice:panelGroup>
          <div class="actionButtons">
-            <h:commandButton id="loginButtonId" value="Login" action="#{identity.login}"/>
+            <ice:commandButton id="loginButtonId" value="Login" action="#{identity.login}"/>
         </div>
           
   </ice:form>      

Modified: trunk/seam-gen/icefaces/view/query.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/query.xhtml	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/query.xhtml	2008-08-15 17:51:06 UTC (rev 8705)
@@ -15,7 +15,7 @@
     
     <h:messages globalOnly="true" styleClass="message"/>
     <ice:form id="queryFormId">
-    <h:outputText value="No results from search" 
+        <ice:outputText value="No results from search" 
                     id="queryOutputTextId"
             rendered="#{empty @componentName at .resultList}"/>
     <f:subview id="queryResultsId" rendered="#{not empty @componentName at .resultList}">

Modified: trunk/seam-gen/icefaces/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/icefaces/view/stylesheet/theme.css	2008-08-15 13:07:34 UTC (rev 8704)
+++ trunk/seam-gen/icefaces/view/stylesheet/theme.css	2008-08-15 17:51:06 UTC (rev 8705)
@@ -7,17 +7,17 @@
 }
 
 input, textarea {
-	border: 1px solid #BBBBBB;
+/*	border: 1px solid #BBBBBB;
 	font-size: 10px;
-	background: #F0F8FF;
+	background: #F0F8FF; */
 	color: black;
 }
 
 input[type='submit'], input[type='button'] {
-	background: #4477AA;
+/*	background: #4477AA;
 	color: white;
 	margin: 5px;
-	border-color: gray;
+	border-color: gray; */
 }
 
 .errorImg {
@@ -43,12 +43,13 @@
     vertical-align: top; /*width: 100%;*/
     border: 1px solid #bed6f8;
     padding: 5px;
+    margin-top: 2px; /* give some space between search panel and list */
 }
 .menuButtons {
    font-size: 12px;
    font-weight: bold;
    border-colour: #bed6f8;
-   background-color: #BED6F8;
+ /*  background-color: #BED6F8; */
    background-position: top left;
   
 }
@@ -62,14 +63,14 @@
     padding-right: 15px;
 }
 
-.searchResults {
+/*.searchResults {
      border-top: 1px solid #bed6f8;
       border-bottom:1px solid #bed6f8;
      border-left:1px solid #bed6f8;
      border-right:1px solid #bed6f8;
      padding: 5px;
 
-}
+}*/ /* looks better without this border */
 .leftMenu {
    padding: 5px;
    vertical-align: middle;
@@ -84,7 +85,7 @@
 }
 .menuButtons a:hover {
 	font-family: Arial,sans-serif;
-    background-color: white;
+    background-color: #bed6f8;
     color:  #0066ff; /*#8CAFCD*/
 }
 
@@ -101,7 +102,7 @@
 
 .footer {
 	text-align: center;
-	font-size: 0.8em;
+	/*font-size: 0.8em;*/ /* removed to prevent blindness */
 }
 
 .actionButtons {
@@ -126,6 +127,20 @@
 .iceDataTblOutline {
     width: 98%;
 }
+/* BEGIN: make the resizable handle prettier */
+.iceDatTblResHdlr, .iceDatTblResBor, .iceDatTblBlkTd {
+	width: 1px;
+	background-color: #FFFFFF;
+}
+.iceDatTblBlkTd {
+	/*border-top: none;*/
+	border-right: 1px solid #CCCCCC;
+	/*border-bottom: none;*/
+}
+.iceDatTblBlkTd img {
+	display: none;
+}
+/* END */
 .iceTblHeader {
   font-size:11px;
    color: #000000;
@@ -170,11 +185,11 @@
 	margin: 0px;
 	font-family: Arial,sans-serif;
 	color: #616161;
-	font-size: 11px;
+	font-size: 12px; /* changed to prevent blindness */
 }
 
 .body {
-	padding: 30px;
+	padding: 0 30px 30px 30px;
 }
 
 
@@ -208,7 +223,7 @@
 .dialog 
 {
 	padding: 15px;
-	background-color: #F0F0F0;
+	background-color: #e6e6e6;
 	margin: 10px;	
 }
 .dialog table
@@ -225,7 +240,8 @@
 
 .columnHeader:hover
 {
-    color: white;
+    /*color: white;*/ /* breaks theme */
+	text-decoration: underline;
 }
 
 .message {
@@ -255,12 +271,12 @@
         color: red;
         text-align: left;	
 }
-.prop .errors {
+/*.prop .errors {
 	color: red;
 	text-align: left;
-}
+}*/
 
-.errors input {
+.errors input, .errors textarea {
 	border: 1px solid red;
 }
 
@@ -311,3 +327,12 @@
 .iceSelInpDate {
     width: 90px;
 }
+.icePnlTlTip {
+	background:#EDDDDD none repeat scroll;
+}
+.icePnlTlTipHdr{ 
+	background:#CDBBBB url() repeat-x;
+}
+.iceCmdBtn{
+   font-size: 16px;
+}




More information about the seam-commits mailing list