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/05 13:48:53 UTC
svn commit: r801140 [2/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/config/
core/src/main/java/org/apache/myfaces/tobago/context/
core/src/main/java/org/apache/myfac...
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-4x4-span-steps.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-4x4-span-steps.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-4x4-span-steps.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/cell/position-4x4-span-steps.xhtml Wed Aug 5 11:48:51 2009
@@ -13,41 +13,41 @@
</f:facet>
<tc:gridLayoutConstraint width="315px" height="315px"/>
- <tc:in id="in-0" value="0"/>
+ <tc:image id="i-0" value="pidgeon-point.jpg"/>
<tc:cell spanY="2">
- <tc:in id="in-1" value="1"/>
+ <tc:image id="i-1" value="pidgeon-point.jpg"/>
</tc:cell>
<tc:cell spanX="2">
- <tc:in id="in-2" value="2"/>
+ <tc:image id="i-2" value="pidgeon-point.jpg"/>
</tc:cell>
- <tc:in id="in-3" value="3"/>
+ <tc:image id="i-3" value="pidgeon-point.jpg"/>
<tc:cell spanY="2">
- <tc:in id="in-4" value="4 (Note: the <tc:cell> is deprecated)"/>
+ <tc:image id="i-4" value="pidgeon-point.jpg"/>
</tc:cell>
- <tc:in id="in-5" value="5"/>
+ <tc:image id="i-5" value="pidgeon-point.jpg"/>
<tc:cell spanX="2">
- <tc:in id="in-6" value="6"/>
+ <tc:image id="i-6" value="pidgeon-point.jpg"/>
</tc:cell>
<tc:cell spanY="2">
- <tc:in id="in-7" value="7"/>
+ <tc:image id="i-7" value="pidgeon-point.jpg"/>
</tc:cell>
- <tc:in id="in-8" value="8"/>
+ <tc:image id="i-8" value="pidgeon-point.jpg"/>
<tc:cell spanX="2">
- <tc:in id="in-9" value="9"/>
+ <tc:image id="i-9" value="pidgeon-point.jpg"/>
</tc:cell>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 60, 40);"/>
- <tc:script onload="checkLayout('page:in-1', 65, 0, 90, 155);"/>
- <tc:script onload="checkLayout('page:in-2', 160, 0, 155, 40);"/>
- <tc:script onload="checkLayout('page:in-3', 0, 45, 60, 110);"/>
- <tc:script onload="checkLayout('page:in-4', 160, 45, 130, 215);"/>
- <tc:script onload="checkLayout('page:in-5', 295, 45, 20, 110);"/>
- <tc:script onload="checkLayout('page:in-6', 0, 160, 155, 100);"/>
- <tc:script onload="checkLayout('page:in-7', 295, 160, 20, 155);"/>
- <tc:script onload="checkLayout('page:in-8', 0, 265, 60, 50);"/>
- <tc:script onload="checkLayout('page:in-9', 65, 265, 225, 50);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 60, 40);"/>
+ <tc:script onload="checkLayout('page:i-1', 65, 0, 90, 155);"/>
+ <tc:script onload="checkLayout('page:i-2', 160, 0, 155, 40);"/>
+ <tc:script onload="checkLayout('page:i-3', 0, 45, 60, 110);"/>
+ <tc:script onload="checkLayout('page:i-4', 160, 45, 130, 215);"/>
+ <tc:script onload="checkLayout('page:i-5', 295, 45, 20, 110);"/>
+ <tc:script onload="checkLayout('page:i-6', 0, 160, 155, 100);"/>
+ <tc:script onload="checkLayout('page:i-7', 295, 160, 20, 155);"/>
+ <tc:script onload="checkLayout('page:i-8', 0, 265, 60, 50);"/>
+ <tc:script onload="checkLayout('page:i-9', 65, 265, 225, 50);"/>
</tc:page>
</f:view>
Copied: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/auto-vertical-in+in.xhtml (from r799324, myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/auto-vertical-in%2Bin.xhtml?p2=myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/auto-vertical-in%2Bin.xhtml&p1=myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml&r1=799324&r2=801140&rev=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/auto-vertical-in+in.xhtml Wed Aug 5 11:48:51 2009
@@ -8,21 +8,20 @@
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
+ <tc:gridLayoutConstraint width="600px" height="300px"/>
<f:facet name="layout">
- <tc:gridLayout rows="2*;*" columns="2*;*" columnSpacing="0px" rowSpacing="0px"/>
+ <tc:gridLayout rows="auto;auto;*"/>
</f:facet>
- <tc:gridLayoutConstraint width="600px" height="600px"/>
- <tc:in id="in-0" value="0"/>
+ <tc:in id="in-0" value="0">
+ <tc:gridLayoutConstraint width="60px" height="30px"/>
+ </tc:in>
<tc:in id="in-1" value="1"/>
- <tc:in id="in-2" value="2"/>
- <tc:in id="in-3" value="3"/>
+ <tc:panel/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 400, 400);"/>
- <tc:script onload="checkLayout('page:in-1', 400, 0, 200, 400);"/>
- <tc:script onload="checkLayout('page:in-2', 0, 400, 400, 200);"/>
- <tc:script onload="checkLayout('page:in-3', 400, 400, 200, 200);"/>
-
+ <tc:script onload="checkLayout('page:in-0', 0, 0, 600, 20);"/>
+ <tc:script onload="checkLayout('page:in-1', 0, 25, 600, 20);"/>
+
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/nested.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/nested.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/nested.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/nested.xhtml Wed Aug 5 11:48:51 2009
@@ -13,44 +13,44 @@
</f:facet>
<tc:gridLayoutConstraint width="650px" height="515px"/>
- <tc:in id="x_5" value="x_5">
+ <tc:image id="x_5" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="3"/>
- </tc:in>
+ </tc:image>
- <tc:in id="x_6" value="x_6"/>
+ <tc:image id="x_6" value="pidgeon-point.jpg"/>
- <tc:in id="x_13" value="x_13">
+ <tc:image id="x_13" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
+ </tc:image>
<tc:panel id="x_14">
<tc:gridLayoutConstraint rowSpan="2"/>
<f:facet name="layout">
<tc:gridLayout columns="130px;*"/>
</f:facet>
- <tc:in id="x_14_a" value="x_14_a"/>
- <tc:in id="x_14_b" value="x_14_b"/>
+ <tc:image id="x_14_a" value="pidgeon-point.jpg"/>
+ <tc:image id="x_14_b" value="pidgeon-point.jpg"/>
</tc:panel>
<tc:panel id="x_7">
<f:facet name="layout">
<tc:gridLayout columns="*;2*"/>
</f:facet>
- <tc:in id="x_7_a" value="x_7_a"/>
- <tc:in id="x_7_b" value="x_7_b"/>
+ <tc:image id="x_7_a" value="pidgeon-point.jpg"/>
+ <tc:image id="x_7_b" value="pidgeon-point.jpg"/>
</tc:panel>
<tc:panel id="x_10">
<f:facet name="layout">
<tc:gridLayout columns="4*;*"/>
</f:facet>
- <tc:in id="x_10_a" value="x_10_a"/>
- <tc:in id="x_10_b" value="x_10_b"/>
+ <tc:image id="x_10_a" value="pidgeon-point.jpg"/>
+ <tc:image id="x_10_b" value="pidgeon-point.jpg"/>
</tc:panel>
- <tc:in id="x_17" value="x_17">
+ <tc:image id="x_17" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
+ </tc:image>
<tc:script file="script/test-utils.js"/>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-10x10-span.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-10x10-span.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-10x10-span.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-10x10-span.xhtml Wed Aug 5 11:48:51 2009
@@ -13,94 +13,94 @@
</f:facet>
<tc:gridLayoutConstraint width="1045px" height="1045px"/>
- <tc:in id="in-0" value="0">
+ <tc:image id="i-0" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="9"/>
- </tc:in>
- <tc:in id="in-1" value="1">
+ </tc:image>
+ <tc:image id="i-1" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="9" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-2" value="2">
+ </tc:image>
+ <tc:image id="i-2" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="7" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-3" value="3">
+ </tc:image>
+ <tc:image id="i-3" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="7"/>
- </tc:in>
- <tc:in id="in-4" value="4">
+ </tc:image>
+ <tc:image id="i-4" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="9"/>
- </tc:in>
- <tc:in id="in-5" value="5">
+ </tc:image>
+ <tc:image id="i-5" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="7"/>
- </tc:in>
- <tc:in id="in-6" value="6">
+ </tc:image>
+ <tc:image id="i-6" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-7" value="7">
+ </tc:image>
+ <tc:image id="i-7" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-8" value="8">
+ </tc:image>
+ <tc:image id="i-8" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-9" value="9">
+ </tc:image>
+ <tc:image id="i-9" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-10" value="10">
+ </tc:image>
+ <tc:image id="i-10" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-11" value="11">
+ </tc:image>
+ <tc:image id="i-11" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-12" value="12">
+ </tc:image>
+ <tc:image id="i-12" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-13" value="13">
+ </tc:image>
+ <tc:image id="i-13" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-14" value="14">
+ </tc:image>
+ <tc:image id="i-14" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-15" value="15">
+ </tc:image>
+ <tc:image id="i-15" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-16" value="16">
+ </tc:image>
+ <tc:image id="i-16" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-17" value="17">
+ </tc:image>
+ <tc:image id="i-17" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/>
- </tc:in>
- <tc:in id="in-18" value="18">
+ </tc:image>
+ <tc:image id="i-18" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-19" value="19">
+ </tc:image>
+ <tc:image id="i-19" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="7" rowSpan="1"/>
- </tc:in>
- <tc:in id="in-20" value="20">
+ </tc:image>
+ <tc:image id="i-20" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="9" rowSpan="1"/>
- </tc:in>
+ </tc:image>
<tc:script file="script/test-utils.js"/>
<!--todo-->
- <tc:script onload="checkLayout('page:in-0', 0, 0, 100, 940);"/>
- <tc:script onload="checkLayout('page:in-1', 105, 0, 940, 100);"/>
- <tc:script onload="checkLayout('page:in-2', 105, 105, 730, 100);"/>
- <tc:script onload="checkLayout('page:in-3', 840, 105, 100, 730);"/>
- <tc:script onload="checkLayout('page:in-4', 945, 105, 100, 940);"/>
- <tc:script onload="checkLayout('page:in-5', 105, 210, 100, 730);"/>
- <tc:script onload="checkLayout('page:in-6', 210, 210, 205, 100);"/>
- <tc:script onload="checkLayout('page:in-7', 420, 210, 100, 205);"/>
- <tc:script onload="checkLayout('page:in-8', 525, 210, 205, 205);"/>
- <tc:script onload="checkLayout('page:in-9', 735, 210, 100, 205);"/>
- <tc:script onload="checkLayout('page:in-10', 210, 315, 205, 205);"/>
- <tc:script onload="checkLayout('page:in-11', 420, 420, 205, 205);"/>
- <tc:script onload="checkLayout('page:in-12', 630, 420, 205, 100);"/>
- <tc:script onload="checkLayout('page:in-13', 210, 525, 205, 100);"/>
- <tc:script onload="checkLayout('page:in-14', 630, 525, 205, 205);"/>
- <tc:script onload="checkLayout('page:in-15', 210, 630, 100, 205);"/>
- <tc:script onload="checkLayout('page:in-16', 315, 630, 205, 205);"/>
- <tc:script onload="checkLayout('page:in-17', 525, 630, 100, 205);"/>
- <tc:script onload="checkLayout('page:in-18', 630, 735, 205, 100);"/>
- <tc:script onload="checkLayout('page:in-19', 210, 840, 730, 100);"/>
- <tc:script onload="checkLayout('page:in-20', 0, 945, 940, 100);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 100, 940);"/>
+ <tc:script onload="checkLayout('page:i-1', 105, 0, 940, 100);"/>
+ <tc:script onload="checkLayout('page:i-2', 105, 105, 730, 100);"/>
+ <tc:script onload="checkLayout('page:i-3', 840, 105, 100, 730);"/>
+ <tc:script onload="checkLayout('page:i-4', 945, 105, 100, 940);"/>
+ <tc:script onload="checkLayout('page:i-5', 105, 210, 100, 730);"/>
+ <tc:script onload="checkLayout('page:i-6', 210, 210, 205, 100);"/>
+ <tc:script onload="checkLayout('page:i-7', 420, 210, 100, 205);"/>
+ <tc:script onload="checkLayout('page:i-8', 525, 210, 205, 205);"/>
+ <tc:script onload="checkLayout('page:i-9', 735, 210, 100, 205);"/>
+ <tc:script onload="checkLayout('page:i-10', 210, 315, 205, 205);"/>
+ <tc:script onload="checkLayout('page:i-11', 420, 420, 205, 205);"/>
+ <tc:script onload="checkLayout('page:i-12', 630, 420, 205, 100);"/>
+ <tc:script onload="checkLayout('page:i-13', 210, 525, 205, 100);"/>
+ <tc:script onload="checkLayout('page:i-14', 630, 525, 205, 205);"/>
+ <tc:script onload="checkLayout('page:i-15', 210, 630, 100, 205);"/>
+ <tc:script onload="checkLayout('page:i-16', 315, 630, 205, 205);"/>
+ <tc:script onload="checkLayout('page:i-17', 525, 630, 100, 205);"/>
+ <tc:script onload="checkLayout('page:i-18', 630, 735, 205, 100);"/>
+ <tc:script onload="checkLayout('page:i-19', 210, 840, 730, 100);"/>
+ <tc:script onload="checkLayout('page:i-20', 0, 945, 940, 100);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-bottom.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-bottom.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-bottom.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-bottom.xhtml Wed Aug 5 11:48:51 2009
@@ -13,17 +13,17 @@
</f:facet>
<tc:gridLayoutConstraint width="605px" height="605px"/>
- <tc:in id="in-0" value="0"/>
- <tc:in id="in-1" value="1"/>
- <tc:in id="in-2" value="2">
+ <tc:image id="i-0" value="pidgeon-point.jpg"/>
+ <tc:image id="i-1" value="pidgeon-point.jpg"/>
+ <tc:image id="i-2" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
+ </tc:image>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 400, 400);"/>
- <tc:script onload="checkLayout('page:in-1', 405, 0, 200, 400);"/>
- <tc:script onload="checkLayout('page:in-2', 0, 405, 605, 200);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 400, 400);"/>
+ <tc:script onload="checkLayout('page:i-1', 405, 0, 200, 400);"/>
+ <tc:script onload="checkLayout('page:i-2', 0, 405, 605, 200);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-left.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-left.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-left.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-left.xhtml Wed Aug 5 11:48:51 2009
@@ -13,16 +13,16 @@
</f:facet>
<tc:gridLayoutConstraint width="605px" height="605px"/>
- <tc:in id="in-0" value="0">
+ <tc:image id="i-0" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-1" value="1"/>
- <tc:in id="in-2" value="2"/>
+ </tc:image>
+ <tc:image id="i-1" value="pidgeon-point.jpg"/>
+ <tc:image id="i-2" value="pidgeon-point.jpg"/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 400, 605);"/>
- <tc:script onload="checkLayout('page:in-1', 405, 0, 200, 400);"/>
- <tc:script onload="checkLayout('page:in-2', 405, 405, 200, 200);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 400, 605);"/>
+ <tc:script onload="checkLayout('page:i-1', 405, 0, 200, 400);"/>
+ <tc:script onload="checkLayout('page:i-2', 405, 405, 200, 200);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-right.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-right.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-right.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-right.xhtml Wed Aug 5 11:48:51 2009
@@ -13,16 +13,16 @@
</f:facet>
<tc:gridLayoutConstraint width="605px" height="605px"/>
- <tc:in id="in-0" value="0"/>
- <tc:in id="in-1" value="1">
+ <tc:image id="i-0" value="pidgeon-point.jpg"/>
+ <tc:image id="i-1" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-2" value="2"/>
+ </tc:image>
+ <tc:image id="i-2" value="pidgeon-point.jpg"/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 400, 400);"/>
- <tc:script onload="checkLayout('page:in-1', 405, 0, 200, 605);"/>
- <tc:script onload="checkLayout('page:in-2', 0, 405, 400, 200);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 400, 400);"/>
+ <tc:script onload="checkLayout('page:i-1', 405, 0, 200, 605);"/>
+ <tc:script onload="checkLayout('page:i-2', 0, 405, 400, 200);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-top.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-top.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-top.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2-span-top.xhtml Wed Aug 5 11:48:51 2009
@@ -13,16 +13,16 @@
</f:facet>
<tc:gridLayoutConstraint width="605px" height="605px"/>
- <tc:in id="in-0" value="0">
+ <tc:image id="i-0" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
- <tc:in id="in-1" value="1"/>
- <tc:in id="in-2" value="2"/>
+ </tc:image>
+ <tc:image id="i-1" value="pidgeon-point.jpg"/>
+ <tc:image id="i-2" value="pidgeon-point.jpg"/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 605, 400);"/>
- <tc:script onload="checkLayout('page:in-1', 0, 405, 400, 200);"/>
- <tc:script onload="checkLayout('page:in-2', 405, 405, 200, 200);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 605, 400);"/>
+ <tc:script onload="checkLayout('page:i-1', 0, 405, 400, 200);"/>
+ <tc:script onload="checkLayout('page:i-2', 405, 405, 200, 200);"/>
</tc:page>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-2x2.xhtml Wed Aug 5 11:48:51 2009
@@ -8,21 +8,21 @@
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
+ <tc:gridLayoutConstraint width="600px" height="600px"/>
<f:facet name="layout">
<tc:gridLayout rows="2*;*" columns="2*;*" columnSpacing="0px" rowSpacing="0px"/>
</f:facet>
- <tc:gridLayoutConstraint width="600px" height="600px"/>
- <tc:in id="in-0" value="0"/>
- <tc:in id="in-1" value="1"/>
- <tc:in id="in-2" value="2"/>
- <tc:in id="in-3" value="3"/>
+ <tc:image id="i-0" value="pidgeon-point.jpg"/>
+ <tc:image id="i-1" value="pidgeon-point.jpg"/>
+ <tc:image id="i-2" value="pidgeon-point.jpg"/>
+ <tc:image id="i-3" value="pidgeon-point.jpg"/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 400, 400);"/>
- <tc:script onload="checkLayout('page:in-1', 400, 0, 200, 400);"/>
- <tc:script onload="checkLayout('page:in-2', 0, 400, 400, 200);"/>
- <tc:script onload="checkLayout('page:in-3', 400, 400, 200, 200);"/>
+ <tc:script onload="checkLayout('page:i-0', 0, 0, 400, 400);"/>
+ <tc:script onload="checkLayout('page:i-1', 400, 0, 200, 400);"/>
+ <tc:script onload="checkLayout('page:i-2', 0, 400, 400, 200);"/>
+ <tc:script onload="checkLayout('page:i-3', 400, 400, 200, 200);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-4x4-span-steps.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-4x4-span-steps.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-4x4-span-steps.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/position-4x4-span-steps.xhtml Wed Aug 5 11:48:51 2009
@@ -13,42 +13,42 @@
</f:facet>
<tc:gridLayoutConstraint width="315px" height="315px"/>
- <tc:in id="in-0" value="0"/>
- <tc:in id="in-1" value="1">
+ <tc:image id="image-0" value="pidgeon-point.jpg"/>
+ <tc:image id="image-1" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-2" value="2">
+ </tc:image>
+ <tc:image id="image-2" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
- <tc:in id="in-3" value="3"/>
- <tc:in id="in-4" value="4">
+ </tc:image>
+ <tc:image id="image-3" value="pidgeon-point.jpg"/>
+ <tc:image id="image-4" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-5" value="5"/>
- <tc:in id="in-6" value="6">
+ </tc:image>
+ <tc:image id="image-5" value="pidgeon-point.jpg"/>
+ <tc:image id="image-6" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
- <tc:in id="in-7" value="7">
+ </tc:image>
+ <tc:image id="image-7" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-8" value="8"/>
- <tc:in id="in-9" value="9">
+ </tc:image>
+ <tc:image id="image-8" value="pidgeon-point.jpg"/>
+ <tc:image id="image-9" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
+ </tc:image>
<tc:script file="script/test-utils.js"/>
<!--todo-->
- <tc:script onload="checkLayout('page:in-0', 0, 0, 60, 40);"/>
- <tc:script onload="checkLayout('page:in-1', 65, 0, 90, 155);"/>
- <tc:script onload="checkLayout('page:in-2', 160, 0, 155, 40);"/>
- <tc:script onload="checkLayout('page:in-3', 0, 45, 60, 110);"/>
- <tc:script onload="checkLayout('page:in-4', 160, 45, 130, 215);"/>
- <tc:script onload="checkLayout('page:in-5', 295, 45, 20, 110);"/>
- <tc:script onload="checkLayout('page:in-6', 0, 160, 155, 100);"/>
- <tc:script onload="checkLayout('page:in-7', 295, 160, 20, 155);"/>
- <tc:script onload="checkLayout('page:in-8', 0, 265, 60, 50);"/>
- <tc:script onload="checkLayout('page:in-9', 65, 265, 225, 50);"/>
+ <tc:script onload="checkLayout('page:image-0', 0, 0, 60, 40);"/>
+ <tc:script onload="checkLayout('page:image-1', 65, 0, 90, 155);"/>
+ <tc:script onload="checkLayout('page:image-2', 160, 0, 155, 40);"/>
+ <tc:script onload="checkLayout('page:image-3', 0, 45, 60, 110);"/>
+ <tc:script onload="checkLayout('page:image-4', 160, 45, 130, 215);"/>
+ <tc:script onload="checkLayout('page:image-5', 295, 45, 20, 110);"/>
+ <tc:script onload="checkLayout('page:image-6', 0, 160, 155, 100);"/>
+ <tc:script onload="checkLayout('page:image-7', 295, 160, 20, 155);"/>
+ <tc:script onload="checkLayout('page:image-8', 0, 265, 60, 50);"/>
+ <tc:script onload="checkLayout('page:image-9', 65, 265, 225, 50);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact-4x4.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact-4x4.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact-4x4.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact-4x4.xhtml Wed Aug 5 11:48:51 2009
@@ -14,41 +14,41 @@
<!-- 211 (prime number) + 15px = 226px -->
<tc:gridLayoutConstraint width="226px" height="226px"/>
- <tc:in id="in-0" value="0"/>
- <tc:in id="in-1" value="1">
+ <tc:image id="image-0" value="pidgeon-point.jpg"/>
+ <tc:image id="image-1" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-2" value="2">
+ </tc:image>
+ <tc:image id="image-2" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
- <tc:in id="in-3" value="3"/>
- <tc:in id="in-4" value="4">
+ </tc:image>
+ <tc:image id="image-3" value="pidgeon-point.jpg"/>
+ <tc:image id="image-4" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-5" value="5"/>
- <tc:in id="in-6" value="6">
+ </tc:image>
+ <tc:image id="image-5" value="pidgeon-point.jpg"/>
+ <tc:image id="image-6" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
- <tc:in id="in-7" value="7">
+ </tc:image>
+ <tc:image id="image-7" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint rowSpan="2"/>
- </tc:in>
- <tc:in id="in-8" value="8"/>
- <tc:in id="in-9" value="9">
+ </tc:image>
+ <tc:image id="image-8" value="pidgeon-point.jpg"/>
+ <tc:image id="image-9" value="pidgeon-point.jpg">
<tc:gridLayoutConstraint columnSpan="2"/>
- </tc:in>
+ </tc:image>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 42, 28);"/>
- <tc:script onload="checkLayout('page:in-1', 47, 0, 63, 111);"/>
- <tc:script onload="checkLayout('page:in-2', 115, 0, 111, 28);"/>
- <tc:script onload="checkLayout('page:in-3', 0, 33, 42, 78);"/>
- <tc:script onload="checkLayout('page:in-4', 115, 33, 92, 153);"/>
- <tc:script onload="checkLayout('page:in-5', 212, 33, 14, 78);"/>
- <tc:script onload="checkLayout('page:in-6', 0, 116, 110, 70);"/>
- <tc:script onload="checkLayout('page:in-7', 212, 116, 14, 110);"/>
- <tc:script onload="checkLayout('page:in-8', 0, 191, 42, 35);"/>
- <tc:script onload="checkLayout('page:in-9', 47, 191, 160, 35);"/>
+ <tc:script onload="checkLayout('page:image-0', 0, 0, 42, 28);"/>
+ <tc:script onload="checkLayout('page:image-1', 47, 0, 63, 111);"/>
+ <tc:script onload="checkLayout('page:image-2', 115, 0, 111, 28);"/>
+ <tc:script onload="checkLayout('page:image-3', 0, 33, 42, 78);"/>
+ <tc:script onload="checkLayout('page:image-4', 115, 33, 92, 153);"/>
+ <tc:script onload="checkLayout('page:image-5', 212, 33, 14, 78);"/>
+ <tc:script onload="checkLayout('page:image-6', 0, 116, 110, 70);"/>
+ <tc:script onload="checkLayout('page:image-7', 212, 116, 14, 110);"/>
+ <tc:script onload="checkLayout('page:image-8', 0, 191, 42, 35);"/>
+ <tc:script onload="checkLayout('page:image-9', 47, 191, 160, 35);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/size-not-exact.xhtml Wed Aug 5 11:48:51 2009
@@ -13,13 +13,13 @@
</f:facet>
<tc:gridLayoutConstraint width="201px" height="200px"/>
- <tc:in id="in-0" value="0"/>
- <tc:in id="in-1" value="1"/>
+ <tc:image id="image-0" value="pidgeon-point.jpg"/>
+ <tc:image id="image-1" value="pidgeon-point.jpg"/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:in-0', 0, 0, 101, 200);"/>
- <tc:script onload="checkLayout('page:in-1', 101, 0, 100, 200);"/>
+ <tc:script onload="checkLayout('page:image-0', 0, 0, 100, 200);"/>
+ <tc:script onload="checkLayout('page:image-1', 100, 0, 101, 200);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-nested.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-nested.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-nested.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-nested.xhtml Wed Aug 5 11:48:51 2009
@@ -26,15 +26,15 @@
<tc:gridLayout columns="*;*;*" rows="*;*;*" columnSpacing="5px" rowSpacing="5px"/>
</f:facet>
- <tc:in id="a_NW" value="NW"/>
- <tc:in id="a_N" value="N"/>
- <tc:in id="a_NE" value="NE"/>
- <tc:in id="a_W" value="W"/>
- <tc:in id="a_C" value="C"/>
- <tc:in id="a_E" value="E"/>
- <tc:in id="a_SW" value="SW"/>
- <tc:in id="a_S" value="S"/>
- <tc:in id="a_SE" value="SE"/>
+ <tc:image id="a_NW" value="pidgeon-point.jpg"/>
+ <tc:image id="a_N" value="pidgeon-point.jpg"/>
+ <tc:image id="a_NE" value="pidgeon-point.jpg"/>
+ <tc:image id="a_W" value="pidgeon-point.jpg"/>
+ <tc:image id="a_C" value="pidgeon-point.jpg"/>
+ <tc:image id="a_E" value="pidgeon-point.jpg"/>
+ <tc:image id="a_SW" value="pidgeon-point.jpg"/>
+ <tc:image id="a_S" value="pidgeon-point.jpg"/>
+ <tc:image id="a_SE" value="pidgeon-point.jpg"/>
</tc:panel>
<tc:panel>
@@ -42,15 +42,15 @@
<tc:gridLayout columns="*;*;*" rows="*;*;*"/>
</f:facet>
- <tc:in id="b_NW" value="NW"/>
- <tc:in id="b_N" value="N"/>
- <tc:in id="b_NE" value="NE"/>
- <tc:in id="b_W" value="W"/>
- <tc:in id="b_C" value="C"/>
- <tc:in id="b_E" value="E"/>
- <tc:in id="b_SW" value="SW"/>
- <tc:in id="b_S" value="S"/>
- <tc:in id="b_SE" value="SE"/>
+ <tc:image id="b_NW" value="pidgeon-point.jpg"/>
+ <tc:image id="b_N" value="pidgeon-point.jpg"/>
+ <tc:image id="b_NE" value="pidgeon-point.jpg"/>
+ <tc:image id="b_W" value="pidgeon-point.jpg"/>
+ <tc:image id="b_C" value="pidgeon-point.jpg"/>
+ <tc:image id="b_E" value="pidgeon-point.jpg"/>
+ <tc:image id="b_SW" value="pidgeon-point.jpg"/>
+ <tc:image id="b_S" value="pidgeon-point.jpg"/>
+ <tc:image id="b_SE" value="pidgeon-point.jpg"/>
</tc:panel>
<tc:panel>
@@ -58,10 +58,10 @@
<tc:gridLayout columns="*;*" rows="*;*" columnSpacing="0px"/>
</f:facet>
- <tc:in id="c_NW" value="NW"/>
- <tc:in id="c_NE" value="NE"/>
- <tc:in id="c_SW" value="SW"/>
- <tc:in id="c_SE" value="SE"/>
+ <tc:image id="c_NW" value="pidgeon-point.jpg"/>
+ <tc:image id="c_NE" value="pidgeon-point.jpg"/>
+ <tc:image id="c_SW" value="pidgeon-point.jpg"/>
+ <tc:image id="c_SE" value="pidgeon-point.jpg"/>
</tc:panel>
<tc:panel>
@@ -69,10 +69,10 @@
<tc:gridLayout columns="*;*" rows="*;*" rowSpacing="0px"/>
</f:facet>
- <tc:in id="d_NW" value="NW"/>
- <tc:in id="d_NE" value="NE"/>
- <tc:in id="d_SW" value="SW"/>
- <tc:in id="d_SE" value="SE"/>
+ <tc:image id="d_NW" value="pidgeon-point.jpg"/>
+ <tc:image id="d_NE" value="pidgeon-point.jpg"/>
+ <tc:image id="d_SW" value="pidgeon-point.jpg"/>
+ <tc:image id="d_SE" value="pidgeon-point.jpg"/>
</tc:panel>
<tc:script file="script/test-utils.js"/>
@@ -97,15 +97,15 @@
<tc:script onload="checkLayout('page:b_S', 465, 210, 100, 100);"/>
<tc:script onload="checkLayout('page:b_SE', 570, 210, 100, 100);"/>
- <tc:script onload="checkLayout('page:c_NW', 0, 360, 155, 153);"/>
- <tc:script onload="checkLayout('page:c_NE', 155, 360, 155, 153);"/>
- <tc:script onload="checkLayout('page:c_SW', 0, 518, 155, 152);"/>
- <tc:script onload="checkLayout('page:c_SE', 155, 518, 155, 152);"/>
-
- <tc:script onload="checkLayout('page:d_NW', 360, 360, 153, 155);"/>
- <tc:script onload="checkLayout('page:d_NE', 518, 360, 152, 155);"/>
- <tc:script onload="checkLayout('page:d_SW', 360, 515, 153, 155);"/>
- <tc:script onload="checkLayout('page:d_SE', 518, 515, 152, 155);"/>
+ <tc:script onload="checkLayout('page:c_NW', 0, 360, 155, 152);"/>
+ <tc:script onload="checkLayout('page:c_NE', 155, 360, 155, 152);"/>
+ <tc:script onload="checkLayout('page:c_SW', 0, 517, 155, 153);"/>
+ <tc:script onload="checkLayout('page:c_SE', 155, 517, 155, 153);"/>
+
+ <tc:script onload="checkLayout('page:d_NW', 360, 360, 152, 155);"/>
+ <tc:script onload="checkLayout('page:d_NE', 517, 360, 153, 155);"/>
+ <tc:script onload="checkLayout('page:d_SW', 360, 515, 152, 155);"/>
+ <tc:script onload="checkLayout('page:d_SE', 517, 515, 153, 155);"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-simple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-simple.xhtml?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-simple.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/spacing-simple.xhtml Wed Aug 5 11:48:51 2009
@@ -22,17 +22,17 @@
<tc:gridLayout columns="*;*" rows="*;*" columnSpacing="0px"/>
</f:facet>
- <tc:in id="c_NW" value="NW"/>
- <tc:in id="c_NE" value="NE"/>
- <tc:in id="c_SW" value="SW"/>
- <tc:in id="c_SE" value="SE"/>
+ <tc:image id="c_NW" value="pidgeon-point.jpg"/>
+ <tc:image id="c_NE" value="pidgeon-point.jpg"/>
+ <tc:image id="c_SW" value="pidgeon-point.jpg"/>
+ <tc:image id="c_SE" value="pidgeon-point.jpg"/>
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkLayout('page:c_NW', 0, 0, 155, 153);"/>
- <tc:script onload="checkLayout('page:c_NE', 155, 0, 155, 153);"/>
- <tc:script onload="checkLayout('page:c_SW', 0, 158, 155, 152);"/>
- <tc:script onload="checkLayout('page:c_SE', 155, 158, 155, 152);"/>
+ <tc:script onload="checkLayout('page:c_NW', 0, 0, 155, 152);"/>
+ <tc:script onload="checkLayout('page:c_NE', 155, 0, 155, 152);"/>
+ <tc:script onload="checkLayout('page:c_SW', 0, 157, 155, 153);"/>
+ <tc:script onload="checkLayout('page:c_SE', 155, 157, 155, 153);"/>
</tc:page>
</f:view>
Added: myfaces/tobago/trunk/example/test/src/main/webapp/tc/image/image.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/image/image.xhtml?rev=801140&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/image/image.xhtml (added)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/image/image.xhtml Wed Aug 5 11:48:51 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:view
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page>
+ <tc:gridLayoutConstraint width="600px" height="300px"/>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*" rows="*" />
+ </f:facet>
+
+ <tc:image value="pidgeon-point.jpg"/>
+
+ </tc:page>
+</f:view>
Added: myfaces/tobago/trunk/example/test/src/main/webapp/tc/label/label.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/label/label.xhtml?rev=801140&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/label/label.xhtml (added)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/label/label.xhtml Wed Aug 5 11:48:51 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:view
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page>
+ <tc:gridLayoutConstraint width="600px" height="300px"/>
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;*" rows="fixed"/>
+ </f:facet>
+
+ <tc:label value="Label"/>
+ <tc:in value="In"/>
+
+ </tc:page>
+</f:view>
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Wed Aug 5 11:48:51 2009
@@ -17,11 +17,6 @@
* limitations under the License.
*/
-/*
- * Created 07.02.2003 16:00:00.
- * $Id$
- */
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.Facets;
@@ -45,34 +40,7 @@
private static final Log LOG = LogFactory.getLog(LabelRenderer.class);
- private void createClassAttribute(UIComponent component) {
-
- String rendererType = component.getRendererType().toLowerCase(Locale.ENGLISH);
- String name = getRendererName(rendererType);
-
- UIComponent parent = findParent(component);
- StyleClasses styleClasses = StyleClasses.ensureStyleClasses(component);
- styleClasses.updateClassAttribute(parent, name);
- styleClasses.addMarkupClass(component, name);
-
- }
-
- private UIComponent findParent(UIComponent component) {
- UIComponent parent = component.getParent();
- if (component != parent.getFacet(Facets.LABEL)) {
-
- // try to find belonging component
- // this can only success if the component was rendered (created) before this label
- parent = ComponentUtil.findFor(component);
- }
- if (parent == null) {
- parent = component;
- }
- return parent;
- }
-
- public void encodeEnd(
- FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
UIOutput output = (UIOutput) component;
@@ -115,5 +83,31 @@
writer.endElement(HtmlConstants.DIV);
}
+ private void createClassAttribute(UIComponent component) {
+
+ String rendererType = component.getRendererType().toLowerCase(Locale.ENGLISH);
+ String name = getRendererName(rendererType);
+
+ UIComponent parent = findParent(component);
+ StyleClasses styleClasses = StyleClasses.ensureStyleClasses(component);
+ styleClasses.updateClassAttribute(parent, name);
+ styleClasses.addMarkupClass(component, name);
+
+ }
+
+ private UIComponent findParent(UIComponent component) {
+ UIComponent parent = component.getParent();
+ if (component != parent.getFacet(Facets.LABEL)) {
+
+ // try to find belonging component
+ // this can only success if the component was rendered (created) before this label
+ parent = ComponentUtil.findFor(component);
+ }
+ if (parent == null) {
+ parent = component;
+ }
+ return parent;
+ }
+
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Wed Aug 5 11:48:51 2009
@@ -45,7 +45,7 @@
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.event.PageAction;
-import org.apache.myfaces.tobago.layout.FixedLayoutToken;
+import org.apache.myfaces.tobago.layout.AutoLayoutToken;
import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
@@ -1195,7 +1195,7 @@
LayoutTokens tokens = layoutInfo.getLayoutTokens();
for (int i = 0; i < tokens.getSize(); i++) {
LayoutToken token = tokens.get(i);
- if (token instanceof FixedLayoutToken) {
+ if (token instanceof AutoLayoutToken) {
int width = 0;
if (!rendereredColumns.isEmpty()) {
if (i < rendereredColumns.size()) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Wed Aug 5 11:48:51 2009
@@ -40,8 +40,6 @@
#deprecated
GridLayout.cellSpacing=5
-GridLayout.columnSpacing=5
-GridLayout.rowSpacing=5
Box.paddingWidth=0
Box.paddingHeight=31
@@ -61,24 +59,21 @@
ColumnSelector.fixedWidth=24
-SelectBooleanCheckbox.componentExtraWidth=21
-
-SelectManyCheckbox.fixedHeight=20
-
-
-Label.fixedWidth=144
-
Image.headerHeight=0
+In.preferredHeight=25
+
In.css.border-left-width=2
In.css.border-top-width=2
In.css.border-right-width=2
In.css.border-bottom-width=2
-# todo: padding for scarborough
-In.css.padding-left=0
-In.css.padding-top=0
-In.css.padding-right=0
-In.css.padding-bottom=0
+In.css.padding-left=2
+In.css.padding-top=2
+In.css.padding-right=2
+In.css.padding-bottom=2
+
+Label.fixedWidth=144
+Label.fixedHeight=25
MenuBar.headerHeight=22
MenuBar.fixedHeight=24
@@ -103,6 +98,10 @@
Popup.paddingWidth=8
Popup.paddingHeight=5
+SelectBooleanCheckbox.componentExtraWidth=21
+
+SelectManyCheckbox.fixedHeight=20
+
Sheet.ascendingMarkerWidth=10
Sheet.headerHeight=20
Sheet.footerHeight=20
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Wed Aug 5 11:48:51 2009
@@ -682,10 +682,9 @@
background: #ffffff;
height: 25px;
color: #000000;
- border-color: #bbccdd;
- border-style: inset;
- border-width: 2px;
- margin: 0 0 0 0;
+ border: 2px inset #bbccdd;
+ margin: 0;
+ padding: 2px;
}
.tobago-in-markup-number {
@@ -694,9 +693,7 @@
}
.tobago-in-required {
- background-image: url( "../image/required.gif" );
- background-position: 3px 50%;
- background-repeat: no-repeat;
+ background: url("../image/required.gif") no-repeat 3px 50%;
}
.tobago-in-readonly {
@@ -709,8 +706,8 @@
}
.tobago-in-error {
- border-style: solid;
- border-color: #ff0000;
+ border: 2px solid #ff0000;
+
}
.tobago-in-suggest-popup {
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Wed Aug 5 11:48:51 2009
@@ -35,15 +35,17 @@
DatePicker.fixedWidth=20
+In.preferredHeight=20
+
In.css.border-left-width=1
In.css.border-top-width=1
In.css.border-right-width=1
In.css.border-bottom-width=1
In.css.padding-left=2
-In.css.padding-top=1
+In.css.padding-top=2
In.css.padding-right=2
-In.css.padding-bottom=1
+In.css.padding-bottom=2
MenuBar.fixedHeight=17
@@ -88,4 +90,4 @@
ToolBar.off_off_Height=27
ToolBar.off_bottom_Height=27
ToolBar.off_right_Height=27
-ToolBar.fixedHeight=20
\ No newline at end of file
+ToolBar.fixedHeight=20
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=801140&r1=801139&r2=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Wed Aug 5 11:48:51 2009
@@ -518,7 +518,6 @@
border: 1px #000000 solid;
height: 20px;
font: 12px arial, helvetica, sans-serif;
- padding: 1px 2px 1px 2px;
}
.tobago-in-readonly {
Copied: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties (from r799565, myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties?p2=myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties&p1=myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties&r1=799565&r2=801140&rev=801140&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties Wed Aug 5 11:48:51 2009
@@ -15,77 +15,30 @@
# limitations under the License.
#
-Tobago.labelWidth=120
-Tobago.labelSpace=5
-Tobago.fixedHeight=20
-Tobago.CalendarPopupHeight=260
-
-Box.headerHeight=20
-# paddingHeight = (padding + border) * 2
-Box.paddingHeight=12
-Box.paddingWidth=13
-Box.componentExtraWidth=0
-Box.componentExtraHeight=0
-
-#new layout manager
-Box.leftOffset=6
-Box.topOffset=26
-Box.rightOffset=7
-Box.bottomOffset=7
-
-DatePicker.fixedWidth=20
-
-In.css.border-left-width=1
-In.css.border-top-width=1
-In.css.border-right-width=1
-In.css.border-bottom-width=1
-
-In.css.padding-left=2
-In.css.padding-top=1
-In.css.padding-right=2
-In.css.padding-bottom=1
-
-MenuBar.fixedHeight=17
-
-Label.fixedWidth=120
-
-Popup.paddingWidth=0
-Popup.paddingHeight=0
-
-Sheet.ascendingMarkerWidth=15
-Sheet.headerHeight=20
-Sheet.footerHeight=15
-Sheet.rowPadding=3
-Sheet.contentBorder=2
-Sheet.selectorMenuWidth=16
-Sheet.cellPaddingWidth=4
-
-TabGroup.paddingHeight=22
-TabGroup.paddingWidth=23
-TabGroup.headerHeight=19
-TabGroup.tabLabelExtraWidth=20
-TabGroup.navigationBarWidth=60
-
-Tab.paddingWidth=0
-Tab.paddingHeight=0
-
-TextArea.css.border-left-width=1
-TextArea.css.border-top-width=1
-TextArea.css.border-right-width=1
-TextArea.css.border-bottom-width=1
-
-TextArea.css.padding-left=2
-TextArea.css.padding-top=0
-TextArea.css.padding-right=0
-TextArea.css.padding-bottom=0
-
-ToolBar.small_off_Height=24
-ToolBar.small_bottom_Height=43
-ToolBar.small_right_Height=27
-ToolBar.big_off_Height=40
-ToolBar.big_bottom_Height=59
-ToolBar.big_right_Height=40
-ToolBar.off_off_Height=27
-ToolBar.off_bottom_Height=27
-ToolBar.off_right_Height=27
-ToolBar.fixedHeight=20
\ No newline at end of file
+Cell.leftOffset=0
+Cell.topOffset=0
+Cell.rightOffset=0
+Cell.bottomOffset=0
+
+Cell.css.border-left-width=0
+Cell.css.border-top-width=0
+Cell.css.border-right-width=0
+Cell.css.border-bottom-width=0
+
+Cell.css.padding-left=0
+Cell.css.padding-top=0
+Cell.css.padding-right=0
+Cell.css.padding-bottom=0
+
+GridLayout.columnSpacing=5
+GridLayout.rowSpacing=5
+
+Page.leftOffset=0
+Page.topOffset=0
+Page.rightOffset=0
+Page.bottomOffset=0
+
+Panel.leftOffset=0
+Panel.topOffset=0
+Panel.rightOffset=0
+Panel.bottomOffset=0