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 2009/08/19 12:24:05 UTC
svn commit: r805731 - in
/myfaces/tobago/trunk/example/test/src/main/webapp/tc: box/box.xhtml
cell/position-cell-with-panel.xhtml cell/subview.xhtml
Author: lofwyr
Date: Wed Aug 19 10:24:05 2009
New Revision: 805731
URL: http://svn.apache.org/viewvc?rev=805731&view=rev
Log:
TOBAGO-606: Layout-Manager
- test f:subview
Added:
myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/subview.xhtml
- copied, changed from r805717, myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-cell-with-panel.xhtml
Removed:
myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-cell-with-panel.xhtml
Modified:
myfaces/tobago/trunk/example/test/src/main/webapp/tc/box/box.xhtml
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/box/box.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/box/box.xhtml?rev=805731&r1=805730&r2=805731&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/box/box.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/box/box.xhtml Wed Aug 19 10:24:05 2009
@@ -23,10 +23,10 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
+ <tc:gridLayoutConstraint width="500px" height="200px"/>
<f:facet name="layout">
<tc:gridLayout/>
</f:facet>
- <tc:gridLayoutConstraint width="500px" height="200px"/>
<tc:box id="box" label="A simple box">
<f:facet name="layout">
Copied: myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/subview.xhtml (from r805717, myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-cell-with-panel.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/subview.xhtml?p2=myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/subview.xhtml&p1=myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-cell-with-panel.xhtml&r1=805717&r2=805731&rev=805731&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-cell-with-panel.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/subview.xhtml Wed Aug 19 10:24:05 2009
@@ -15,19 +15,23 @@
<tc:image id="i-1" value="pidgeon-point.jpg"/>
<tc:cell>
- <tc:panel>
- <tc:gridLayout rows="100px;100px"/>
+ <f:subview id="subview">
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="100px;100px"/>
+ </f:facet>
- <tc:image id="i-2" value="pidgeon-point.jpg"/>
- <tc:image id="i-3" value="pidgeon-point.jpg"/>
- </tc:panel>
+ <tc:image id="i-2" value="pidgeon-point.jpg"/>
+ <tc:image id="i-3" value="pidgeon-point.jpg"/>
+ </tc:panel>
+ </f:subview>
</tc:cell>
<tc:script file="script/test-utils.js"/>
<tc:script onload="checkLayout('page:i-1', 0, 0, 100, 100);"/>
- <tc:script onload="checkLayout('page:i-2', 0, 105, 100, 100);"/>
- <tc:script onload="checkLayout('page:i-3', 0, 210, 100, 100);"/>
+ <tc:script onload="checkLayout('page:subview:i-2', 0, 105, 100, 100);"/>
+ <tc:script onload="checkLayout('page:subview:i-3', 0, 210, 100, 100);"/>
</tc:page>
</f:view>