You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/11/01 11:30:35 UTC
svn commit: r1195918 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp:
./ addressbook/ addressbook/admin/ addressbook/layout/ addressbook/tab/ auth/
Author: lofwyr
Date: Tue Nov 1 10:30:34 2011
New Revision: 1195918
URL: http://svn.apache.org/viewvc?rev=1195918&view=rev
Log:
TOBAGO-606: LayoutManager
- using "auto" instead of "fixed"
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/memory.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml Tue Nov 1 10:30:34 2011
@@ -24,7 +24,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="Administration"/>
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="*;fixed"/>
+ <tc:gridLayout margin="10px" rows="*;auto"/>
</f:facet>
<tc:tabGroup switchType="reloadPage">
@@ -37,7 +37,7 @@
</tc:tabGroup>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>
<tc:button label="Back" action="list"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml Tue Nov 1 10:30:34 2011
@@ -24,7 +24,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="2*;3*;fixed" margin="10"/>
+ <tc:gridLayout rows="2*;3*;auto" margin="10"/>
</f:facet>
<tc:box label="Appenders">
@@ -50,7 +50,7 @@
<tc:box label="Categories">
<f:facet name="layout">
- <tc:gridLayout rows="*;fixed"/>
+ <tc:gridLayout rows="*;auto"/>
</f:facet>
<tc:sheet columns="5*;25px;*" var="category"
value="#{logging.categories}" showDirectLinks="left" showPageRange="right" showRowRange="none"
@@ -73,7 +73,7 @@
</tc:sheet>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>
<tc:button label="Update" action="#{logging.updateCategories}"/>
@@ -82,11 +82,11 @@
<tc:box label="Add Category" id="addCategory">
<f:facet name="layout">
- <tc:gridLayout rows="fixed"/>
+ <tc:gridLayout rows="auto"/>
</f:facet>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;*;fixed"/>
+ <tc:gridLayout columns="*;*;auto"/>
</f:facet>
<tx:in label="Category" value="#{logging.category}">
<tc:attribute name="binding" value="#{logging.categoryControl}"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/memory.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/memory.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/memory.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/memory.xhtml Tue Nov 1 10:30:34 2011
@@ -25,7 +25,7 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="fixed;fixed;fixed" columns="300px"/>
+ <tc:gridLayout margin="10px" rows="auto;auto;auto" columns="300px"/>
</f:facet>
<f:facet name="reload">
<tc:reload frequency="5000" update="#{admin.updateMemory}"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml Tue Nov 1 10:30:34 2011
@@ -31,7 +31,7 @@
<tc:box label="#{bundle.editorBoxTitle}">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*;fixed"/>
+ <tc:gridLayout rows="auto;1*;auto"/>
</f:facet>
<tc:messages/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml Tue Nov 1 10:30:34 2011
@@ -74,14 +74,14 @@
<tc:popup id="about" width="400" height="220" left="200" top="200">
<tc:box label="About">
<f:facet name="layout">
- <tc:gridLayout rows="150px;*;fixed" columns="150px;*"/>
+ <tc:gridLayout rows="150px;*;auto" columns="150px;*"/>
</f:facet>
<tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
height="150"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;*"/>
+ <tc:gridLayout rows="auto;auto;auto;*"/>
</f:facet>
<tc:out markup="strong" value="Addressbook Demo"/>
@@ -95,7 +95,7 @@
<tc:cell spanX="2">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>
<tc:button label="OK">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml Tue Nov 1 10:30:34 2011
@@ -26,7 +26,7 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="fixed;fixed;1*;fixed"/>
+ <tc:gridLayout margin="10px" rows="auto;auto;1*;auto"/>
</f:facet>
<tc:toolBar iconSize="big">
<tc:button label="#{bundle.toolbarAddressList}" action="#{controller.search}" immediate="true"
@@ -44,7 +44,7 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tx:in label="#{bundle.listFilter}"
value="#{controller.searchCriterion}"/>
@@ -54,7 +54,7 @@
<tc:box label="#{bundle.listBoxTitle}">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*"/>
+ <tc:gridLayout rows="auto;1*"/>
</f:facet>
<f:facet name="toolBar">
<tc:toolBar>
@@ -75,7 +75,7 @@
rendered="#{controller.renderPopup}" id="popup">
<tc:box label="Select Columns">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;1*;fixed" margin="10"/>
+ <tc:gridLayout rows="auto;auto;auto;1*;auto" margin="10"/>
</f:facet>
<tc:selectBooleanCheckbox label="First Name" value="#{controller.renderFirstName}"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml Tue Nov 1 10:30:34 2011
@@ -31,7 +31,7 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="*;fixed;*" columns="*;400px;*"/>
+ <tc:gridLayout margin="10px" rows="*;auto;*" columns="*;400px;*"/>
</f:facet>
<tc:cell spanX="3"/>
@@ -46,7 +46,7 @@
height="150"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;*"/>
+ <tc:gridLayout rows="auto;auto;auto;*"/>
</f:facet>
<tc:out value="Addressbook Demo"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml Tue Nov 1 10:30:34 2011
@@ -24,7 +24,7 @@
<tc:loadBundle basename="resource" var="bundle"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;1*"/>
+ <tc:gridLayout rows="auto;auto;auto;auto;auto;1*"/>
</f:facet>
<tx:in value="#{controller.currentAddress.company}"
label="#{bundle.editorJobCompany}"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml Tue Nov 1 10:30:34 2011
@@ -25,7 +25,7 @@
<tc:loadBundle basename="resource" var="bundle"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;*"/>
+ <tc:gridLayout rows="auto;auto;*"/>
</f:facet>
<tc:panel>
<f:facet name="layout">
@@ -33,7 +33,7 @@
</f:facet>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;*"/>
+ <tc:gridLayout rows="auto;auto;auto;auto;auto;*"/>
</f:facet>
<tx:in value="#{controller.currentAddress.firstName}"
label="#{bundle.editorFirstName}" required="true">
@@ -82,7 +82,7 @@
id="popup-fileUpload">
<tc:box label="FileUpload">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*;fixed" margin="10"/>
+ <tc:gridLayout rows="auto;1*;auto" margin="10"/>
</f:facet>
<tc:file value="#{controller.uploadedFile}" required="true">
<tc:validateFileItem contentType="image/*"/>
@@ -105,7 +105,7 @@
</tc:panel>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed"/>
+ <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto"/>
</f:facet>
<tx:in value="#{controller.currentAddress.phone}"
label="#{bundle.editorPhone}"
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml Tue Nov 1 10:30:34 2011
@@ -26,7 +26,7 @@
<tc:page label="Login Error">
<f:facet name="layout">
- <tc:gridLayout rows="*;fixed;*" columns="*;400px;*"/>
+ <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
</f:facet>
<tc:cell spanX="3"/>
@@ -34,14 +34,14 @@
<tc:cell/>
<tc:box label="Login Error">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed"/>
+ <tc:gridLayout rows="auto;auto"/>
</f:facet>
<tc:out value="#{bundle.loginError}"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml Tue Nov 1 10:30:34 2011
@@ -26,7 +26,7 @@
<tc:page id="page" label="Login">
<f:facet name="layout">
- <tc:gridLayout rows="*;fixed;*" columns="*;400px;*"/>
+ <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
</f:facet>
<tc:cell spanX="3"/>
@@ -34,7 +34,7 @@
<tc:cell/>
<tc:box label="Login">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed"/>
+ <tc:gridLayout rows="auto;auto;auto;auto"/>
</f:facet>
<tc:panel>
@@ -55,7 +55,7 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml Tue Nov 1 10:30:34 2011
@@ -26,7 +26,7 @@
<tc:page label="#{bundle.loginLogoutTitle}">
<f:facet name="layout">
- <tc:gridLayout rows="*;fixed;*" columns="*;400px;*"/>
+ <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
</f:facet>
<tc:cell spanX="3"/>
@@ -34,14 +34,14 @@
<tc:cell/>
<tc:box label="#{bundle.loginLogoutBox}">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed"/>
+ <tc:gridLayout rows="auto;auto"/>
</f:facet>
<tc:out value="#{bundle.loginLogoutText}"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>
<tc:button link="/index.jsp" label="#{bundle.loginHomeButton}"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml?rev=1195918&r1=1195917&r2=1195918&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml Tue Nov 1 10:30:34 2011
@@ -25,7 +25,7 @@
<tc:page label="Error">
<f:facet name="layout">
- <tc:gridLayout rows="*;fixed;*" columns="*;400px;*"/>
+ <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
</f:facet>
<tc:cell spanX="3"/>
@@ -33,14 +33,14 @@
<tc:cell/>
<tc:box label="Error">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed"/>
+ <tc:gridLayout rows="auto;auto"/>
</f:facet>
<tc:out value="Sorry, an error has occured."/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout columns="*;auto"/>
</f:facet>
<tc:cell/>