myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1737949 [2/2] - in /myfaces/tobago/branches/tobago-3.0.x/tobago-example: tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/ tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ tobago-example-dem...
Date Wed, 06 Apr 2016 09:01:44 GMT
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/panel.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/panel.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/panel.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/panel.xhtml Wed Apr  6 09:01:43 2016
@@ -18,11 +18,77 @@
 -->
 
 <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">
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:f="http://java.sun.com/jsf/core">
+  <ui:param name="title" value="#{overviewBundle.panel} &lt;tc:panel>"/>
+  <p>A <code class="language-markup">&lt;tc:panel/></code> is a simple content container.
+    In the most cases it's invisible and wrapping other components.</p>
+  <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+           link="#{overviewBundle.tagDocUrl}/panel.html"/>
 
-  <ui:param name="title" value="TODO"/>
+  <tc:section label="Basics">
+    <p>The panel has a custom class, which set a blue background color. The class of the panel is set via the
+      <code class="language-markup">&lt;tc:style customClass="blue"/></code> tag.</p>
+    <pre><code class="language-markup">&lt;tc:panel>
+  &lt;tc:style customClass="blue"/>
+  ...
+&lt;/tc:panel></code></pre>
+    <tc:panel>
+      <tc:style customClass="blue"/>
+      <p>Content of the panel with the blue background.</p>
+    </tc:panel>
+  </tc:section>
 
-TODO
+  <tc:section label="Reload">
+    <p>To reload the panel in a dedicated frequency, you can use the
+      <code class="language-markup">&lt;f:facet name="reload"></code> tag.
+      The content of the panel is an outputtext, which display the current time.</p>
+    <pre><code class="language-markup">&lt;tc:panel>
+  &lt;f:facet name="reload">
+    &lt;tc:reload frequency="1000" update="true"/>
+      ...</code></pre>
+    <tc:panel>
+      <f:facet name="reload">
+        <tc:reload frequency="1000" update="true"/>
+      </f:facet>
+      <tc:out id="o1" label="Current Date" value="#{panelController.currentDate}">
+        <f:convertDateTime pattern="HH:mm:ss"/>
+      </tc:out>
+    </tc:panel>
+  </tc:section>
 
+  <tc:section label="Ajax">
+    <p>A panel can also be useful, if more than one component should be rerendered.
+      A component for rerendering can be set with the <code>render</code> attribute in the
+      <code class="language-markup">&lt;f:ajax/></code> tag.
+      In this example, 'Outputfield One' and 'Outputfield Two' should be rerendered.
+      To do so, the outputfields are wrapped in a panel.
+      After the inputfield loosing the focus, the given text is shown by the outputfields.</p>
+    <tc:in id="i1" label="Inputfield" value="#{panelController.text}">
+      <f:ajax render="outputfields"/>
+    </tc:in>
+    <tc:panel id="outputfields">
+      <tc:out id="o2" label="Outputfield One" value="#{panelController.text}"/>
+      <tc:out id="o3" label="Outputfield Two" value="#{panelController.text}"/>
+    </tc:panel>
+  </tc:section>
+
+  <tc:section label="Layout (deprecated)">
+    <p>A panel can contain a <code class="language-markup">&lt;f:facet name="layout"></code> tag.
+      Currently, it can set a grid layout.</p>
+    <p>Since this is deprecated, you better use flex layout or segment layout instead.</p>
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="1*;1*" rows="auto;*"/>
+      </f:facet>
+      <tc:label value="Label 1"/>
+      <tc:label value="Label 2"/>
+      <tc:label value="Label 3"/>
+      <tc:label value="Label 4"/>
+      <tc:label value="Label 5"/>
+      <tc:label value="Label 6"/>
+    </tc:panel>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml Wed Apr  6 09:01:43 2016
@@ -18,11 +18,44 @@
 -->
 
 <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.section} &lt;tc:section>"/>
+  <p>A section can be added with <code class="language-markup">&lt;tc:section/></code> tag.</p>
+  <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+           link="#{overviewBundle.tagDocUrl}/section.html"/>
 
-  <ui:param name="title" value="TODO"/>
+  <tc:section label="Basics">
+    <p>A section can have a title. It is added with the <code>label</code> attribute.
+      This text is the content of a section.</p>
+    <pre><code class="language-markup">&lt;tc:section label="Basics"></code></pre>
+  </tc:section>
 
-TODO
+  <tc:section label="Cascading">
+    <p>A section can contain one or more sections. In this example, the sections are cascaded to level six.</p>
+    <tc:section label="Section 2">
+      <p>Level two. The section "Cascading" is level one.</p>
+      <tc:section label="Section 3">
+        <p>Level three.</p>
+        <tc:section label="Section 4">
+          <p>Level four.</p>
+          <tc:section label="Section 5">
+            <p>Level five.</p>
+            <tc:section label="Section 6">
+              <p>Level six.</p>
+            </tc:section>
+          </tc:section>
+        </tc:section>
+      </tc:section>
+    </tc:section>
+  </tc:section>
 
+  <tc:section label="Image">
+    <p>A section can have an image in the header. The following section have pie-chart in the header.</p>
+    <pre><code class="language-markup">&lt;tc:section label="Pie-Chart" image="fa-pie-chart"></code></pre>
+    <tc:section label="Pie-Chart" image="fa-pie-chart">
+      <p>It's also possible to use image files, instead of font awesome.</p>
+    </tc:section>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header+footer/header+footer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header%2Bfooter/header%2Bfooter.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header+footer/header+footer.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header+footer/header+footer.xhtml Wed Apr  6 09:01:43 2016
@@ -18,11 +18,46 @@
 -->
 
 <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.header_footer} &lt;tc:header> &lt;tc:footer>"/>
+  <p>A header / footer can be set via the <code class="language-markup">&lt;tc:header/></code>
+    respectively <code class="language-markup">&lt;tc:footer/></code> tag.</p>
 
-  <ui:param name="title" value="TODO"/>
+  <tc:section label="Basics">
+    <p>In this simple example, a header and a footer are set.
+      By default the value of the <code>fixed</code> attribute is 'false'.
+      The content of the header, footer and the content between are wrapped in
+      <code class="language-markup">&lt;tc:box/></code> tags. The content boxes don't have a label, but a border.
+    </p>
+    <tc:header>
+      <tc:box>
+        <p>This is the header.</p>
+      </tc:box>
+    </tc:header>
+    <tc:box>
+      <p>This is the content between header and footer.</p>
+    </tc:box>
+    <tc:footer>
+      <tc:box>
+        <p>This is the footer.</p>
+      </tc:box>
+    </tc:footer>
+  </tc:section>
 
-TODO
+  <tc:section label="Header">
+    <p>The header on this site is fixed.
+      It contain the feather icon, the toolbar and the searchbar with the buttons on the right.</p>
+    <pre><code class="language-markup">&lt;tc:header fixed="true">
+  ...</code></pre>
+  </tc:section>
 
+  <tc:section label="Footer">
+    <p>The footer on this site is fixed.</p>
+    <pre><code class="language-markup">&lt;tc:footer fixed="true">
+  © 2016 Apache Software Foundation, Licensed under the &lt;a
+    href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0&lt;/a>.
+&lt;/tc:footer></code></pre>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/container.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/container.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/container.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/container.xhtml Wed Apr  6 09:01:43 2016
@@ -18,53 +18,42 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core">
-
-  <ui:param name="title" value="TODO"/>
-
-TODO
-
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout/>
-    </f:facet>
-
-    <tc:separator label="Layout"/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto" columns="auto;auto;auto;*"/>
-      </f:facet>
-
-      <tc:button label="Hello"/>
-      <tc:button label="WWWWWWWWWW"/>
-      <tc:button label="llllllllll"/>
-      <tc:panel/>
-
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto" columns="auto;*"/>
-      </f:facet>
-
-      <tc:button
-              label="The goal of Tobago is to provide the community with a well designed set of user interface components."/>
-      <tc:panel/>
-
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout rows="45px" columns="100px;100px;*"/>
-      </f:facet>
-
-      <tc:button label="This is a button with a long text."/>
-      <tc:button image="image/next.png" label="This is a button with a long text."/>
-
-    </tc:panel>
-
-  </tc:panel>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{overviewBundle.container}"/>
+  <p>With the container components, content can be shown in different ways.</p>
+
+  <tc:section label="#{overviewBundle.box}">
+    <pre><code class="language-markup">&lt;tc:box label="Box">Content&lt;/tc:box></code></pre>
+    <tc:box label="Box">Content</tc:box>
+  </tc:section>
+
+  <tc:section label="#{overviewBundle.panel}">
+    <pre><code class="language-markup">&lt;tc:panel>Content&lt;/tc:panel></code></pre>
+    <tc:panel>Content</tc:panel>
+  </tc:section>
+
+  <tc:section label="#{overviewBundle.separator}">
+    <pre><code class="language-markup">&lt;p>Content&lt;/p>
+&lt;tc:separator/>
+&lt;p>Content&lt;/p></code></pre>
+    <p>Content</p>
+    <tc:separator/>
+    <p>Content</p>
+  </tc:section>
+
+  <tc:section label="#{overviewBundle.section}">
+    <pre><code class="language-markup">&lt;tc:section label="Section">Content&lt;/tc:section></code></pre>
+    <tc:section label="Section">Content</tc:section>
+  </tc:section>
+
+  <tc:section label="#{overviewBundle.header_footer}">
+    <pre><code class="language-markup">&lt;tc:header>Header-Content&lt;/tc:header>
+&lt;p>Content between header and footer.&lt;/p>
+&lt;tc:footer>Footer-Content&lt;/tc:footer></code></pre>
+    <tc:header>Header-Content</tc:header>
+    <p>Content between header and footer.</p>
+    <tc:footer>Footer-Content</tc:footer>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml Wed Apr  6 09:01:43 2016
@@ -25,8 +25,19 @@
   <ui:param name="title" value="#{overviewBundle.popup} &lt;tc:popup>"/>
   <p>A popup dialog is created with <code class="language-markup">&lt;tc:popup/></code>.
     It can be filled with components like other container.</p>
-  <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
-           link="#{overviewBundle.tagDocUrl}/popup.html"/>
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:popup/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/popup.html"/>
+    |
+    <tc:link label="&lt;f:facet/>"
+             link="https://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/f/facet.html"/>
+    |
+    <tc:link label="&lt;tc:popupReference/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/popupReference.html"/>
+    |
+    <tc:link label="&lt;tc:attribute/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/attribute.html"/></p>
+
   <tc:section label="Basics">
     <p>There are basically two ways to open a popup dialog.
       First, put the <code class="language-markup">&lt;tc:popup/></code> tag within an opening component,

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml Wed Apr  6 09:01:43 2016
@@ -18,55 +18,58 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core">
-
-  <ui:param name="title" value="#{overviewBundle.tabSwitchTypeClient}"/>
-
-  <tc:panel>
-
-    <tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
-      <tc:tab label="#{overviewBundle.tabPlanet}">
-        <tc:image value="image/feather-leaf.png"/>
-        <tc:in value="#{demo.solar.planets[0].diameter}" required="true"
-               label="#{overviewBundle.solarPlanetDiameter}"/>
-        <tc:in value="#{demo.solar.planets[0].mass}"
-               label="#{overviewBundle.solarPlanetMass}"/>
-      </tc:tab>
-      <tc:tab label="#{overviewBundle.tabInsolar}">
-        <tc:image value="image/feather-leaf.png"/>
-        <tc:in value="#{demo.solar.planets[0].sunDistance}"
-               label="#{overviewBundle.solarPlanetSunDistance}"/>
-        <tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
-               label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-        <tc:panel/>
-      </tc:tab>
-      <tc:tab label="#{overviewBundle.tabMoons}">
-        <tc:sheet value="#{demo.solar.planets[0].moons}"
-                  columns="2*;1*;2*;2*" var="moon">
-          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-            <tc:out value="#{moon.name}" id="t_name"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-            <tc:out value="#{moon.number}" id="t_number"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-            <tc:out value="#{moon.distance}" id="t_distance"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-            <tc:out value="#{moon.period}" id="t_period"/>
-          </tc:column>
-        </tc:sheet>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{overviewBundle.tab} - #{overviewBundle.tab_client} &lt;tc:tab>"/>
+  <p>Tabs can be created with one or more <code class="language-markup">&lt;tc:tab/></code> within a
+    <code class="language-markup">&lt;tc:tabGroup></code>.
+    Within a tab, content can be added like in a section or a panel.</p>
+  <p>Changing tabs is client sided by default.</p>
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:tabGroup/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/tabGroup.html"/>
+    |
+    <tc:link label="&lt;tc:tab/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/tab.html"/>
+    |
+    <tc:link label="&lt;tc:tabChangeListener/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/tabChangeListener.html"/></p>
+
+  <tc:section label="Basics">
+    <p>A simple tabgroup. The second tab is disabled.</p>
+    <tc:tabGroup id="tg1">
+      <tc:tab id="t11" label="One">
+        First tab.
+      </tc:tab>
+      <tc:tab id="t12" label="Two" disabled="true">
+        Second tab.
+      </tc:tab>
+      <tc:tab id="t13" label="Three">
+        Third tab.
       </tc:tab>
     </tc:tabGroup>
+  </tc:section>
 
-    <tc:flowLayout>
-      <tc:style textAlign="right"/>
-
-      <tc:button label="OK"/>
-    </tc:flowLayout>
-
-  </tc:panel>
-
+  <tc:section label="Header">
+    <p></p>
+    <p>This example show the different headers, if the <code>label</code> or the <code>image</code> is used.</p>
+    <tc:tabGroup id="tg2">
+      <tc:tab id="t21" label="Only label">
+        <p>Only a label is set.</p>
+        <pre><code class="language-markup">&lt;tc:tab label="Only label"/></code></pre>
+      </tc:tab>
+      <tc:tab id="t22" label="Label with image" image="image/feather-leaf.png">
+        <p>A label and an image are set.</p>
+        <pre><code
+                class="language-markup">&lt;tc:tab label="Label with image" image="image/feather-leaf.png"></code></pre>
+      </tc:tab>
+      <tc:tab id="t23" image="image/feather-leaf.png">
+        <p>Only an image is set.</p>
+        <pre><code class="language-markup">&lt;tc:tab image="image/feather-leaf.png"></code></pre>
+      </tc:tab>
+      <tc:tab id="t24">
+        <p>Neither a label or an image are set. In this case the header gets a label with the indexnumber of the tab in
+          the tabgroup.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/tab-ajax.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/tab-ajax.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/tab-ajax.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/tab-ajax.xhtml Wed Apr  6 09:01:43 2016
@@ -18,72 +18,102 @@
 -->
 
 <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"
                 xmlns:f="http://java.sun.com/jsf/core">
+  <ui:param name="title" value="#{overviewBundle.tab} - #{overviewBundle.tab_ajax} &lt;tc:tab>"/>
+  <p>Tabs can be created with one or more <code class="language-markup">&lt;tc:tab/></code> within a
+    <code class="language-markup">&lt;tc:tabGroup></code>.
+    Within a tab, content can be added like in a section or a panel.</p>
+  <p>To activate Ajax, the <code>switchType</code> attribute must have the value "reloadTab".
+    On all tabgroups on this page, Ajax is activated.</p>
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:tabGroup/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/tabGroup.html"/>
+    |
+    <tc:link label="&lt;tc:tab/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/tab.html"/>
+    |
+    <tc:link label="&lt;tc:tabChangeListener/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/tabChangeListener.html"/></p>
+
+  <tc:section label="Basics">
+    <p>A simple tabgroup. The second tab is disabled.</p>
+    <tc:tabGroup id="tg1" switchType="reloadTab">
+      <tc:tab id="t11" label="One">
+        First tab.
+      </tc:tab>
+      <tc:tab id="t12" label="Two" disabled="true">
+        Second tab.
+      </tc:tab>
+      <tc:tab id="t13" label="Three">
+        Third tab.
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
-  <ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadTag}"/>
-
-  <tc:panel>
+  <tc:section label="Header">
+    <p>This example show the different headers, if the <code>label</code> or the <code>image</code> is used.</p>
+    <tc:tabGroup id="tg2" switchType="reloadTab">
+      <tc:tab id="t21" label="Only label">
+        <p>Only a label is set.</p>
+        <pre><code class="language-markup">&lt;tc:tab label="Only label"/></code></pre>
+      </tc:tab>
+      <tc:tab id="t22" label="Label with image" image="image/feather-leaf.png">
+        <p>A label and an image are set.</p>
+        <pre><code
+                class="language-markup">&lt;tc:tab label="Label with image" image="image/feather-leaf.png"></code></pre>
+      </tc:tab>
+      <tc:tab id="t23" image="image/feather-leaf.png">
+        <p>Only an image is set.</p>
+        <pre><code class="language-markup">&lt;tc:tab image="image/feather-leaf.png"></code></pre>
+      </tc:tab>
+      <tc:tab id="t24">
+        <p>Neither a label or an image are set. In this case the header gets a label with the indexnumber of the tab in
+          the tabgroup.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
-    <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}" immediate="true"
-        renderedPartially="@this :page:header:headerInfo">
+  <tc:section label="Open Folder Example">
+    <p>The image in the header depends on what tab is currently selected.</p>
+    <pre><code class="language-markup">&lt;tc:tabGroup selectedIndex="\#{tabController.index}"></code></pre>
+    <tc:tabGroup switchType="reloadTab" selectedIndex="#{tabController.index}">
+      <tc:tab label="One" image="#{tabController.tabOneImage}">
+        <p>First folder open.</p>
+      </tc:tab>
+      <tc:tab label="Two" image="#{tabController.tabTwoImage}">
+        <p>Second folder open.</p>
+      </tc:tab>
+      <tc:tab label="Three" image="#{tabController.tabThreeImage}">
+        <p>Third folder open.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
+  <tc:section label="TabChangeListener">
+    <p>The <code class="language-markup">&lt;tc:tabChangeListener/></code> tag is used to bind a
+      <code>TabChangeListener</code>. The <code>TabChangeListener</code> is an interface,
+      which is implemented in this example by <code>SimpleTabChangeListener</code>.</p>
+    <code class="language-markup">&lt;tc:tabChangeListener type="org.apache.myfaces.tobago.example
+      .demo.actionlistener.SimpleTabChangeListener"
+      binding="\#{tabController.tabChangeListener}"/></code>
+    <tc:tabGroup switchType="reloadTab" renderedPartially="outPanel">
       <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                            binding="#{demo.tabChangeListener}"/>
-
-      <tc:tab image="image/feather-leaf.png"
-              label="#{overviewBundle.tabPlanet}">
-        <tc:image value="image/feather-leaf.png"/>
-        <tc:in value="#{demo.solar.planets[0].diameter}" required="true"
-               label="#{overviewBundle.solarPlanetDiameter}"/>
-        <tc:in value="#{demo.solar.planets[0].mass}"
-               label="#{overviewBundle.solarPlanetMass}"/>
-      </tc:tab>
-      <tc:tab image="image/feather.png"
-              label="#{overviewBundle.tabInsolar}"
-              rendered="#{!hideTab2}">
-        <f:facet name="toolBar">
-          <tc:toolBar>
-            <tc:toolBarCommand actionListener="#{demo.hideTab2}"
-                               tip="#{overviewBundle.closeButtonTip}"
-                               image="image/remove.png"
-                               renderedPartially=":page:tabMarsOuterForm2"/>
-          </tc:toolBar>
-        </f:facet>
-        <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
-        <tc:image value="image/feather-leaf.png"/>
-        <tc:in value="#{demo.solar.planets[0].sunDistance}"
-               label="#{overviewBundle.solarPlanetSunDistance}"/>
-        <tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
-               label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-        <tc:panel/>
-      </tc:tab>
-      <tc:tab image="image/feather-open.png">
-        <tc:sheet value="#{demo.solar.planets[0].moons}"
-                  columns="2*;1*;2*;2*" var="moon">
-          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-            <tc:out value="#{moon.name}" id="t_name"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-            <tc:out value="#{moon.number}" id="t_number"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-            <tc:out value="#{moon.distance}" id="t_distance"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-            <tc:out value="#{moon.period}" id="t_period"/>
-          </tc:column>
-        </tc:sheet>
+                            binding="#{tabController.tabChangeListener}"/>
+      <tc:tab label="One">
+        <p>Changed to tab one.</p>
+      </tc:tab>
+      <tc:tab label="Two">
+        <p>Changed to tab two.</p>
+      </tc:tab>
+      <tc:tab label="Three">
+        <p>Changed to tab three.</p>
       </tc:tab>
     </tc:tabGroup>
-
-    <tc:flowLayout>
-      <tc:style textAlign="right"/>
-
-      <tc:button label="OK"/>
-    </tc:flowLayout>
-
-  </tc:panel>
-
+    <tc:panel id="outPanel">
+      <tc:out label="NewTabIndex" value="#{tabController.newTabIndex}"/>
+      <tc:out label="ClientID" value="#{tabController.clientId}"/>
+      <tc:out label="TabChangedCount" value="#{tabController.count}"/>
+    </tc:panel>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/tab-server.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/tab-server.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/tab-server.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/tab-server.xhtml Wed Apr  6 09:01:43 2016
@@ -18,55 +18,101 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadPage}"/>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{overviewBundle.tab} - #{overviewBundle.tab_server} &lt;tc:tab>"/>
+  <p>Tabs can be created with one or more <code class="language-markup">&lt;tc:tab/></code> within a
+    <code class="language-markup">&lt;tc:tabGroup></code>.
+    Within a tab, content can be added like in a section or a panel.</p>
+  <p>Changing tabs is client sided by default.
+    To change them server sided, the <code>switchType</code> attribute must have the value "reloadPage".
+    All tabgroups on this page are server sided.</p>
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:tabGroup/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/tabGroup.html"/>
+    |
+    <tc:link label="&lt;tc:tab/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/tab.html"/>
+    |
+    <tc:link label="&lt;tc:tabChangeListener/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/tabChangeListener.html"/></p>
+
+  <tc:section label="Basics">
+    <p>A simple tabgroup. The second tab is disabled.</p>
+    <tc:tabGroup id="tg1" switchType="reloadPage">
+      <tc:tab id="t11" label="One">
+        First tab.
+      </tc:tab>
+      <tc:tab id="t12" label="Two" disabled="true">
+        Second tab.
+      </tc:tab>
+      <tc:tab id="t13" label="Three">
+        Third tab.
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
-  <tc:panel>
+  <tc:section label="Header">
+    <p>This example show the different headers, if the <code>label</code> or the <code>image</code> is used.</p>
+    <tc:tabGroup id="tg2" switchType="reloadPage">
+      <tc:tab id="t21" label="Only label">
+        <p>Only a label is set.</p>
+        <pre><code class="language-markup">&lt;tc:tab label="Only label"/></code></pre>
+      </tc:tab>
+      <tc:tab id="t22" label="Label with image" image="image/feather-leaf.png">
+        <p>A label and an image are set.</p>
+        <pre><code
+                class="language-markup">&lt;tc:tab label="Label with image" image="image/feather-leaf.png"></code></pre>
+      </tc:tab>
+      <tc:tab id="t23" image="image/feather-leaf.png">
+        <p>Only an image is set.</p>
+        <pre><code class="language-markup">&lt;tc:tab image="image/feather-leaf.png"></code></pre>
+      </tc:tab>
+      <tc:tab id="t24">
+        <p>Neither a label or an image are set. In this case the header gets a label with the indexnumber of the tab in
+          the tabgroup.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
-    <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}" immediate="true">
+  <tc:section label="Open Folder Example">
+    <p>The image in the header depends on what tab is currently selected.</p>
+    <pre><code class="language-markup">&lt;tc:tabGroup selectedIndex="\#{tabController.index}"></code></pre>
+    <tc:tabGroup switchType="reloadPage" selectedIndex="#{tabController.index}">
+      <tc:tab label="One" image="#{tabController.tabOneImage}">
+        <p>First folder open.</p>
+      </tc:tab>
+      <tc:tab label="Two" image="#{tabController.tabTwoImage}">
+        <p>Second folder open.</p>
+      </tc:tab>
+      <tc:tab label="Three" image="#{tabController.tabThreeImage}">
+        <p>Third folder open.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
+  <tc:section id="tabChangeListenerSection" label="TabChangeListener">
+    <p>The <code class="language-markup">&lt;tc:tabChangeListener/></code> tag is used to bind a
+      <code>TabChangeListener</code>. The <code>TabChangeListener</code> is an interface,
+      which is implemented in this example by <code>SimpleTabChangeListener</code>.</p>
+    <code class="language-markup">&lt;tc:tabChangeListener type="org.apache.myfaces.tobago.example
+      .demo.actionlistener.SimpleTabChangeListener"
+      binding="\#{tabController.tabChangeListener}"/></code>
+    <tc:tabGroup switchType="reloadPage" renderedPartially="tabChangeListenerSection">
       <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                            binding="#{demo.tabChangeListener}"/>
-
-      <tc:tab label="#{overviewBundle.tabPlanet}">
-        <tc:in value="#{demo.solar.planets[0].diameter}" required="true"
-               label="#{overviewBundle.solarPlanetDiameter}"/>
-        <tc:in value="#{demo.solar.planets[0].mass}"
-               label="#{overviewBundle.solarPlanetMass}"/>
-      </tc:tab>
-      <tc:tab label="#{overviewBundle.tabInsolar}">
-        <tc:in value="#{demo.solar.planets[0].sunDistance}"
-               label="#{overviewBundle.solarPlanetSunDistance}"/>
-        <tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
-               label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-      </tc:tab>
-      <tc:tab label="#{overviewBundle.tabMoons}">
-        <tc:sheet value="#{demo.solar.planets[0].moons}"
-                  columns="2*;1*;2*;2*" var="moon">
-          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-            <tc:out value="#{moon.name}" id="t_name"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-            <tc:out value="#{moon.number}" id="t_number"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-            <tc:out value="#{moon.distance}" id="t_distance"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-            <tc:out value="#{moon.period}" id="t_period"/>
-          </tc:column>
-        </tc:sheet>
+                            binding="#{tabController.tabChangeListener}"/>
+      <tc:tab label="One">
+        <p>Changed to tab one.</p>
+      </tc:tab>
+      <tc:tab label="Two">
+        <p>Changed to tab two.</p>
+      </tc:tab>
+      <tc:tab label="Three">
+        <p>Changed to tab three.</p>
       </tc:tab>
     </tc:tabGroup>
-
-    <tc:flowLayout>
-      <tc:style textAlign="right"/>
-
-      <tc:button label="OK"/>
-    </tc:flowLayout>
-
-  </tc:panel>
-
+    <tc:out label="OldTabIndex" value="#{tabController.oldTabIndex}"/>
+    <tc:out label="NewTabIndex" value="#{tabController.newTabIndex}"/>
+    <tc:out label="ClientID" value="#{tabController.clientId}"/>
+    <tc:out label="TabChangedCount" value="#{tabController.count}"/>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.xhtml Wed Apr  6 09:01:43 2016
@@ -18,16 +18,49 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="#{overviewBundle.tab}"/>
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout rows="1*;4*"/>
-    </f:facet>
+  <p>A <code class="language-markup">&lt;tc:tabGroup/></code> can contain several
+    <code class="language-markup">&lt;tc:tab/></code> tags.
+    Switching between tabs can be done on the client or by server request.
+    For server requests there are two ways. Reload the whole page and reload only the tab (Ajax).
+    To set the switching type, use the <code>switchType</code> attribute. By default it's client sided.</p>
 
-    <tc:out escape="false" value="#{overviewBundle.tab_text}"/>
+  <tc:section label="#{overviewBundle.tab_client}">
+    <pre><code class="language-markup">&lt;tc:tabGroup></code></pre>
+    <tc:tabGroup>
+      <tc:tab label="Tab One">
+        <p>Content of tab one.</p>
+      </tc:tab>
+      <tc:tab label="Tab Two">
+        <p>Content of tab two.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 
-  </tc:panel>
+  <tc:section label="#{overviewBundle.tab_ajax}">
+    <pre><code class="language-markup">&lt;tabGroup switchType="reloadTab"></code></pre>
+    <tc:tabGroup switchType="reloadTab">
+      <tc:tab label="Tab One">
+        <p>Content of tab one.</p>
+      </tc:tab>
+      <tc:tab label="Tab Two">
+        <p>Content of tab two.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
+
+  <tc:section label="#{overviewBundle.tab_server}">
+    <pre><code class="language-markup">&lt;tabGroup switchType="reloadPage"></code></pre>
+    <tc:tabGroup switchType="reloadPage">
+      <tc:tab label="Tab One">
+        <p>Content of tab one.</p>
+      </tc:tab>
+      <tc:tab label="Tab Two">
+        <p>Content of tab two.</p>
+      </tc:tab>
+    </tc:tabGroup>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/tree-command-types.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/tree-command-types.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/tree-command-types.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/tree-command-types.xhtml Wed Apr  6 09:01:43 2016
@@ -18,21 +18,37 @@
 -->
 
 <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="Tree - Different Command Types"/>
+  <ui:param name="title" value="#{overviewBundle.tree_command_types} &lt;tc:treeCommand>"/>
+  <p>The <code class="language-markup">&lt;tc:treeCommand/></code> tag can be added to a
+    <code class="language-markup">&lt;tc:treeNode/></code> instead of a
+    <code class="language-markup">&lt;treeLabel/></code> tag.
+    It's like a <code class="language-markup">&lt;tc:link/></code> and can used to run a action or
+    link to a resource or external website.</p>
+  <p><tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+              link="#{overviewBundle.tagDocUrl}/treeCommand.html"/></p>
 
-  <tc:treeMenu value="#{treeController.mixed}" var="node" id="data">
-    <tc:treeNode id="template">
-      <!-- todo: remove onclick -->
-      <!-- todo: remove mixing action and link -->
-      <tc:treeCommand label="#{node.name}" rendered="#{node.childCount == 0}"
-                      action="#{node.action}"
-                      actionListener="#{node.actionListener}"
-                      link="#{node.url}"
-                      onclick="#{node.script}"/>
-      <tc:treeLabel value="#{node.name}" rendered="#{node.childCount > 0}"/>
-    </tc:treeNode>
-  </tc:treeMenu>
+  <tc:section label="Example">
+    <p>In this example, the nodes with children are displayed as
+      <code class="language-markup">&lt;tc:treeLabel/></code>. The leafs are
+      <code class="language-markup">&lt;tc:treeCommand/></code>.
+      Like the parent nodes suggest,
+      the entries in 'Actions' run an action with the <code>action</code> attribute.
+      The entries in 'Resources' link to an internal page via <code>resource</code> attribute.
+      And the entries in 'Links' are links to an external website using the <code>link</code> attribute.</p>
+    <tc:tree value="#{treeCommandTypesController.sample}" var="node">
+      <tc:treeNode>
+        <tc:treeIndent showJunctions="false"/>
+        <tc:treeLabel value="#{node.name}" rendered="#{node.childCount > 0}"/>
+        <tc:treeCommand label="#{node.name}" rendered="#{node.childCount == 0}"
+                        action="#{treeCommandTypesController.increaseActionCount(node.action)}"
+                        resource="#{node.resource}" link="#{node.url}"/>
+      </tc:treeNode>
+    </tc:tree>
 
+    <tc:out label="Action 1 Count" value="#{treeCommandTypesController.actionOneCount}"/>
+    <tc:out label="Action 2 Count" value="#{treeCommandTypesController.actionTwoCount}"/>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.xhtml Wed Apr  6 09:01:43 2016
@@ -18,51 +18,51 @@
 -->
 
 <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"
                 xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tree}"/>
-
-  <tc:panel id="panel">
-    <f:facet name="layout">
-      <tc:gridLayout rows="100px;*"/>
-    </f:facet>
-
-    <tc:out escape="false" value="Tree Selection (UNDER CONSTRUCTION)"/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="2*;1*"/>
-      </f:facet>
-
-      <tc:tree id="tree"
-               showRootJunction="#{demo.showRootJunction}"
-               showRoot="#{demo.showRoot}"
-               value="#{demo.tree}"
-               var="node"
-               selectable="#{overviewController.treeSelectMode}">
-        <tc:treeNode id="template">
-          <tc:treeIndent showJunctions="#{demo.showJunctions}"/>
-          <tc:treeIcon rendered="#{demo.showIcons}"/>
-          <tc:treeSelect id="select" value="#{node.userObject.selected}" label="#{node.userObject.name}">
-            <f:facet name="change">
-              <tc:command renderedPartially=":page:header:headerInfo"/>
-            </f:facet>
-          </tc:treeSelect>
-        </tc:treeNode>
-      </tc:tree>
-
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto;auto;auto;auto;1*;auto;auto;auto"/>
-        </f:facet>
-
-        <tc:selectOneRadio value="#{overviewController.treeSelectMode}">
-          <f:selectItems value="#{overviewController.treeSelectModeItems}"/>
-        </tc:selectOneRadio>
-
-        <tc:button label="#{overviewBundle.submit}" renderedPartially="panel"/>
-      </tc:panel>
+  <ui:param name="title" value="#{overviewBundle.tree_select} &lt;treeSelect>"/>
+  <p>The <code class="language-markup">&lt;tc:treeSelect/></code> tag can be used instead of
+    <code class="language-markup">&lt;treeLabel/></code> to add radio buttons or checkboxes in front of the nodes.</p>
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:tree/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/tree.html"/>
+    |
+    <tc:link label="&lt;tc:treeSelect/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/treeSelect.html"/></p>
+
+  <tc:section label="Example">
+    <p>The <code class="language-markup">&lt;tc:tree/></code> tag must use the <code>selectable</code> attribute.
+      The value of the attribute in this example can be changed by the radio buttons in the contentbox on the right.</p>
+    <tc:panel id="examplePanel">
+      <tc:flexLayout columns="*;auto">
+        <tc:tree value="#{treeSelectController.sample}" var="node" showRoot="true"
+                 selectable="#{treeSelectController.selectable}">
+          <tc:treeNode>
+            <tc:treeIndent/>
+            <tc:treeSelect label="#{node.userObject.name}" value="#{node.userObject.selected}">
+              <f:facet name="change">
+                <tc:command renderedPartially="selectedNodesOutput"/>
+              </f:facet>
+            </tc:treeSelect>
+          </tc:treeNode>
+        </tc:tree>
+        <tc:panel>
+          <tc:box label="selectable">
+            <tc:selectOneRadio value="#{treeSelectController.selectable}">
+              <f:ajax render="examplePanel"/>
+              <tc:selectItem itemLabel="none" itemValue="none"/>
+              <tc:selectItem itemLabel="single" itemValue="single"/>
+              <tc:selectItem itemLabel="singleLeafOnly" itemValue="singleLeafOnly"/>
+              <tc:selectItem itemLabel="multi" itemValue="multi"/>
+              <tc:selectItem itemLabel="multiLeafOnly" itemValue="multiLeafOnly"/>
+              <tc:selectItem itemLabel="multiCascade" itemValue="multiCascade"/>
+            </tc:selectOneRadio>
+          </tc:box>
+        </tc:panel>
+      </tc:flexLayout>
     </tc:panel>
-  </tc:panel>
+    <tc:out id="selectedNodesOutput" label="Selected Nodes" value="#{treeSelectController.selectedNodes}"/>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml Wed Apr  6 09:01:43 2016
@@ -18,41 +18,28 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tree} Menu"/> <!-- todo i18n -->
-
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout rows="9*;16*"/>
-    </f:facet>
-
-    <tc:out escape="false" value="(UNDER CONSTRUCTION) Tree Menu"/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="2*;1*"/>
-      </f:facet>
-
-      <tc:treeMenu id="treeMenu" showRoot="#{demo.showRoot}" value="#{demo.tree}" var="node">
-        <tc:treeNode id="template">
-          <tc:treeLabel value="#{node.userObject.name}"/>
-        </tc:treeNode>
-      </tc:treeMenu>
-
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto;*;auto"/>
-        </f:facet>
-
-        <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
-                                  value="#{demo.showRoot}"/>
-        <tc:panel/>
-        <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
-      </tc:panel>
-
-    </tc:panel>
-
-  </tc:panel>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{overviewBundle.tree_menu} &lt;tc:treeMenu>"/>
+  <p>The <code class="language-markup">&lt;tc:treeMenu/></code> tag can be used for menus
+    like the one on the left side of this site.
+    The nodes have to be <code class="language-markup">&lt;tc:treeCommand/></code> tags,
+    otherwise <code class="language-markup">&lt;tc:treeMenu/></code> behaves the same way as
+    <code class="language-markup">&lt;tc:tree/></code>.
+    <code class="language-markup">&lt;tc:treeMenu/></code> set indents automatically for
+    <code class="language-markup">&lt;tc:treeCommand/></code>.
+    So the <code class="language-markup">&lt;tc:treeIndent/></code> tag is not needed.</p>
+  <tc:link label="Tag Library Documentation:" image="image/feather-leaf.png"
+           link="#{overviewBundle.tagDocUrl}/treeMenu.html"/>
+
+  <tc:section label="Example">
+    <p>In this example, a click on a node has no effect.</p>
+    <pre><code class="language-markup">&lt;tc:treeMenu value="\#{treeController.sample}" ...></code></pre>
+    <tc:treeMenu value="#{treeController.sample}" var="node">
+      <tc:treeNode>
+        <tc:treeCommand label="#{node.userObject.name}"/>
+      </tc:treeNode>
+    </tc:treeMenu>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/tree-listbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/tree-listbox.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/tree-listbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/tree-listbox.xhtml Wed Apr  6 09:01:43 2016
@@ -18,33 +18,22 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tree}"/>
-
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout rows="50px;*;auto"/>
-    </f:facet>
-
-    <tc:out escape="false" value="(UNDER CONSTRUCTION) Tree Listbox"/>
-
-    <tc:treeListbox id="tree" value="#{demo.tree}" var="node">
-      <tc:treeNode id="template">
-        <tc:treeSelect label="#{node.userObject.name}"
-                       value="#{node.userObject.selected}"/>
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{overviewBundle.tree_listbox} &lt;tc:treeListbox>"/>
+  <p>The <code class="language-markup">&lt;tc:treeListbox/></code> can be used to replace a classic
+    <code class="language-markup">&lt;tc:tree/></code>. It displays the tree as a number of lists.</p>
+  <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+           link="#{overviewBundle.tagDocUrl}/treeListbox.html"/>
+
+  <tc:section label="Example">
+    <pre><code class="language-markup">&lt;tc:treeListbox value="\#{treeController.sample}" ...></code></pre>
+    <tc:treeListbox value="#{treeController.sample}" var="node">
+      <tc:treeNode>
+        <tc:treeIndent/>
+        <tc:treeLabel value="#{node.userObject.name}"/>
       </tc:treeNode>
     </tc:treeListbox>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="*;auto" rows="auto"/>
-      </f:facet>
-
-      <tc:panel/>
-      <tc:button label="Submit"/>
-    </tc:panel>
-
-  </tc:panel>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/tree.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/tree.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/tree.xhtml Wed Apr  6 09:01:43 2016
@@ -18,46 +18,98 @@
 -->
 
 <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"
                 xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tree}"/>
-
-  <tc:panel id="panel">
-
-    <tc:out escape="false" value="(UNDER CONSTRUCTION) #{overviewBundle.tree_text}"/>
-
-    <tc:flexLayout columns="*;*">
-
-      <tc:tree id="tree"
-               showRootJunction="#{demo.showRootJunction}"
-               showRoot="#{demo.showRoot}"
-               value="#{demo.tree}"
-               var="node">
-        <tc:treeNode id="template">
-          <tc:treeIndent showJunctions="#{demo.showJunctions}"/>
-          <tc:treeIcon value="image/feather.png" rendered="#{demo.showIcons}"/>
-          <tc:treeLabel value="#{node.userObject.name}"/>
-        </tc:treeNode>
-      </tc:tree>
-
-      <tc:panel>
-        <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowIcons}" value="#{demo.showIcons}">
-          <f:ajax render="panel"/>
-        </tc:selectBooleanCheckbox>
-        <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowJunctions}" value="#{demo.showJunctions}">
-          <f:ajax render="panel"/>
-        </tc:selectBooleanCheckbox>
-        <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRootJunction}" value="#{demo.showRootJunction}">
-          <f:ajax render="panel"/>
-        </tc:selectBooleanCheckbox>
-        <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}" value="#{demo.showRoot}">
-          <f:ajax render="panel"/>
-        </tc:selectBooleanCheckbox>
-      </tc:panel>
-
-    </tc:flexLayout>
-
-  </tc:panel>
-
+  <ui:param name="title" value="#{overviewBundle.tree} &lt;tc:tree>"/>
+  <p>A classic tree can created with the <code class="language-markup">&lt;tc:tree/></code> tag.
+    Tobage knows two more presentations of a tree. As a <tc:link label="menu" link="03-menu/tree-menu.xhtml"/>
+    and as a <tc:link label="list" link="04-listbox/tree-listbox.xhtml"/>.</p>
+  <p>Tag Library Documentation:
+    <tc:link label="&lt;tc:tree/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/tree.html"/>
+    |
+    <tc:link label="&lt;tc:treeNode/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/treeNode.html"/>
+    |
+    <tc:link label="&lt;tc:treeIndent/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/treeIndent.html"/>
+    |
+    <tc:link label="&lt;tc:treeLabel/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/treeLabel.html"/>
+    |
+    <tc:link label="&lt;tc:treeIcon/>" image="image/feather-leaf.png"
+             link="#{overviewBundle.tagDocUrl}/treeIcon.html"/></p>
+
+  <tc:section label="Basics">
+    <p>The tree tag has two attributes, <code>value</code> and <code>var</code>. The attribute <code>value</code>
+      contain a DefaultMutableTreeNode, which represent the tree.
+      The <code>var</code> attribute is the name of the variable, to get specific content.</p>
+    <pre><code class="language-markup">&lt;tc:tree value="#{treeController.sample}" var="node"></code></pre>
+    <p>In every tree, a <code class="language-markup">&lt;tc:treeNode/></code> has to be added.
+      A <code class="language-markup">&lt;tc:treeNode/></code> can contain several tags to describe the node.
+      In this example, two tags are used.<br/>
+      The <code class="language-markup">&lt;tc:treeIndent/></code> tag, which add an indent besides a node
+      and <code class="language-markup">&lt;tc:treeLabel value="\#{node.userObject.name}"/></code>, which contain the
+      String for the label. Notice that 'node' is the value of the <code>var</code> attribute from the tree tag.</p>
+    <tc:tree value="#{treeController.sample}" var="node">
+      <tc:treeNode>
+        <tc:treeIndent/>
+        <tc:treeLabel value="#{node.userObject.name}"/>
+      </tc:treeNode>
+    </tc:tree>
+  </tc:section>
+
+  <tc:section label="Icon">
+    <p>An icon can be added to a node with
+      <code class="language-markup">&lt;tc:treeIcon value="image/feather.png"/></code>.
+      In this case, the targeted image is 'feather.png'. It is displayed for closed nodes.
+      For opened nodes, an image with a '-open'-suffix is used, here it's 'feather-open.png'.
+      For the leafs of the tree, an image with a '-leaf'-suffix is used. Therefor 'feather-leaf.png' is the displayed
+      image.</p>
+    <tc:tree value="#{treeController.sample}" var="node">
+      <tc:treeNode>
+        <tc:treeIndent/>
+        <tc:treeIcon value="image/feather.png"/>
+        <tc:treeLabel value="#{node.userObject.name}"/>
+      </tc:treeNode>
+    </tc:tree>
+  </tc:section>
+
+  <tc:section label="Additional Attributes">
+    <p>In this example, some boolean attributes can be activated and deactivated in the right boxes for
+      <code class="language-markup">&lt;tc:tree/></code> and
+      <code class="language-markup">&lt;tc:treeIndent/></code>.</p>
+    <tc:panel id="p1">
+      <tc:flexLayout columns="*;auto">
+        <tc:tree value="#{treeController.sample}" var="node" showRoot="#{treeController.treeShowRoot}"
+                 showRootJunction="#{treeController.treeShowRootJunction}">
+          <tc:treeNode>
+            <tc:treeIndent rendered="#{treeController.treeIndentRendered}"
+                           showJunctions="#{treeController.treeIndentShowJunction}"/>
+            <tc:treeLabel value="#{node.userObject.name}"/>
+          </tc:treeNode>
+        </tc:tree>
+        <tc:panel>
+          <tc:box label="&lt;tc:tree/>">
+            <tc:selectBooleanCheckbox label="showRoot" value="#{treeController.treeShowRoot}">
+              <f:ajax render="p1"/>
+            </tc:selectBooleanCheckbox>
+            <tc:selectBooleanCheckbox label="showRootJunction" value="#{treeController.treeShowRootJunction}">
+              <f:ajax render="p1"/>
+            </tc:selectBooleanCheckbox>
+          </tc:box>
+          <tc:box label="&lt;tc:treeIndent/>">
+            <tc:selectBooleanCheckbox label="rendered" value="#{treeController.treeIndentRendered}">
+              <f:ajax render="p1"/>
+            </tc:selectBooleanCheckbox>
+            <tc:selectBooleanCheckbox label="showJunction" value="#{treeController.treeIndentShowJunction}">
+              <f:ajax render="p1"/>
+            </tc:selectBooleanCheckbox>
+          </tc:box>
+        </tc:panel>
+      </tc:flexLayout>
+    </tc:panel>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-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/20-component/100-upload/upload.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/upload.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/upload.xhtml Wed Apr  6 09:01:43 2016
@@ -18,87 +18,66 @@
 -->
 
 <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"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns="http://www.w3.org/1999/xhtml">
-  <ui:param name="title" value="File Upload"/>
-  <tc:panel id="panel">
-
-    <tc:section label="Basics">
-
-      <p>
-        The first example loads up an arbitrary file.
-      </p>
-
-      <tc:file label="Upload file:" value="#{upload.file1}" tip="without extra validation" id="file1"/>
-
-      <p>
-        The second example contains a <code>&lt;tc:validateFileItem></code>
-        tag with restrict the content type.
-      </p>
-
-      <tc:file label="Upload image:" value="#{upload.file2}" id="file2"
-               tip="with a validator for file items - types: gif, jpg, png">
-        <tc:validateFileItem contentType="image/*"/>
-      </tc:file>
-
-      <tc:flowLayout>
-        <tc:style textAlign="right"/>
-        <tc:button label="Submit" defaultCommand="true" action="#{upload.upload}"/>
-      </tc:flowLayout>
-    </tc:section>
-
-    <tc:section label="Tips">
-
-      <p>
-        To load up files to the server for JSF 2.0 and 2.1 you will need to
-        add an multipart-config entry to the FacesServlet in the <code>web.xml</code> file.
-        Since JSF 2.2 this is not required.
-      </p>
-
-      <p>
-        Here you can configure some more general information.
-      </p>
-
-    <pre><code class="language-markup">      &lt;multipart-config>
-      &lt;location>/tmp&lt;/location>
-      &lt;max-file-size>20848820&lt;/max-file-size>
-      &lt;max-request-size>418018841&lt;/max-request-size>
-      &lt;file-size-threshold>1048576&lt;/file-size-threshold>
-      &lt;/multipart-config></code></pre>
-
-      <p>
-        If using Servlet API 3.1 you may call <code>part.getSubmittedFileName()</code>,
-        for 3.0 you may use the Utility
-        <code>org.apache.myfaces.tobago.internal.util.PartUtils.getSubmittedFileName(part)</code>
-        to access to filename of the upload.
-      </p>
-    </tc:section>
-
-    <tc:section label="AJAX">
+                xmlns:f="http://java.sun.com/jsf/core">
+  <ui:param name="title" value="#{overviewBundle.upload} &lt;tc:file"/>
+  <p>The <code class="language-markup">&lt;tc:file/></code> create a textfield with a choose directory button on the
+    right.</p>
+  <p>To load up files to the server for JSF 2.0 and 2.1 you will need to add a multipart-config entry to the
+    FacesServlet in the <code>web.xml</code> file. Since JSF 2.2 this is not required.</p>
+  <p>Here you can configure some more general information.</p>
+    <pre><code class="language-markup">&lt;multipart-config>
+  &lt;location>/tmp&lt;/location>
+  &lt;max-file-size>20848820&lt;/max-file-size>
+  &lt;max-request-size>418018841&lt;/max-request-size>
+  &lt;file-size-threshold>1048576&lt;/file-size-threshold>
+&lt;/multipart-config></code></pre>
+  <p>If using Servlet API 3.1 you may call <code>part.getSubmittedFileName()</code>, for 3.0 you may use the Utility
+    <code>org.apache.myfaces.tobago.internal.util.PartUtils.getSubmittedFileName(part)</code>
+    to access to filename of the upload.</p>
+  <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+           link="#{overviewBundle.tagDocUrl}/file.html"/>
+
+  <tc:section id="s1" label="Basics">
+    <pre><code class="language-markup">&lt;tc:file label="Upload" value="\#{uploadController.file1}"/></code></pre>
+    <tc:file label="Upload" value="#{uploadController.fileBasic}"/>
+    <tc:file label="Read Only" readonly="true" value="#{uploadController.fileBasic}"/>
+    <tc:file label="Disabled" disabled="true" value="#{uploadController.fileBasic}"/>
+    <tc:button label="Submit" action="#{uploadController.uploadBasic}"/>
+  </tc:section>
+
+  <tc:section id="s2" label="Content type">
+    <p>You can filter files using the <code class="language-markup">&lt;tc:validateFileItem/></code> tag within
+      the <code class="language-markup">&lt;tc:file/></code>.</p>
+    <tc:file label="Upload image" value="#{uploadController.fileContentType}">
+      <tc:validateFileItem contentType="image/*,application/pdf"/>
+    </tc:file>
+    <tc:button label="Submit" action="#{uploadController.uploadContentType}"/>
+  </tc:section>
+
+  <tc:section id="s3" label="Ajax">
+    <p>Ajax can be activated by adding <code class="language-markup">&lt;f:ajax/></code>
+      to the <code class="language-markup">&lt;tc:file/></code> tag.</p>
+    <p>The Ajax feature of file upload currently only works with JSF 2.2 (not with JSF 2.0 or 2.1)!</p>
+
+    <tc:file label="Ajax" value="#{uploadController.fileAjax}">
+      <f:ajax listener="#{uploadController.uploadAjax}" render="s3"/>
+    </tc:file>
 
-      The AJAX feature of file upload currently only works with JSF 2.2 (not with JSF 2.0 or 2.1)!
-
-      <tc:file label="Instant" value="#{upload.file3}" tip="with AJAX" id="file3">
-        <f:ajax listener="#{upload.uploadAjax}" render="panel"/>
-      </tc:file>
-
-    </tc:section>
-
-    <tc:section label="List of Uploaded Files">
-      <tc:sheet id="sheet" var="entry" value="#{upload.list}" columns="*;*;*">
+    <tc:section id="s4" label="Uploaded Files">
+      <tc:sheet value="#{uploadController.uploadItems}" var="item" columns="*;*;*">
         <tc:column label="Name">
-          <tc:out value="#{entry.name}"/>
+          <tc:out value="#{item.name}"/>
         </tc:column>
         <tc:column label="Type">
-          <tc:out value="#{entry.type}"/>
+          <tc:out value="#{item.type}"/>
         </tc:column>
         <tc:column label="Size">
-          <tc:out value="#{entry.size}"/>
+          <tc:out value="#{item.size}"/>
         </tc:column>
       </tc:sheet>
     </tc:section>
-
-  </tc:panel>
+  </tc:section>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml Wed Apr  6 09:01:43 2016
@@ -48,7 +48,7 @@
           <tc:flexLayout rows="auto;*">
 
             <tc:panel id="messages">
-              <tc:messages orderBy="severity"/>
+              <tc:messages orderBy="severity" rendered="#{!navigationTree.outputPage and !navigationTree.messagesPage}"/>
             </tc:panel>
 
             <tc:box label="#{title}" id="content">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css Wed Apr  6 09:01:43 2016
@@ -23,6 +23,10 @@
   border: 1px solid #cccccc;
 }
 
+.blue {
+  background-color: #2aabff;
+}
+
 /* todo: should be switchable
 .comment {
   display: none;

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=1737949&r1=1737948&r2=1737949&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 Wed Apr  6 09:01:43 2016
@@ -45,16 +45,17 @@
   <entry key="output">Output Fields</entry>
   <entry key="out">Output</entry>
   <entry key="label">Label</entry>
+  <entry key="messages">Messages</entry>
   <entry key="image">Image</entry>
   <entry key="progress">Progress Bar</entry>
   <entry key="object">External Object (iframe)</entry>
-  <entry key="select">Select</entry>
-  <entry key="selectBooleanCheckbox">Boolean Checkbox</entry>
+  <entry key="select">Select Controls</entry>
+  <entry key="selectBooleanCheckbox">Checkbox</entry>
   <entry key="selectOneChoice">Dropdown Box</entry>
   <entry key="selectOneRadio">Radio Button</entry>
-  <entry key="selectOneListbox">Single Selection List</entry>
+  <entry key="selectOneListbox">Singleselection List</entry>
   <entry key="selectManyCheckbox">Checkbox Group</entry>
-  <entry key="selectManyListbox">Multi Selection List</entry>
+  <entry key="selectManyListbox">Multiselection List</entry>
   <entry key="selectManyShuttle">Shuttle List</entry>
   <entry key="default_command">Default Command</entry>
   <entry key="button_link">Link</entry>
@@ -62,18 +63,24 @@
   <entry key="menu">Menubar</entry>
   <entry key="container">Container</entry>
   <entry key="box">Content Box</entry>
+  <entry key="panel">Panel</entry>
   <entry key="separator">Separator</entry>
   <entry key="section">Section</entry>
   <entry key="header_footer">Header / Footer</entry>
   <entry key="popup">Popup Dialog</entry>
-  <entry key="tab">Tab Control</entry>
+  <entry key="tab">Tab Group</entry>
   <entry key="tab_client">Client sided</entry>
   <entry key="tab_ajax">Ajax</entry>
   <entry key="tab_server">Server sided</entry>
+  <entry key="tree">Tree Control</entry>
+  <entry key="tree_command_types">Command</entry>
+  <entry key="tree_select">Select</entry>
+  <entry key="tree_menu">Tree Menu</entry>
+  <entry key="tree_listbox">Tree List</entry>
+  <entry key="upload">File Upload</entry>
 
 
   <entry key="sheet">Sheet Control</entry>
-  <entry key="tree">Tree Control</entry>
   <entry key="tree-editor">Editor</entry>
   <entry key="tree-command-types">Command Types</entry>
   <entry key="validation">Validation</entry>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.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_de.properties.xml?rev=1737949&r1=1737948&r2=1737949&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.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_de.properties.xml Wed Apr  6 09:01:43 2016
@@ -32,10 +32,6 @@
 
 <!--  navigate -->
   <entry key="overview">Übersicht</entry>
-  <entry key="intro">Einführung</entry>
-  <entry key="sheet">Tabellen</entry>
-  <entry key="tree">Bäume</entry>
-  <entry key="tab">Reiter / Tab</entry>
   <entry key="toolbar">Toolbar</entry>
   <entry key="validation">Validierung</entry>
   <entry key="form">Formulare</entry>



Mime
View raw message