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 2016/04/19 08:22:23 UTC
svn commit: r1739846 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp:
content/30-concept/16-layout/00/ content/30-concept/16-layout/10-flow/
content/30-concept/16-layout/20-flex/ content/30-concept/16-layou...
Author: lofwyr
Date: Tue Apr 19 06:22:22 2016
New Revision: 1739846
URL: http://svn.apache.org/viewvc?rev=1739846&view=rev
Log:
TOBAGO-1544: Revise Demo Application for Tobago 3.0
[developed by hnoeth]
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/labeled-layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/00/
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/flex-layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/format.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml?rev=1739846&r1=1739845&r2=1739846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml Tue Apr 19 06:22:22 2016
@@ -20,9 +20,11 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <ui:param name="title" value="#{overviewBundle.flow_layout}"/>
+ <ui:param name="title" value="#{overviewBundle.flow_layout} <tc:flowLayout>"/>
<p>The flow layout can be used with the <code><tc:flowLayout/></code> tag.
By default, the content is displayed in a flow layout.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/flowLayout.html"/>
<tc:section label="Basics">
<p>The buttons are displayed successively at the same line.
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/flex-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/flex-layout.xhtml?rev=1739846&r1=1739845&r2=1739846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/flex-layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/flex-layout.xhtml Tue Apr 19 06:22:22 2016
@@ -20,10 +20,12 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <ui:param name="title" value="#{overviewBundle.flex_layout}"/>
+ <ui:param name="title" value="#{overviewBundle.flex_layout} <tc:flexLayout>"/>
<p>The flex layout can be used with the <code><tc:flexLayout/></code> tag.
The two most important attributes are <code>columns</code> and <code>rows</code>.
If both attributes are set, only <code>rows</code> has an effect.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/flexLayout.html"/>
<tc:section label="Basics">
<p>If no attributes set, the behavior of the flex layout is like a flow layout.</p>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml?rev=1739846&r1=1739845&r2=1739846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml Tue Apr 19 06:22:22 2016
@@ -21,16 +21,20 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <ui:param name="title" value="#{overviewBundle.segment_layout}"/>
+ <ui:param name="title" value="#{overviewBundle.segment_layout} <tc:segmentLayout>"/>
<p>The segment layout is basicly a grid with 12 columns.
The number and the proportion of the columns can be set with
<code>large</code>, <code>medium</code>, <code>small</code> or <code>extraSmall</code>.
Every attribute has a different css class, but the usage is the same.
The value is a semicolon separated list of integers, which sum has to be '12'.
A value of n will use n columns from the grid.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/segmentLayout.html"/>
<tc:section label="Basics">
- <p>This example show a segment layout with four columns and a segment layout with three columns.</p>
+ <p>This example show a segment layout with four columns and a segment layout with three columns.
+ The numbers are displayed via the <code class="language-markup"><tc:label/></code> tag.
+ The space is set via the <code class="language-markup"><tc:hidden/></code> tag.</p>
<tc:section label="4 Columns">
<pre><code class="language-markup"><tc:segmentLayout medium="2;4;3;3"></code></pre>
<tc:segmentLayout medium="2;4;3;3">
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/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/30-concept/16-layout/40-labeled/labeled-layout.xhtml?rev=1739846&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/labeled-layout.xhtml (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/labeled-layout.xhtml Tue Apr 19 06:22:22 2016
@@ -0,0 +1,86 @@
+<?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="/main.xhtml"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{overviewBundle.labeled_layout}"/>
+ <p>For many components, a <code>label</code> attribute is available, which place a label in front
+ of the according component.
+ With the <code>labelLayout</code> you can adjust this label.
+ The following examples use an inputfield to show, how this works.</p>
+ <p>Tag Library Documentation:
+ <tc:link label="<tc:in/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/in.html"/>
+ |
+ <tc:link label="<tc:flowLayout/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/flowLayout.html"/>
+ |
+ <tc:link label="<tc:flexLayout/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/flexLayout.html"/>
+ |
+ <tc:link label="<tc:segmentLayout/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/segmentLayout.html"/></p>
+
+ <tc:section label="Basics">
+ <tc:section label="Default value">
+ <p>If the <code>labelLayout</code> is not set, the value is 'flexLeft' by default.</p>
+ <pre><code class="language-markup"><tc:in label="Input"/></code></pre>
+ <tc:in label="Input"/>
+ </tc:section>
+ <tc:section label="No label">
+ <p>The value 'none' has the same effect as just not set the <code>label</code> attribute.</p>
+ <pre><code class="language-markup"><tc:in label="Input" labelLayout="none"/></code></pre>
+ <tc:in label="Input" labelLayout="none"/>
+ </tc:section>
+ <tc:section label="Label on top">
+ <p>The <code>labelLayout</code> is set to 'top'.</p>
+ <pre><code class="language-markup"><tc:in label="Input" labelLayout="top"/></code></pre>
+ <tc:in label="Input" labelLayout="top"/>
+ </tc:section>
+ </tc:section>
+
+ <tc:section label="#{overviewBundle.flow_layout}">
+ <pre><code class="language-markup"><tc:in label="Input" labelLayout="flowLeft"/>
+<tc:in label="Input" labelLayout="flowRight"/></code></pre>
+ <tc:in label="Input" labelLayout="flowLeft"/>
+ <tc:in label="Input" labelLayout="flowRight"/>
+ </tc:section>
+
+ <tc:section label="#{overviewBundle.flex_layout}">
+ <pre><code class="language-markup"><tc:in label="Input" labelLayout="flexLeft"/>
+<tc:in label="Input" labelLayout="flexRight"/></code></pre>
+ <tc:in label="Input" labelLayout="flexLeft"/>
+ <tc:in label="Input" labelLayout="flexRight"/>
+ </tc:section>
+
+ <tc:section label="#{overviewBundle.segment_layout}">
+ <p>The segment layout is divided in two columns. The right one is three times bigger.
+ The 'segmentLeft' and 'segmentRight' put the label in the left or in the right column.</p>
+ <pre><code class="language-markup"><tc:segmentLayout medium="3;9">
+ <tc:in label="Input" labelLayout="segmentLeft"/>
+ <tc:in label="Input" labelLayout="segmentRight"/>
+</tc:segmentLayout></code></pre>
+ <tc:segmentLayout medium="3;9">
+ <tc:in label="Input" labelLayout="segmentLeft"/>
+ <tc:in label="Input" labelLayout="segmentRight"/>
+ </tc:segmentLayout>
+ </tc:section>
+</ui:composition>
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml?rev=1739846&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml Tue Apr 19 06:22:22 2016
@@ -0,0 +1,101 @@
+<?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="/main.xhtml"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.grid_layout} (deprecated)"/>
+ <p>The GridLayout is deprecated. Instead you should use FlexLayout or SegmentLayout.
+ In the first section on this page, there is a typical GridLayout example.
+ The second section show how it's done with FlexLayout.</p>
+ <p>Tag Library Documentation:
+ <tc:link label="<tc:gridLayout/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/gridLayout.html"/>
+ |
+ <tc:link label="<tc:flexLayout/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/flexLayout.html"/>
+ |
+ <tc:link label="<tc:segmentLayout/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/segmentLayout.html"/></p>
+
+ <tc:section label="GridLayout">
+ <tc:box label="Personal Information">
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;*" rows="auto;auto;auto;auto;auto;*"/>
+ </f:facet>
+ <tc:selectOneChoice label="Salutation">
+ <f:selectItem itemLabel="none"/>
+ <f:selectItem itemLabel="Mr."/>
+ <f:selectItem itemLabel="Mrs."/>
+ </tc:selectOneChoice>
+ <tc:panel/>
+
+ <tc:in label="First Name"/>
+ <tc:in label="Last Name"/>
+
+ <tc:in label="c/o">
+ <tc:gridLayoutConstraint columnSpan="2"/>
+ </tc:in>
+
+ <tc:in label="Street"/>
+ <tc:in label="No"/>
+
+ <tc:in label="ZIP"/>
+ <tc:in label="City"/>
+
+ <tc:textarea label="Note">
+ <tc:gridLayoutConstraint columnSpan="2"/>
+ </tc:textarea>
+ </tc:box>
+ </tc:section>
+
+ <tc:section label="FlexLayout">
+ <tc:box label="Personal Information">
+ <tc:flexLayout rows="1;*">
+ <tc:flexLayout columns="auto">
+ <tc:selectOneChoice label="Salutation">
+ <f:selectItem itemLabel="none"/>
+ <f:selectItem itemLabel="Mr."/>
+ <f:selectItem itemLabel="Mrs."/>
+ </tc:selectOneChoice>
+ </tc:flexLayout>
+
+ <tc:flexLayout columns="1;1">
+ <tc:in label="First Name"/>
+ <tc:in label="Last Name"/>
+ </tc:flexLayout>
+
+ <tc:in label="c/o"/>
+
+ <tc:flexLayout columns="1;1">
+ <tc:in label="Street"/>
+ <tc:in label="No"/>
+ </tc:flexLayout>
+
+ <tc:flexLayout columns="1;1">
+ <tc:in label="ZIP"/>
+ <tc:in label="City"/>
+ </tc:flexLayout>
+
+ <tc:textarea label="Note"/>
+ </tc:flexLayout>
+ </tc:box>
+ </tc:section>
+</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/format.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/format.xhtml?rev=1739846&r1=1739845&r2=1739846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/format.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/format.xhtml Tue Apr 19 06:22:22 2016
@@ -21,33 +21,35 @@
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
+ <ui:param name="title" value="#{overviewBundle.format}"/>
+ <p>Use the EL functions from <code>tc:format1</code> to <code>tc:format9</code>
+ to replace up to 9 variables in a given internationalized text.
+ This work like in <tc:link label="java.text.MessageFormat"
+ link="https://docs.oracle.com/javase/6/docs/api/java/text/MessageFormat.html"/>.</p>
- <ui:param name="title" value="Formatting"/>
+ <tc:section label="Format 1">
+ <p>The message format is: "#{overviewBundle.format1}"</p>
+ <pre><code class="language-markup"><tc:out value="\#{tc:format1(overviewBundle.format1, 695700)}"/></code></pre>
+ <tc:out id="o1" value="#{tc:format1(overviewBundle.format1, 695700)}"/>
+ </tc:section>
- <p>
- Use the EL functions <code>tc:format1</code> ...
- <code>tc:format9</code> to replace up to 9 variables in a given internationalized text.
- This work like in [TODO ref java.text.MessageFormat].
- </p>
- <p>
- This is also analog to the <code><h:outputFormat></code> tag, but can be applied to generally each attribute
- in each tag and also in content.
- </p>
- <ul>
- <li><tc:out value="#{tc:format1(overviewBundle.format1, 695700)}" id="format1"/></li>
- <li><tc:out value="#{tc:format3(overviewBundle.format3, 5800, 15700000, 5000000)}" id="format3"/></li>
- <li><tc:out value="#{tc:format9(overviewBundle.format9, 0, 1, 2, 3, 4, 5, 6, 7, 8)}" id="format9"/></li>
- </ul>
- The message format is the bundles are:
- <ul>
- <li><tc:out value="#{overviewBundle.format1}" id="mformat1"/></li>
- <li><tc:out value="#{overviewBundle.format3}" id="mformat3"/></li>
- <li><tc:out value="#{overviewBundle.format9}" id="mformat9"/></li>
- </ul>
+ <tc:section label="Format 3">
+ <p>The message format is: "#{overviewBundle.format3}"</p>
+ <pre><code
+ class="language-markup"><tc:out value="\#{tc:format3(overviewBundle.format3, 5800, 15700000, 5000000)}"/></code></pre>
+ <tc:out id="o2" value="#{tc:format3(overviewBundle.format3, 5800, 15700000, 5000000)}"/>
+ </tc:section>
- <p>
- You may also use the <code>fn:</code> function library for string manipulation.
- E.g. uppercase: #{fn:toUpperCase("uppercase")}.
- </p>
+ <tc:section label="Format 9">
+ <p>The message format is: "#{overviewBundle.format9}"</p>
+ <pre><code
+ class="language-markup"><tc:out value="\#{tc:format9(overviewBundle.format9, 0, 1, 2, 3, 4, 5, 6, 7, 8)}"/></code></pre>
+ <tc:out id="o3" value="#{tc:format9(overviewBundle.format9, 0, 1, 2, 3, 4, 5, 6, 7, 8)}"/>
+ </tc:section>
+ <tc:section label="UpperCase">
+ <p>You may also use the <code>fn:</code> function library for string manipulation.</p>
+ <pre><code class="language-markup"><tc:out value="\#{fn:toUpperCase('uppercase')}"/></code></pre>
+ <tc:out id="o4" value="#{fn:toUpperCase('uppercase')}"/>
+ </tc:section>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml?rev=1739846&r1=1739845&r2=1739846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/roles.xhtml Tue Apr 19 06:22:22 2016
@@ -29,6 +29,9 @@
<p>To allow an action only for a specific role, you have to annotate a method with
<code class="language-java">@RolesAllowed({"role1", "role2"})</code>.
This method must not have a parameter.</p>
+ <p>Also, the name of the beans must be distinct.
+ Tobago only read an el expression once and put it in the cache including the annotation.
+ After that, Tobago only work with the cache.</p>
<p>There are different ways to define roles for Tomcat and Jetty.</p>
<tc:section label="Tomcat">
<p>Roles are defined in a tomcat-users.xml within the <code class="language-markup"><tomcat-users></code>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1739846&r1=1739845&r2=1739846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Tue Apr 19 06:22:22 2016
@@ -105,6 +105,9 @@
<entry key="flow_layout">FlowLayout</entry>
<entry key="flex_layout">FlexLayout</entry>
<entry key="segment_layout">SegmentLayout</entry>
+ <entry key="labeled_layout">LabeledLayout</entry>
+ <entry key="grid_layout">GridLayout</entry>
+ <entry key="format">Formatting</entry>
<entry key="roles">Roles</entry>
@@ -357,25 +360,6 @@
</ul>
</entry>
-<!-- layout -->
-<entry key="layout_exampleTitle">Layout Example: Personal Information</entry>
-<entry key="layout_salutation">Salutation</entry>
-<entry key="layout_firstName">First Name</entry>
-<entry key="layout_lastName">Last Name</entry>
-<entry key="layout_co">c/o</entry>
-<entry key="layout_street">Street</entry>
-<entry key="layout_streetNumber">No</entry>
-<entry key="layout_zipCode">ZIP</entry>
-<entry key="layout_city">City</entry>
-<entry key="layout_note">Note</entry>
-<entry key="layout_text">Tobago simplifies the design of websites.
- <ul style="margin-top: 2px;">
- <li style="line-height: 130%;">Easy to use development of single- and multicolumn forms.</li>
- <li style="line-height: 130%;">Cells can span over multiple rows and colums.</li>
- <li style="line-height: 130%;">Automatic alignment of input field labels.</li>
- </ul>
-</entry>
-
<!-- Themes -->
<entry key="themesText1"><b>Theme configuration</b> <br /><br
/>