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/07/08 13:26:07 UTC
svn commit: r1751904 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main:
java/org/apache/myfaces/tobago/example/demo/ webapp/content/20-component/
webapp/content/20-component/040-command/25-commands/
webapp/content/20-component/050-...
Author: lofwyr
Date: Fri Jul 8 13:26:07 2016
New Revision: 1751904
URL: http://svn.apache.org/viewvc?rev=1751904&view=rev
Log:
TOBAGO 1544: Demo
[developed by hnoeth]
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-commands/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-commands/commands.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/concept.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java Fri Jul 8 13:26:07 2016
@@ -28,8 +28,13 @@ import java.io.Serializable;
@Named
public class PopupController implements Serializable {
+ private boolean popup1Collapsed = true;
+ private String popup1Text;
+ private String popup2Text;
private String text;
+ private boolean popup2 = true;
+
public String getText() {
return text;
}
@@ -37,4 +42,36 @@ public class PopupController implements
public void setText(String text) {
this.text = text;
}
+
+ public boolean isPopup1Collapsed() {
+ return popup1Collapsed;
+ }
+
+ public void setPopup1Collapsed(boolean popup1Collapsed) {
+ this.popup1Collapsed = popup1Collapsed;
+ }
+
+ public void openPopup1() {
+ popup1Collapsed = false;
+ }
+
+ public void closePopup1() {
+ popup1Collapsed = true;
+ }
+
+ public String getPopup1Text() {
+ return popup1Text;
+ }
+
+ public void setPopup1Text(String popup1Text) {
+ this.popup1Text = popup1Text;
+ }
+
+ public String getPopup2Text() {
+ return popup2Text;
+ }
+
+ public void setPopup2Text(String popup2Text) {
+ this.popup2Text = popup2Text;
+ }
}
Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-commands/commands.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-commands/commands.xhtml?rev=1751904&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-commands/commands.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-commands/commands.xhtml Fri Jul 8 13:26:07 2016
@@ -0,0 +1,70 @@
+<?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">
+ <ui:param name="title" value="#{overviewBundle.commands} <tc:buttons>"/>
+ <p>Links/Commands can be grouped with the <code class="language-markup"><tc:commands/></code> tag.
+ Just add some <code class="language-markup"><tc:link/></code> or
+ <code class="language-markup"><tc:commands/></code> tags.</p>
+ <p>Currently there is no difference between <code class="language-markup"><tc:link/></code> and
+ <code class="language-markup"><tc:commands/></code>.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/buttons.html"/>
+ <p>Tag Library Documentation:
+ <tc:link label="<tc:commands/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/commands.html"/>
+ |
+ <tc:link label="<tc:link/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/link.html"/></p>
+
+ <tc:section label="Basics">
+ <p>A simple example with three links.</p>
+ <pre><code class="language-markup"><tc:commands>
+ <tc:link label="Left"/>
+ <tc:link label="Center"/>
+ <tc:link label="Right"/>
+</tc:commands></code></pre>
+ <tc:commands>
+ <tc:link label="Left"/>
+ <tc:link label="Center"/>
+ <tc:link label="Right"/>
+ </tc:commands>
+ </tc:section>
+
+ <tc:section label="Dropdown Button">
+ <p>A dropdown menu can also be created.</p>
+ <pre><code class="language-markup"><tc:commands>
+ <tc:link label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ ...
+ </tc:link>
+ <tc:link label="Center"/>
+ <tc:link label="Right"/>
+</tc:commands></code></pre>
+ <tc:commands>
+ <tc:link label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ <tc:link label="Action 2"/>
+ <tc:link label="Action 3"/>
+ </tc:link>
+ <tc:link label="Center"/>
+ <tc:link label="Right"/>
+ </tc:commands>
+ </tc:section>
+</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml Fri Jul 8 13:26:07 2016
@@ -34,17 +34,13 @@
</tc:section>
<tc:section label="Collapse/Expand">
- <p>A contentbox can be collapsed via <code>collapsed</code> attribute.
- Possible values are 'visible' (content is shown), 'hidden' (content is hidden) and
- 'absent' (content is not rendered).
- Also have a look at <tc:link label="#{overviewBundle.collapsible}"
- link="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/>.</p>
- <pre><code class="language-markup"><tc:box label="Collapsed" collapsed="visible">Content</tc:box></code></pre>
- <tc:segmentLayout medium="4;4;4">
- <tc:box label="Visible" collapsed="visible">Content</tc:box>
- <tc:box label="Hidden" collapsed="hidden">Content</tc:box>
- <tc:box label="Absent" collapsed="absent">Content</tc:box>
- </tc:segmentLayout>
+ <p>A contentbox can be collapsed or expanded via the <code>collapsed</code> attribute.
+ To define the behavior of hidden content, use the <code>collapseMode</code> attribute.
+ For more information have a look at the
+ <tc:link label="#{overviewBundle.collapsible_box}"
+ link="/faces/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml"/> page
+ in the <tc:link label="#{overviewBundle.collapsible}"
+ link="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/> section.</p>
</tc:section>
<tc:section label="Bar">
Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml?rev=1751904&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml Fri Jul 8 13:26:07 2016
@@ -0,0 +1,70 @@
+<?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.bar} <tc:bar>"/>
+ <p><code class="language-markup"><tc:bar/></code> is a container which display elements in one single line
+ as long as there is enough space.
+ If space is too narrow, the bar collapse. Hidden items are accessible by clicking on the bar-icon.
+ This makes <code class="language-markup"><tc:bar/></code> great for navigation menus.</p>
+ <p>Additionally the facet <code class="language-markup"><f:facet name="brand"/></code> can be added.
+ It show the 'brand', a logo a text or both on the left site of the bar.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/bar.html"/>
+
+ <tc:section label="Example">
+ <p>This example show a Bar with a 'brand' facet and several components.
+ Buttons and links don't have any functionality.</p>
+ <tc:bar>
+ <f:facet name="brand">
+ <tc:image value="image/feather-leaf.png"/>
+ <tc:label value="Tobago"/>
+ </f:facet>
+ <tc:commands>
+ <tc:link label="Home"/>
+ <tc:link label="Configuration" omit="true">
+ <tc:link label="Theme" omit="true">
+ <tc:link label="Standard Theme"/>
+ <tc:link label="Scarborough"/>
+ <tc:link label="Richmond"/>
+ <tc:link label="Charlotteville"/>
+ <tc:link label="Speyside"/>
+ </tc:link>
+ <tc:link image="fa-language" label="Language" omit="true">
+ <tc:link label="English"/>
+ <tc:link label="German"/>
+ <tc:link label="Japanese"/>
+ <tc:link label="Russian"/>
+ <tc:link label="Spanish"/>
+ </tc:link>
+ <tc:link label="Reset"/>
+ </tc:link>
+ <tc:link image="fa-info" label="Help"/>
+ </tc:commands>
+ <tc:flowLayout>
+ <tc:style textAlign="right"/>
+ <tc:in placeholder="Search"/>
+ <tc:button label="Go"/>
+ </tc:flowLayout>
+ </tc:bar>
+ </tc:section>
+</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml Fri Jul 8 13:26:07 2016
@@ -24,70 +24,112 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="#{overviewBundle.popup} <tc:popup>"/>
<p>A popup dialog is created with <code class="language-markup"><tc:popup/></code>.
- It can be filled with components like other container.</p>
+ It can be filled with other components.</p>
+ <p>The popup dialog is based on the
+ <tc:link label="#{overviewBundle.collapsible}"
+ link="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/> concept.</p>
<p>Tag Library Documentation:
<tc:link label="<tc:popup/>" image="image/feather-leaf.png"
link="#{overviewBundle.tagDocUrl}/popup.html"/>
|
- <tc:link label="<f:facet/>"
- link="https://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/f/facet.html"/>
- |
- <tc:link label="<tc:popupReference/>" image="image/feather-leaf.png"
- link="#{overviewBundle.tagDocUrl}/popupReference.html"/>
- |
- <tc:link label="<tc:attribute/>" image="image/feather-leaf.png"
- link="#{overviewBundle.tagDocUrl}/attribute.html"/></p>
+ <tc:link label="<tc:operation/>" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/operation.html"/></p>
- <tc:section label="Basics">
- <p>There are basically two ways to open a popup dialog.
- First, put the <code class="language-markup"><tc:popup/></code> tag within an opening component,
- like a button or a link. The second one is to use the
- <code class="language-markup"><tc:popupReference/></code> tag.</p>
- <tc:section label="Popup within button">
- <p>In this example, the popup should be within a button. To make this happen, the facet-tag is also needed.
- In detail:<br/>
- The <code class="language-markup"><tc:button label="Open Popup 1"></code> contain
- <code class="language-markup"><f:facet name="popup"></code>, which contain
- <code class="language-markup"><tc:popup id="popup1"></code>.</p>
- <tc:button id="b1" label="Open Popup 1">
- <f:facet name="popup">
- <tc:popup id="popup1">
- <p>This is a popup dialog.</p>
- </tc:popup>
- </f:facet>
- </tc:button>
- </tc:section>
- <tc:section label="Reference to popup">
- <p>The link tag contain a <code class="language-markup"><tc:popupReference for="popup1"/></code>.
- The value of the <code>for</code> attribute has to be the ID of a popup dialog.</p>
- <tc:link id="l1" label="Open Popup 1">
- <tc:popupReference for="popup1"/>
- </tc:link>
- </tc:section>
- </tc:section>
+ <tc:section label="Simple Popup">
+ <p>A simple popup realised with a controller. The open button calls the <code>openPopup1</code> action.</p>
+ <tc:button label="Open" action="#{popupController.openPopup1}"/>
+ <tc:out label="Text from Popup" value="#{popupController.popup1Text}"/>
+ <tc:popup id="popup1" collapsed="#{popupController.popup1Collapsed}">
+ <tc:box label="Simple Popup">
+ <p>This is a popup dialog with an inputfield.</p>
+
+ <p><b>Submit</b><br/>
+ <code class="language-markup"><tc:button label="Submit"/></code>
+ <br/>The 'Submit'-button submit the value in the inputfield.</p>
- <tc:section label="Close Popup">
- <p>A popup can be closed with or without submitting the entered values.</p>
- <p>To create a 'OK'-button, insert
- <code class="language-markup"><tc:attribute name="popupClose" value="afterSubmit"/></code>
- into the button tag.</p>
- <p>To create a 'Cancel'-button, insert
- <code class="language-markup"><tc:attribute name="popupClose" value="immediate"/></code>
- into the button tag.</p>
- <tc:popup id="popup2">
- <tc:box label="Popup 2">
- <tc:in id="i1" label="Textfield" value="#{popupController.text}"/>
- <tc:button label="OK">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
+ <p><b>Submit & Close</b><br/>
+ <code class="language-markup"><tc:button label="Submit & Close" action="\#{popupController.closePopup1}"/></code>
+ <br/>The 'Submit & Close'-button submit the value in the inputfield and
+ call the close-method in the controller.</p>
+
+ <p><b>Cancel</b><br/>
+ <code class="language-markup"><tc:button label="Cancel" immediate="true"
+ action="\#{popupController.closePopup1}"/></code>
+ <br/>The 'Cancel'-button calls the close-method in the controller and
+ has <code>immediate="true"</code>, so no submit is executed.</p>
+
+ <tc:in label="Required Field" required="true" value="#{popupController.popup1Text}"/>
+ <tc:buttons>
+ <tc:button label="Submit"/>
+ <tc:button label="Submit & Close" action="#{popupController.closePopup1}"/>
+ <tc:button label="Cancel" immediate="true" action="#{popupController.closePopup1}"/>
+ </tc:buttons>
</tc:box>
</tc:popup>
- <tc:button id="b2" label="Open Popup 2">
- <tc:popupReference for="popup2"/>
+ </tc:section>
+
+ <tc:section label="Client Sided Popup">
+ <p>To create a client sided popup you have to know about <code>collapsedMode</code>.
+ The mode indicated whether a collapsed popup should be rendered.
+ If <code>collapsedMode="absent"</code>, which is default, a hidden popup dialog will no be rendered.
+ If <code>collapsedMode="hidden"</code>, a hidden popup dialog will be rendered ob the page, but hidden by CSS.</p>
+ <p>Be careful with validations. For example, hidden required inputfields will be validated after submit.</p>
+ <p>So to create the popup, use
+ <code class="language-markup"><tc:popup collapsed="true" collapsedMode="hidden"></code>.
+ This is because the popup should not be opened after reloading the page
+ and the hidden popup must be already rendered, so the client don't have to send any requests to the server.</p>
+ <p>Client sided opening and closing can be done with the
+ <code class="language-markup"><tc:operation name="show|hide" for="[ID]"/></code> tag.
+ The attribute <code>name</code> must be set and can have the value 'show' and 'hide'
+ which is to show and hide the popup, obviously.
+ The other mandatory attribute is the <code>for</code> attribute.
+ It contain the ID of the popup on which the transition should be executed.</p>
+
+ <tc:button label="Open" omit="true">
+ <tc:operation name="show" for="clientPopup"/>
</tc:button>
- <tc:out id="o2" label="Text from Popup" value="#{popupController.text}"/>
+ <tc:out id="out" label="Text from Popup" value="#{popupController.popup2Text}"/>
+
+ <tc:popup id="clientPopup" collapsed="true" collapsedMode="hidden">
+ <tc:box label="Client Sided Popup">
+ <tc:panel id="clientPopupMessages">
+ <tc:messages/>
+ </tc:panel>
+ <p>This is a popup dialog with an inputfield.</p>
+
+ <b>Submit</b>
+ <pre><code class="language-markup"><tc:button label="Submit">
+ <f:ajax execute="in" render="in :::out clientPopupMessages"/>
+</tc:button></code></pre>
+ <p>The 'Submit'-button send an ajax request to submit the value in the inputfield.
+ </p>
+
+ <b>Submit & Close</b>
+ <pre><code class="language-markup"><tc:button label="Submit & Close">
+ <tc:operation name="hide" for="clientPopup"/>
+</tc:button></code></pre>
+ <p>The 'Submit & Close'-button execute a submit and run the operation 'hide' to close the popup.</p>
+
+ <b>Cancel</b>
+ <pre><code class="language-markup"><tc:button label="Cancel" omit="true">
+ <tc:operation name="hide" for="clientPopup"/>
+</tc:button></code></pre>
+ <p>The 'Cancel'-button execute a 'hide'-operation to close the popup.
+ Also the attribute <code>omit="true"</code> is set to prevent submit.</p>
+
+ <tc:in id="in" label="Required Field" required="true" value="#{popupController.popup2Text}"/>
+ <tc:buttons>
+ <tc:button label="Submit">
+ <f:ajax execute="in" render="in :::out clientPopupMessages"/>
+ </tc:button>
+ <tc:button label="Submit & Close">
+ <tc:operation name="hide" for="clientPopup"/>
+ </tc:button>
+ <tc:button label="Cancel" omit="true">
+ <tc:operation name="hide" for="clientPopup"/>
+ </tc:button>
+ </tc:buttons>
+ </tc:box>
+ </tc:popup>
</tc:section>
</ui:composition>
Modified: myfaces/tobago/trunk/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/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/tab-client.xhtml Fri Jul 8 13:26:07 2016
@@ -50,7 +50,6 @@
</tc:section>
<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">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml Fri Jul 8 13:26:07 2016
@@ -31,9 +31,9 @@
<tc:out value="For simple column headers, use the lable attribute of the tc:column.
For more complex headers, which can span over columns and/or rows use a <f:facet name='header'> in the sheet." />
- <tc:sheet value="#{demo.solarList}" id="sheet"
+ <tc:sheet value="#{sheetController.solarList}" id="sheet"
columns="3*;2*;30px;2*;2*;2*;2*;2*;2*" var="luminary"
- state="#{demo.sheetState}"
+ state="#{sheetController.sheetState}"
showRowRange="left"
showPageRange="right"
showDirectLinks="center">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml Fri Jul 8 13:26:07 2016
@@ -18,11 +18,9 @@
-->
<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.component}"/>
-
-TODO
-
+ <p>The different components of Tobago are shown in this section.
+ There are some classic components like inputfields, outputfields or radiobuttons
+ and some more advanced like a popup dialog, a tabgroup or a sheet.</p>
</ui:composition>
Modified: myfaces/tobago/trunk/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/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/flow-layout.xhtml Fri Jul 8 13:26:07 2016
@@ -42,7 +42,7 @@
</tc:section>
<tc:section label="Align: left (default)">
- TODO
+ <pre><code class="language-markup"><tc:flowLayout textAlign="left"></code></pre>
<tc:flowLayout textAlign="left">
<tc:button label="Button"/>
<tc:button label="Button"/>
@@ -55,7 +55,7 @@
</tc:section>
<tc:section label="Align: right">
- TODO
+ <pre><code class="language-markup"><tc:flowLayout textAlign="right"></code></pre>
<tc:flowLayout textAlign="right">
<tc:button label="Button"/>
<tc:button label="Button"/>
@@ -68,7 +68,7 @@
</tc:section>
<tc:section label="Align: center">
- TODO
+ <pre><code class="language-markup"><tc:flowLayout textAlign="center"></code></pre>
<tc:flowLayout textAlign="center">
<tc:button label="Button"/>
<tc:button label="Button"/>
@@ -81,7 +81,7 @@
</tc:section>
<tc:section label="Align: justify">
- TODO
+ <pre><code class="language-markup"><tc:flowLayout textAlign="justify"></code></pre>
<tc:flowLayout textAlign="justify">
<tc:button label="Button"/>
<tc:button label="Button"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/concept.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/concept.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/concept.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/concept.xhtml Fri Jul 8 13:26:07 2016
@@ -18,11 +18,8 @@
-->
<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="TODO"/>
-
-TODO
-
+ <ui:param name="title" value="#{overviewBundle.concept}"/>
+ <p>In this section the different concepts of Tobago are described
+ like the concept of validation, forms, layouts or access keys.</p>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml Fri Jul 8 13:26:07 2016
@@ -19,125 +19,111 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:param name="title" value="#{overviewBundle.toolBar}"/>
- <tc:panel id="pageToolbar">
- <f:facet name="layout">
- <tc:gridLayout rows="65px;auto;80px;*;*" id="pageToolbarLayout"/>
- </f:facet>
-
- <tc:out escape="false" value="#{overviewBundle.toolbar_text1}"/>
-
- <tc:box label="#{overviewBundle.toolbar_sampleTitle}" id="boxToolbar">
+ <ui:param name="title" value="#{overviewBundle.toolBar} <tc:toolBar>"/>
+ <p><code class="language-markup"><tc:toolBar/></code> and
+ <code class="language-markup"><tc:toolBarCommand/></code> are deprecated.
+ To replace a toolbar in the header of a component use <tc:link label="#{overviewBundle.buttons}"
+ link="/faces/content/20-component/040-command/20-buttons/buttons.xhtml"/> or
+ <tc:link label="#{overviewBundle.commands}"
+ link="/faces/content/20-component/040-command/25-commands/commands.xhtml"/> instead.
+ To replace a plain toolbar, use
+ <tc:link label="#{overviewBundle.bar}"
+ link="/faces/content/20-component/050-container/60-bar/bar.xhtml"/>.</p>
+
+ <tc:section label="Content Box Header">
+ <p>The first box show the deprecated version of a toolbar.
+ The second and the third one are solutions with #{overviewBundle.buttons} and #{overviewBundle.commands}.</p>
+
+ <p>Instead of <code class="language-markup"><f:facet name="toolBar"/></code>
+ use <code class="language-markup"><f:facet name="bar"/></code>.</p>
+ <p>Instead of <code class="language-markup"><tc:toolBar/></code>
+ use <code class="language-markup"><tc:buttons/></code>
+ or <code class="language-markup"><tc:commands/></code>.</p>
+ <p>Instead of <code class="language-markup"><tc:toolBarCommand/></code>
+ use <code class="language-markup"><tc:button/></code>
+ or <code class="language-markup"><tc:link/></code>.</p>
+ <tc:box label="Deprecated">
<f:facet name="toolBar">
<tc:toolBar>
- <tc:buttons>
- <tc:button id="button" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_buttonAction}"/>
-
- <tc:toolBarCommand id="imageButton" action="#{overviewController.ping}"
- actionListener="#{overviewController.click}"
- tip="Bicycle"
- image="fa-bicycle"/>
-
- <tc:button id="popupButton" image="Bus"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_popupButtonAction}">
-
- <f:facet name="popup">
- <tc:popup id="popup" modal="true">
-
- <f:facet name="layout">
- <tc:gridLayout rows="auto" columns="auto"/>
- </f:facet>
-
- <tc:box label="Message">
- <f:facet name="layout">
- <tc:gridLayout rows="35px;auto" columns="auto"/>
- </f:facet>
-
- <tc:out value="#{overviewBundle.toolbar_popupText}">
- <tc:gridLayoutConstraint minimumWidth="200px"/>
- </tc:out>
-
- <tc:button id="popupCloseButton" label="#{overviewBundle.toolbar_closePopupAction}">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- </tc:box>
-
- </tc:popup>
- </f:facet>
- </tc:button>
-
- <tc:button id="DropDown"
- label="#{overviewBundle.toolbar_dropDownAction}"
- omit="true">
- <f:facet name="dropDownMenu">
- <tc:menu>
- <tc:menuCommand label="Alert 1" omit="true">
- <tc:dataAttribute name="alert-text" value="Test 1"/>
- </tc:menuCommand>
- <tc:menuCommand label="Alert 2" omit="true">
- <tc:dataAttribute name="alert-text" value="Test 2"/>
- </tc:menuCommand>
- <tc:menuCommand action="#{overviewController.ping}" id="dropdown3"
- actionListener="#{overviewController.click}" label="Action 3"/>
- </tc:menu>
- </f:facet>
- </tc:button>
- </tc:buttons>
+ <tc:toolBarCommand label="Text Button"/>
+ <tc:toolBarCommand label="Image Button" image="fa-cube"/>
</tc:toolBar>
</f:facet>
+ <p>Content</p>
+ </tc:box>
+ <tc:box label="#{overviewBundle.buttons}">
+ <f:facet name="bar">
+ <tc:buttons>
+ <tc:button label="Text Button"/>
+ <tc:button label="Image Button" image="fa-cube"/>
+ <tc:button label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ <tc:link label="Action 2"/>
+ <tc:link label="Action 3"/>
+ </tc:button>
+ </tc:buttons>
+ </f:facet>
+ <p>Content</p>
+ </tc:box>
+ <tc:box label="#{overviewBundle.commands}">
+ <f:facet name="bar">
+ <tc:commands>
+ <tc:link label="Text Link"/>
+ <tc:link label="Image Link" image="fa-cube"/>
+ <tc:link label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ <tc:link label="Action 2"/>
+ <tc:link label="Action 3"/>
+ </tc:link>
+ </tc:commands>
+ </f:facet>
+ <p>Content</p>
+ </tc:box>
+ </tc:section>
- <tc:toolBar orientation="left">
- <tc:gridLayoutConstraint columnSpan="3"/>
- <tc:toolBarCommand id="button2" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_buttonAction}"/>
-
- <tc:toolBarCommand id="imageButton2" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="Hallo"
- image="image/toolbar_example_button.png"/>
-
-
- <tc:toolBarCommand id="popupButton2"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_popupButtonAction}">
- <tc:popupReference for=":page:popup"/>
- </tc:toolBarCommand>
-
- <tc:toolBarCommand id="DropDown2" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_dropDownAction}">
- <f:facet name="dropDownMenu">
- <tc:menu>
- <tc:menuCommand label="Alert 1" omit="true">
- <tc:dataAttribute name="alert-text" value="Test 1"/>
- </tc:menuCommand>
- <tc:menuCommand label="Alert 2" omit="true">
- <tc:dataAttribute name="alert-text" value="Test 2"/>
- </tc:menuCommand>
- <tc:menuCommand id="dropdown3_2" actionListener="#{overviewController.click}" label="Action 3"/>
- </tc:menu>
- </f:facet>
- </tc:toolBarCommand>
-
+ <tc:section label="Plain toolbar">
+ <p>For a plain toolbar use the <code class="language-markup"><tc:bar/></code> tag.</p>
+ <tc:section label="Deprecated">
+ <pre><code class="language-markup"><tc:toolBar>
+ <tc:toolBarCommand label="Text Button"/>
+ <tc:toolBarCommand label="Image Button" image="fa-cube"/>
+ <tc:in placeholder="Search"/>
+</tc:toolBar></code></pre>
+ <tc:toolBar>
+ <tc:toolBarCommand label="Text Button"/>
+ <tc:toolBarCommand label="Image Button" image="fa-cube"/>
+ <tc:in placeholder="Search"/>
</tc:toolBar>
+ </tc:section>
- <tc:in value="#{overviewController.lastAction}" readonly="true"
- label="#{overviewBundle.basic_lastActionLabel}"/>
-
- <tc:panel/>
- <tc:button label="updateView">
- <tc:gridLayoutConstraint columnSpan="2"/>
- </tc:button>
-
- </tc:box>
-
- </tc:panel>
+ <tc:section label="#{overviewBundle.bar}">
+ <pre><code class="language-markup"><tc:bar>
+ <tc:buttons>
+ <tc:button label="Text Button"/>
+ <tc:button label="Image Button" image="fa-cube"/>
+ </tc:buttons>
+ <tc:flowLayout textAlign="right">
+ <tc:button label="Dropdown" omit="true"> ... </tc:button>
+ <tc:in placeholder="Search"/>
+ </tc:flowLayout>
+</tc:bar></code></pre>
+ <tc:bar>
+ <tc:buttons>
+ <tc:button label="Text Button"/>
+ <tc:button label="Image Button" image="fa-cube"/>
+ </tc:buttons>
+ <tc:flowLayout textAlign="right">
+ <tc:button label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ <tc:link label="Action 2"/>
+ <tc:link label="Action 3"/>
+ </tc:button>
+ <tc:in placeholder="Search"/>
+ </tc:flowLayout>
+ </tc:bar>
+ </tc:section>
+ </tc:section>
</ui:composition>
Modified: myfaces/tobago/trunk/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/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Fri Jul 8 13:26:07 2016
@@ -64,6 +64,7 @@
<entry key="default_command">Default Command</entry>
<entry key="buttons">Button Group</entry>
<entry key="buttons_customizer">Button Group Customizer</entry>
+ <entry key="commands">Command Group</entry>
<entry key="menu">Menubar</entry>
<entry key="container">Container</entry>
<entry key="box">Content Box</entry>
@@ -120,6 +121,10 @@
<entry key="transition">Transition</entry>
<entry key="for_each">For Each</entry>
<entry key="collapsible">Collapsible</entry>
+ <entry key="collapsible_box">Content Box</entry>
+ <entry key="collapsible_popup">Popup</entry>
+ <entry key="collapsible_panel">Panel</entry>
+ <entry key="collapsible_section">Section</entry>
<entry key="accessKey">Access Keys</entry>
<entry key="dataAttribute">Data Attributes</entry>
<entry key="roles">Roles</entry>
@@ -276,11 +281,9 @@
<!-- toolbar -->
-<entry key="toolbar_popupButtonAction">Open popup</entry>
<entry key="toolbar_closePopupAction">Close popup window</entry>
<entry key="toolbar_popupText">To close this popup window click close button.</entry>
<entry key="toolbar_dropDownAction">DropDown</entry>
-<entry key="toolbar_buttonAction">Text Button</entry>
<entry key="toolbar_sampleTitle">Toolbar Example</entry>
<entry key="toolbar_text1">Toolbars can be used for context sensitive actions inside box controls.
<ul style="margin-top: 2px;">
Modified: myfaces/tobago/trunk/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/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml?rev=1751904&r1=1751903&r2=1751904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml Fri Jul 8 13:26:07 2016
@@ -133,7 +133,6 @@
<entry key="solarPagingSheet">Tabelle mit Seitenverwaltung</entry>
<!-- toolbar -->
- <entry key="toolbar_popupButtonAction">Popup öffnen</entry>
<entry key="toolbar_closePopupAction">Popup Fenster schließen</entry>
<entry key="toolbar_popupText">Zum schließen dieses Fensters den Button drücken.</entry>
<entry key="toolbar_dropDownAction">DropDown</entry>