myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1700992 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-example: tobago-example-demo/src/main/webapp/ tobago-example-demo/src/main/webapp/content/00-intro/ tobago-example-demo/src/main/webapp/content/01-basic/ tobago-example-demo/src/mai...
Date Thu, 03 Sep 2015 11:34:14 GMT
Author: lofwyr
Date: Thu Sep  3 11:34:13 2015
New Revision: 1700992

URL: http://svn.apache.org/r1700992
Log:
TOBAGO-1485: Label support of the tc-library, so the tx-tibrary will be unnecessary (and deprecated)

Added:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/labeled-layout.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/10/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/10/flow-layout.xhtml
      - copied unchanged from r1692298, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml
Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/in/in-layout.xhtml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
Thu Sep  3 11:34:13 2015
@@ -19,10 +19,10 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 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:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+
   <ui:param name="title" value="#{overviewBundle.intro}"/>
+
   <tc:out escape="false" value="#{overviewBundle.intro_text}"/>
+
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
Thu Sep  3 11:34:13 2015
@@ -26,27 +26,19 @@
   <ui:param name="title" value="Input"/>
 
   <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;2*;3*;2*;2*;2*;2*;2*"/>
-    </f:facet>
 
     <tc:in value="Some Text without Label"/>
 
-    <!-- code-sniplet-start id="in" -->
-    <tx:in label="Input" value="Some Text"/>
-    <!-- code-sniplet-end id="in" -->
-
-    <tx:in label="Read Only" readonly="true" value="Some Text"/>
-
-    <tx:in label="Disabled" disabled="true" value="Some Text"/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="100px;*"/>
-      </f:facet>
+    <tc:in label="Input" value="Some Text"/>
+
+    <tc:in label="Read Only" readonly="true" value="Some Text"/>
+
+    <tc:in label="Disabled" disabled="true" value="Some Text"/>
+
+    <tc:flexLayout columns="100px;*">
       <tc:label value="Short Label"/>
       <tc:in value="Some Text"/>
-    </tc:panel>
+    </tc:flexLayout>
 
     <tx:in label="Input (focus)" focus="true" value="Some Text"/>
 
@@ -55,10 +47,8 @@
     <tc:textarea
         value="Some text without label, some text without label, some text without label,
some text without label, some text without label, some text without label, some text without
label, some text without label, some text without label, some text without label, ..."/>
 
-    <!-- code-sniplet-start id="textarea" -->
     <tx:textarea label="Text Area"
                  value="Some text, some text, some text, some text, some text, some text,
some text, some text, some text, some text, ..."/>
-    <!-- code-sniplet-end id="textarea" -->
 
     <tx:textarea label="Read Only"
                  readonly="true"
@@ -71,11 +61,11 @@
     <tx:textarea label="Area (focus)" focus="true"
                  value="Some Text"/>
 
-    <tc:panel>
+    <tc:flowLayout>
       <tc:out value="An input field is "/>
-      <tc:in value="here" inline="true"/>
+      <tc:in value="here" labelLayout="none"/>
       <tc:out value=" inside of a floating text."/>
-    </tc:panel>
+    </tc:flowLayout>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
Thu Sep  3 11:34:13 2015
@@ -19,48 +19,35 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 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:box label="Output Controls">
-    <f:facet name="layout">
-      <tc:gridLayout columns="*" rows="auto;auto;100px;auto;auto;90px;*" border="1"/>
-    </f:facet>
-
-    <!-- code-sniplet-start id="label" -->
-    <tc:label value="_Single Label"/>
-    <!-- code-sniplet-end id="label" -->
-    <tc:panel/>
-
-    <tx:out label="Phone Number" value="+1 234 567890">
-      <tc:gridLayoutConstraint columnSpan="2"/>
-    </tx:out>
-
-    <tc:panel>
-      <tc:gridLayoutConstraint columnSpan="2"/>
-      <!-- code-sniplet-start id="out" -->
-      <tc:out value="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque
consequat, libero eget porta mattis, risus velit congue magna, at posuere sem orci vitae turpis.
Integer pulvinar. Cras libero. Proin vestibulum tempor urna. Nulla odio nisl, auctor vitae,
faucibus pharetra, feugiat eget, justo. Suspendisse at tellus non justo dictum tincidunt.
Aenean placerat nunc id tortor. Donec mollis ornare pede. Vestibulum ut arcu et dolor auctor
varius. Praesent tincidunt, eros quis vulputate facilisis, orci turpis sollicitudin justo,
id faucibus nunc orci sed purus. Proin ligula erat, sollicitudin id, rhoncus eget, nonummy
sit amet, risus. Aenean arcu lorem, facilisis et, posuere sed, ultrices tincidunt, nunc. Sed
ac massa. Quisque lacinia. Donec quis nibh.
-
-          Aenean ac diam eget mi feugiat pulvinar. Etiam orci. Aliquam nec arcu nec eros
ornare pulvinar. Sed nec velit. Ut ut orci. Nulla varius. Maecenas feugiat. Etiam varius ipsum
et orci. Ut consectetuer odio sit amet libero. Nulla iaculis adipiscing purus. Maecenas a
sed."/>
-      <!-- code-sniplet-end id="out" -->
-    </tc:panel>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
 
-    <!-- code-sniplet-start id="messages" -->
-    <tc:messages/>
-    <!-- code-sniplet-end id="messages" -->
-    <tc:panel/>
+  <ui:param name="title" value="Output Controls"/>
 
-    <!--<tc:messages maxNumber="2"/>-->
-    <tc:panel/>
-    <tc:panel/>
+  <tc:label value="_Single Label"/>
 
-    <!-- code-sniplet-start id="image" -->
-    <tc:image value="image/tobago_head.png" width="150" height="83"/>
-    <!-- code-sniplet-end id="image" -->
-    <tc:panel/>
+  <tc:out label="Phone Number" value="+1 234 567890">
+    <tc:gridLayoutConstraint columnSpan="2"/>
+  </tc:out>
+
+  <tc:out value="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque consequat,
libero eget porta mattis,
+  risus velit congue magna, at posuere sem orci vitae turpis. Integer pulvinar. Cras libero.
Proin vestibulum tempor
+  urna. Nulla odio nisl, auctor vitae, faucibus pharetra, feugiat eget, justo. Suspendisse
at tellus non justo dictum
+  tincidunt. Aenean placerat nunc id tortor. Donec mollis ornare pede. Vestibulum ut arcu
et dolor auctor varius.
+  Praesent tincidunt, eros quis vulputate facilisis, orci turpis sollicitudin justo, id faucibus
nunc orci sed purus.
+  Proin ligula erat, sollicitudin id, rhoncus eget, nonummy sit amet, risus. Aenean arcu
lorem, facilisis et, posuere
+  sed, ultrices tincidunt, nunc. Sed ac massa. Quisque lacinia. Donec quis nibh.
+  Aenean ac diam eget mi feugiat pulvinar. Etiam orci. Aliquam nec arcu nec eros ornare pulvinar.
Sed nec velit.
+  Ut ut orci. Nulla varius. Maecenas feugiat. Etiam varius ipsum et orci. Ut consectetuer
odio sit amet libero.
+  Nulla iaculis adipiscing purus. Maecenas a sed."/>
 
-    <tc:panel/>
-    <tc:panel/>
+  <tc:flowLayout>
+    <tc:label value="messages tag"/>
+    <tc:messages/>
+  </tc:flowLayout>
+
+  <tc:flowLayout>
+    <tc:label value="image tag"/>
+    <tc:image value="image/tobago_head.png" width="150" height="83"/>
+  </tc:flowLayout>
 
-  </tc:box>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
Thu Sep  3 11:34:13 2015
@@ -19,9 +19,8 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 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">
+                xmlns:f="http://java.sun.com/jsf/core" xmlns:tx="http://myfaces.apache.org/tobago/extension">
   <ui:param name="title" value="#{overviewBundle.basic}"/>
 
   <tc:panel>
@@ -39,34 +38,36 @@
     <!-- row -->
     <tc:panel>
       <f:facet name="layout">
-        <tc:gridLayout columns="*;*" border="0"/>
+        <tc:gridLayout columns="*;*"/>
       </f:facet>
 
       <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout rows="auto;auto;auto;auto"/>
         </f:facet>
-        <tx:in value="#{overviewController.basicInput}" required="true" tabIndex="1" fieldId="basic_input"
+        <tc:in value="#{overviewController.basicInput}" required="true" tabIndex="1" fieldId="basic_input"
                label="#{overviewBundle.basic_textboxLabel}" tip="#{overviewBundle.basic_textboxTip}"/>
-        <tx:in value="#{overviewController.suggestInput}" tabIndex="3" fieldId="suggest"
+        <tc:in value="#{overviewController.suggestInput}" tabIndex="3" fieldId="suggest"
                label="#{overviewBundle.basic_suggestLabel}" tip="#{overviewBundle.basic_suggestTip}">
           <tc:suggest suggestMethod="#{overviewController.getInputSuggestItems}" delay="300"
minimumCharacters="1"/>
-        </tx:in>
-        <tx:date value="#{overviewController.basicDate}" tabIndex="4" fieldId="basic_date"
+        </tc:in>
+        <tc:date value="#{overviewController.basicDate}" tabIndex="4" fieldId="basic_date"
                  label="#{overviewBundle.basic_dateLabel}" required="true">
           <f:convertDateTime pattern="dd/MM/yyyy"/>
           <tc:validateSubmittedValueLength maximum="10"/>
-        </tx:date>
-        <tx:time label="#{overviewBundle.basic_timeLabel}" tabIndex="5" fieldId="basic_time"
-                 value="#{overviewController.basicTime}"/>
-        <tx:in value="#{overviewController.placeholder}" tabIndex="6" fieldId="basic_placeholder"
+        </tc:date>
+        <tc:time label="#{overviewBundle.basic_timeLabel}" tabIndex="5" fieldId="basic_time"
+                 value="#{overviewController.basicTime}">
+          <f:convertDateTime pattern="HH:mm" timeZone="CET"/>
+        </tc:time>
+        <tc:in value="#{overviewController.placeholder}" tabIndex="6" fieldId="basic_placeholder"
                label="Placeholder" placeholder="Search..."/>
       </tc:panel>
 
-      <tx:textarea value="#{overviewController.basicArea}" tabIndex="2" tip="max length
= 1000"
+      <tc:textarea value="#{overviewController.basicArea}" tabIndex="2" tip="max length
= 1000"
                    label="#{overviewBundle.basic_textareaLabel}">
-        <f:validateLength maximum="1000" />
-      </tx:textarea>
+        <f:validateLength maximum="1000"/>
+      </tc:textarea>
     </tc:panel>
 
     <!-- row -->
@@ -80,27 +81,27 @@
       <f:facet name="layout">
         <tc:gridLayout columns="*;*" border="0"/>
       </f:facet>
-      <tc:selectOneRadio value="#{overviewController.radioValue}" id="rg0">
+      <tc:selectOneRadio label="Select One" value="#{overviewController.radioValue}" id="rg0">
         <tc:selectItems value="#{overviewController.currencyItems}" id="items0"
-            var="currency" itemValue="#{currency.currencyCode}" itemLabel="#{currency.displayName}"
-            itemImage="data/#{currency.currencyCode}-14.png" />
+                        var="currency" itemValue="#{currency.currencyCode}" itemLabel="#{currency.displayName}"
+                        itemImage="data/#{currency.currencyCode}-14.png"/>
         <!-- images come from tobago-example-data -->
-<!--
-        <f:facet name="click">
-          <tc:command/>
-        </f:facet>
--->
+        <!--
+                <f:facet name="click">
+                  <tc:command/>
+                </f:facet>
+        -->
       </tc:selectOneRadio>
 
       <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout rows="auto;auto"/>
         </f:facet>
-        <tc:selectManyCheckbox value="#{overviewController.multiValue}"
+        <tc:selectManyCheckbox label="Select Many" value="#{overviewController.multiValue}"
                                id="cbg0" renderRange="1-2" converter="salutationId">
           <f:selectItems value="#{overviewController.items}" id="itemsg0"/>
         </tc:selectManyCheckbox>
-        <tc:selectOneChoice value="#{overviewController.singleValue}"
+        <tc:selectOneChoice label="Select One Choice" value="#{overviewController.singleValue}"
                             converter="salutationId">
           <f:selectItems value="#{overviewController.items}"/>
         </tc:selectOneChoice>
@@ -127,10 +128,10 @@
     </tc:flowLayout>
 
     <!-- row -->
-    <tx:in value="#{overviewController.lastAction}" readonly="true"
+    <tc:in value="#{overviewController.lastAction}" readonly="true"
            label="#{overviewBundle.basic_lastActionLabel}">
       <tc:gridLayoutConstraint columnSpan="5"/>
-    </tx:in>
+    </tc:in>
 
     <!-- todo: deprecated -->
     <tc:script>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
Thu Sep  3 11:34:13 2015
@@ -36,13 +36,13 @@
       <f:facet name="layout">
         <tc:gridLayout columns="1*;1*"/>
       </f:facet>
-      <tx:in label="Fatal" value="something" validator="#{validationSeverity.addFatal}"/>
+      <tc:in label="Fatal" value="something" validator="#{validationSeverity.addFatal}"/>
       <tc:out value="(Validator creates an fatal error)"/>
-      <tx:in label="Error" value="something" validator="#{validationSeverity.addError}"/>
+      <tc:in label="Error" value="something" validator="#{validationSeverity.addError}"/>
       <tc:out value="(Validator creates an error)"/>
-      <tx:in label="Warn" value="something" validator="#{validationSeverity.addWarn}"/>
+      <tc:in label="Warn" value="something" validator="#{validationSeverity.addWarn}"/>
       <tc:out value="(Validator creates a warning)"/>
-      <tx:in label="Info" value="something" validator="#{validationSeverity.addInfo}"/>
+      <tc:in label="Info" value="something" validator="#{validationSeverity.addInfo}"/>
       <tc:out value="(Validator creates an info)"/>
     </tc:panel>
 

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/labeled-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/labeled-layout.xhtml?rev=1700992&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/labeled-layout.xhtml
(added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/labeled-layout.xhtml
Thu Sep  3 11:34:13 2015
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/layout/overview.xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="Labeled layout - replaces the deprecated tx: library"/>
+
+  <tc:box label="labelLayout is not set (default is flexLeft)">
+    <tc:in label="In Label" value="some value"/>
+    <tc:date label="Date Label" />
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;none&quot;">
+    <tc:in label="In Label" value="some value" labelLayout="none"/>
+    <tc:date label="Date Label" labelLayout="none"/>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;flexLeft&quot;">
+    <tc:in label="In Label" value="some value" labelLayout="flexLeft"/>
+    <tc:date label="Date Label" labelLayout="flexLeft"/>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;flexRight&quot;">
+    <tc:in label="In Label" value="some value" labelLayout="flexRight"/>
+    <tc:date label="Date Label" labelLayout="flexRight"/>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;top&quot;">
+    <tc:in label="In Label" value="some value" labelLayout="top"/>
+    <tc:date label="Date Label" labelLayout="top"/>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;segmentLeft&quot; (FIXME: not impleented yet)">
+    <tc:segmentLayout large="2;10">
+      <tc:in label="In Label" value="some value" labelLayout="segmentLeft"/>
+      <tc:date label="Date Label" labelLayout="segmentLeft"/>
+    </tc:segmentLayout>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;segmentRight&quot; (FIXME: not impleented yet)">
+    <tc:segmentLayout large="2;10">
+      <tc:in label="In Label" value="some value" labelLayout="segmentRight"/>
+      <tc:date label="Date Label" labelLayout="segmentRight"/>
+    </tc:segmentLayout>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;flowLeft&quot; (FIXME: not impleented yet)">
+    <tc:in label="In Label" value="some value" labelLayout="flowLeft"/>
+    <tc:date label="Date Label" labelLayout="flowLeft"/>
+  </tc:box>
+
+  <tc:box label="labelLayout=&quot;flowRight&quot; (FIXME: not impleented yet)">
+    <tc:in label="In Label" value="some value" labelLayout="flowRight"/>
+    <tc:date label="Date Label" labelLayout="flowRight"/>
+  </tc:box>
+
+</ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
Thu Sep  3 11:34:13 2015
@@ -33,11 +33,11 @@
         <tc:gridLayout columns="*;auto"/>
       </f:facet>
 
-      <tx:file label="Upload file:" value="#{upload.file}">
+      <tc:file label="Upload file:" value="#{upload.file}">
         <!-- todo: write a 2nd example to demonstrate validation
               <tc:validateFileItem contentType="image/gif image/png"/>
         -->
-      </tx:file>
+      </tc:file>
       <tc:button label="Submit" defaultCommand="true" action="#{upload.upload}"/>
     </tc:panel>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
Thu Sep  3 11:34:13 2015
@@ -18,8 +18,7 @@
 -->
 
 <tc:header fixed="true"
-           xmlns:tc="http://myfaces.apache.org/tobago/component"
-           xmlns:f="http://java.sun.com/jsf/core">
+           xmlns:tc="http://myfaces.apache.org/tobago/component">
 
   <tc:nav image="image/feather-leaf.png" label="Tobago Demo">
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/in/in-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/in/in-layout.xhtml?rev=1700992&r1=1700991&r2=1700992&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/in/in-layout.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/in/in-layout.xhtml
Thu Sep  3 11:34:13 2015
@@ -32,12 +32,15 @@
     <tc:label value="tx"/>
 
     <tc:in value="a" id="s1"/>
-    <tx:in value="b" label="normal" fieldId="s2"/>
+    <tx:in value="b" label="normal" id="s2"/>
+    <tc:out/>
+    <tx:in value="c" label="normal breiter als breit als breit" id="s3"/>
 
-    <tc:script file="script/tobago-assert.js"/>
+    <tc:in value="a new" id="sn1"/>
+    <tc:in value="b new" label="normal&lt;b>b&lt;/b>" id="sn2"/>
+    <tc:out/>
+    <tc:in value="c new" label="normal breiter als breit als breit" id="sn3"/>
 
-    <tc:script onload="TobagoAssert.assertLayout('page:s1', 0, 25, 200, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:s2', 330, 25, 200, 20);"/>
 
   </tc:page>
 </f:view>



Mime
View raw message