[seam-commits] Seam SVN: r8686 - in branches/Seam_2_0/seam-gen/icefaces: view and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Aug 13 18:04:48 EDT 2008
Author: jguglielmin
Date: 2008-08-13 18:04:48 -0400 (Wed, 13 Aug 2008)
New Revision: 8686
Modified:
branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml
branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml
branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl
branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl
branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl
branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl
branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml
branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css
branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl
Log:
update icefaces for styling, add resizable columns in dataTable, etc ICE-3407
Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -34,8 +34,7 @@
<drools:rule-files><value>/security.drl</value></drools:rule-files>
</drools:rule-base>
- <security:identity authenticate-method="#{authenticator.authenticate}"
- remember-me="true"/>
+ <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/>
<event type="org.jboss.seam.security.notLoggedIn">
<action execute="#{redirect.captureCurrentView}"/>
Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -28,12 +28,10 @@
persistence-unit-jndi-name="java:/@projectName at EntityManagerFactory"/>
<drools:rule-base name="securityRules">
- <drools:rule-files>
- <value>/security.drl</value>
- </drools:rule-files>
+ <drools:rule-files><value>/security.drl</value></drools:rule-files>
</drools:rule-base>
- <security:identity authenticate-method="#{authenticator.authenticate}"/>
+ <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/>
<event type="org.jboss.seam.security.notLoggedIn">
<action execute="#{redirect.captureCurrentView}"/>
Modified: branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686)
@@ -11,7 +11,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686)
@@ -11,54 +11,54 @@
<ui:define name="label">${componentProperty.name}</ui:define>
<#if isDate(componentProperty)>
<ice:selectInputDate id="${componentProperty.name}Id"
- renderAsPopup="true"
+ renderAsPopup="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ 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"
size="5"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="time"/>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ <s:convertDateTime type="time"/>
</ice:inputText>
<#elseif isTimestamp(componentProperty)>
<ice:inputText id="${componentProperty.name}Id"
size="16"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="both" dateStyle="short"/>
</ice:inputText>
<#elseif isBigDecimal(componentProperty)>
<ice:inputText id="${componentProperty.name}Id"
- partialSubmit="true"
+ partialSubmit="true"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"
- size="${column.precision+7}">
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"
+ size="${column.precision+7}">
</ice:inputText>
<#elseif isBigInteger(componentProperty)>
<ice:inputText id="${componentProperty.name}Id"
- partialSubmit="true"
+ partialSubmit="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"
- size="${column.precision+6}">
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"
+ size="${column.precision+6}">
</ice:inputText>
<#elseif isBoolean(componentProperty)>
<h:selectBooleanCheckbox id="${componentProperty.name}"
@@ -68,7 +68,7 @@
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
<#elseif isString(componentProperty)>
<#if column.length gt 160>
<#if column.length gt 800>
@@ -76,16 +76,16 @@
<#else>
<#assign rows = (column.length/80)?int>
</#if>
- <h:inputTextarea id="${componentProperty.name}"
+ <ice:inputTextarea id="${componentProperty.name}"
cols="80"
rows="${rows}"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
<#else>
<#if column.length gt 100>
<#assign size = 100>
@@ -94,15 +94,15 @@
</#if>
<ice:inputText id="${componentProperty.name}"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
size="${size}"
- maxlength="${column.length}"
- partialSubmit="true"
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ maxlength="${column.length}"
+ partialSubmit="true"
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
</ice:inputText>
</#if>
<#else>
@@ -126,15 +126,16 @@
<ui:define name="label">${property.name}</ui:define>
<#if isDate(property)>
<ice:selectInputDate id="${property.name}Id"
- renderAsPopup="true"
+ renderAsPopup="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}}">
+ value="${'#'}{${homeName}.instance.${property.name}}">
+ <s:convertDateTime type="date"/>
</ice:selectInputDate>
<#elseif isTime(property)>
<ice:inputText id="${property.name}Id"
@@ -193,16 +194,16 @@
<#else>
<#assign rows = (column.length/80)?int>
</#if>
- <h:inputTextarea id="${property.name}"
+ <ice:inputTextarea id="${property.name}"
cols="80"
rows="${rows}"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}}"/>
+ value="${'#'}{${homeName}.instance.${property.name}}"/>
<#else>
<#if column.length gt 100>
<#assign size = 100>
@@ -210,28 +211,28 @@
<#assign size = column.length>
</#if>
<ice:inputText id="${property.name}Id"
- partialSubmit="true"
+ partialSubmit="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- size="${size}"
- maxlength="${column.length}"
- value="${'#'}{${homeName}.instance.${property.name}}">
+ size="${size}"
+ maxlength="${column.length}"
+ value="${'#'}{${homeName}.instance.${property.name}}">
</ice:inputText>
</#if>
<#else>
<ice:inputText id="${property.name}Id"
- partialSubmit="true"
+ partialSubmit="true"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}}">
+ value="${'#'}{${homeName}.instance.${property.name}}">
</ice:inputText>
</#if>
</s:decorate>
Modified: branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -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: branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +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="leftMenuId" >
<ice:outputText id="menuProjectNameId" value="${'#'}{projectName}:"/>
@@ -24,6 +27,9 @@
<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: branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -12,12 +12,11 @@
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>
<ui:include src="menu.xhtml">
@@ -29,65 +28,25 @@
<ui:insert name="body"/>
</div>
- <div class="footer">
- Powered by   <a href="http://jboss.com/products/seam">Seam</a>   and  
- <a href="http://icefaces.org">ICEfaces</a>   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:
- <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>
+ <div class="footer">
+ <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
@@ -96,6 +55,5 @@
</tr>
</table>
</div>
-
-</body>
+ </body>
</html>
Modified: branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
Modified: branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686)
@@ -14,7 +14,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
@@ -41,7 +41,7 @@
<ui:define name="label">${componentProperty.name}</ui:define>
<ice:inputText id="${componentProperty.name}TextId"
value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"
- partialSubmit="true"/>
+ partialSubmit="true"/>
</s:decorate>
</#if>
@@ -52,7 +52,7 @@
<ui:define name="label">${property.name}</ui:define>
<ice:inputText id="list${property.name}TextId"
value="${'#'}{${listName}.${componentName}.${property.name}}"
- partialSubmit="true"/>
+ partialSubmit="true"/>
</s:decorate>
</#if>
Modified: branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
@@ -23,26 +23,26 @@
</table>
- <p>Please login using any username and password</p>
+ <p>Please login using any username and password</p>
- <div class="dialog">
- <h:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value">
+ <div class="dialog">
+ <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}"/>
- </div>
+ <div class="actionButtons">
+ <ice:commandButton id="loginButtonId" value="Login" action="#{identity.login}"/>
+ </div>
</ice:form>
</ui:define>
Modified: branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml 2008-08-13 22:04:48 UTC (rev 8686)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
@@ -15,14 +15,14 @@
<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}">
+ rendered="#{empty @componentName at .resultList}"/>
+ <f:subview id="queryResultsId" rendered="#{not empty @componentName at .resultList}">
<ice:dataTable id="@componentName at Table"
- var="item"
- columnClasses="allCols"
- value="#{@componentName at .resultList}">
+ var="item"
+ columnClasses="allCols"
+ value="#{@componentName at .resultList}">
<ice:column id="column at componentName@list">
<f:facet name="header">Result</f:facet>
#{item}
Modified: branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css 2008-08-13 22:04:48 UTC (rev 8686)
@@ -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;
+}
Modified: branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685)
+++ branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686)
@@ -11,7 +11,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
template="layout/template.xhtml">
<ui:define name="body">
@@ -76,11 +76,11 @@
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
<ice:dataTable var="${parentName}"
- value="${'#'}{${homeName}.instance.${property.name}}"
- rendered="${'#'}{${homeName}.instance.${property.name} != null}"
- rowClasses="rvgRowOne,rvgRowTwo"
- columnClasses="allCols"
- id="view${property.name}TableId">
+ value="${'#'}{${homeName}.instance.${property.name}}"
+ rendered="${'#'}{${homeName}.instance.${property.name} != null}"
+ rowClasses="rvgRowOne,rvgRowTwo"
+ columnClasses="allCols"
+ id="view${property.name}TableId">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
@@ -150,11 +150,11 @@
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
<ice:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
- rendered="${'#'}{not empty ${homeName}.${property.name}}"
- rowClasses="rvgRowOne,rvgRowTwo"
- columnClasses="allCols"
- id="view${property.name}TableId">
+ var="${childName}"
+ rendered="${'#'}{not empty ${homeName}.${property.name}}"
+ rowClasses="rvgRowOne,rvgRowTwo"
+ columnClasses="allCols"
+ id="view${property.name}TableId">
<#foreach childProperty in childPojo.allPropertiesIterator>
<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
More information about the seam-commits
mailing list