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 2015/11/12 16:54:40 UTC
svn commit: r1714075 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout:
simple-1-as-facet.xhtml simple-1.xhtml simple-2-as-facet.xhtml
simple-2.xhtml simple-3-as-facet.xhtml simple-3.xhtml
Author: lofwyr
Date: Thu Nov 12 15:54:40 2015
New Revision: 1714075
URL: http://svn.apache.org/viewvc?rev=1714075&view=rev
Log:
TOBAGO-1435: segmentLayout
demo
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-1-as-facet.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-2-as-facet.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-3-as-facet.xhtml
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-1.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-2.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-3.xhtml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-1.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-1.xhtml?rev=1714075&r1=1714074&r2=1714075&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-1.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-1.xhtml Thu Nov 12 15:54:40 2015
@@ -18,14 +18,14 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page" label="Layout">
<tc:segmentLayout medium="2;4;2;4" small="6;6">
<tc:label value="1st label"/>
<tc:in value="a aa aaa aaaa aaaaa" labelLayout="none"/>
- <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb " labelLayout="segmentLeft"/>
+ <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "
+ labelLayout="segmentLeft"/>
<tc:textarea label="3rd label" value="c cc ccc cccc ccccc" labelLayout="segmentLeft"/>
<tc:textarea label="4th label" value="d dd ddd dddd ddddd" labelLayout="segmentLeft"/>
</tc:segmentLayout>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-2.xhtml?rev=1714075&r1=1714074&r2=1714075&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-2.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-2.xhtml Thu Nov 12 15:54:40 2015
@@ -18,7 +18,6 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
xmlns:f="http://java.sun.com/jsf/core">
<!--
@@ -27,12 +26,13 @@
<tc:page id="page">
<tc:segmentLayout medium="2;4;2;4" small="6;6">
- <tx:in label="1st label" value="a aa aaa aaaa aaaaa"/>
- <tx:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "/>
+ <tc:in label="1st label" value="a aa aaa aaaa aaaaa" labelLayout="segmentLeft"/>
+ <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "
+ labelLayout="segmentLeft"/>
</tc:segmentLayout>
<tc:segmentLayout medium="2;4;2;4" small="6;6">
- <tx:textarea label="3rd label" value="c cc ccc cccc ccccc"/>
- <tx:textarea label="4th label" value="d dd ddd dddd ddddd"/>
+ <tc:textarea label="3rd label" value="c cc ccc cccc ccccc" labelLayout="segmentLeft"/>
+ <tc:textarea label="4th label" value="d dd ddd dddd ddddd" labelLayout="segmentLeft"/>
</tc:segmentLayout>
</tc:page>
</f:view>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-3.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-3.xhtml?rev=1714075&r1=1714074&r2=1714075&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-3.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/simple-3.xhtml Thu Nov 12 15:54:40 2015
@@ -18,19 +18,19 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
<tc:segmentLayout medium="2;4;2;4" small="6;6">
- <tx:in label="1st label" value="#{bootstrap.value}"/>
- <tx:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "/>
+ <tc:in label="1st label" value="#{bootstrap.value}" labelLayout="segmentLeft"/>
+ <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "
+ labelLayout="segmentLeft"/>
</tc:segmentLayout>
<tc:segmentLayout medium="2;4;2;4" small="6;6">
- <tx:textarea label="3rd label" value="c cc ccc cccc ccccc"/>
- <tx:textarea label="4th label" value="d dd ddd dddd ddddd"/>
+ <tc:textarea label="3rd label" value="c cc ccc cccc ccccc" labelLayout="segmentLeft"/>
+ <tc:textarea label="4th label" value="d dd ddd dddd ddddd" labelLayout="segmentLeft"/>
</tc:segmentLayout>
<tc:segmentLayout medium="1;1;1" extraSmall="4;4;4">