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/06/01 11:23:28 UTC
svn commit: r1746435 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main:
java/org/apache/myfaces/tobago/example/demo/
webapp/content/20-component/010-input/50-input-group/
webapp/content/20-component/040-command/00-button+link/ weba...
Author: lofwyr
Date: Wed Jun 1 11:23:27 2016
New Revision: 1746435
URL: http://svn.apache.org/viewvc?rev=1746435&view=rev
Log:
TOBAGO-1544
[developed by hnoeth]
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/
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/content/35-deprecated/deprecated.xhtml
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Textarea.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-toolBar/toolBar.xhtml
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button+link/button+link.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java?rev=1746435&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java Wed Jun 1 11:23:27 2016
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package org.apache.myfaces.tobago.example.demo;
+
+import org.apache.myfaces.tobago.component.UICommand;
+
+import javax.enterprise.context.SessionScoped;
+import javax.faces.event.ActionEvent;
+import javax.inject.Named;
+import java.io.Serializable;
+
+@SessionScoped
+@Named
+public class GroupController implements Serializable {
+
+ private String chatlog;
+ private String newMessage;
+ private String sendTo;
+
+ public GroupController() {
+ chatlog = "Peter: Hi, how are you?";
+ newMessage = "I'm fine.";
+ sendTo = "SendTo:";
+ }
+
+ public String getChatlog() {
+ return chatlog;
+ }
+
+ public String getNewMessage() {
+ return newMessage;
+ }
+
+ public void setNewMessage(String newMessage) {
+ this.newMessage = newMessage;
+ }
+
+ public void sendChat() {
+ chatlog += "\nUser Two: " + newMessage;
+ newMessage = "";
+ }
+
+ public String getSendTo() {
+ return sendTo;
+ }
+
+ public void setSendTo(String sendTo) {
+ this.sendTo = sendTo;
+ }
+
+ public void sendToListener(ActionEvent actionEvent) {
+ if (actionEvent != null && actionEvent.getComponent() instanceof UICommand) {
+ UICommand command = (UICommand) actionEvent.getComponent();
+ sendTo = command.getLabel();
+ }
+ }
+}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml?rev=1746435&r1=1746434&r2=1746435&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml Wed Jun 1 11:23:27 2016
@@ -22,50 +22,113 @@
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.group} <tc:in>"/>
- <tc:section label="Input Groups">
-
- <tc:in id="nogroup" label="No group"/>
-
- <tc:in id="group" label="Group">
- <f:facet name="before">
- <i class="fa fa-money"/>
- </f:facet>
- <f:facet name="after">€</f:facet>
- </tc:in>
-
- <tc:in id="links" label="Links">
- <f:facet name="before">
- <tc:link image="fa-money"/>
- </f:facet>
- <f:facet name="after">
- Some text ...
- </f:facet>
- </tc:in>
+ <p>The <code class="language-markup"><tc:in/></code> tag may be extended with the facet tags
+ <code class="language-markup"><f:facet name="before"></code>
+ and <code class="language-markup"><f:facet name="after"></code>.
+ With these, you can add text and dropdown menus to an input field.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/in.html"/>
+
+ <tc:section label="Text">
+ <p>The following example show how to add a text-label inside an input field.</p>
+ <tc:section label="Before">
+ <pre><code class="language-markup"><tc:in>
+ <f:facet name="before">https://example.com/</f:facet>
+</tc:in></code></pre>
+ <tc:in id="itextbefore">
+ <f:facet name="before">https://example.com/</f:facet>
+ </tc:in>
+ </tc:section>
+ <tc:section label="After">
+ <pre><code class="language-markup"><tc:in label="Price">
+ <f:facet name="after">.00 €</f:facet>
+</tc:in></code></pre>
+ <tc:in id="ipriceafter" label="Price">
+ <f:facet name="after">.00 €</f:facet>
+ </tc:in>
+ </tc:section>
+ </tc:section>
- <tc:in id="singleselect" label="Single Select">
- <f:facet name="before">
- <tc:link omit="true">
- <tc:selectOneRadio value="#{clientConfigController.theme}">
- <f:facet name="change">
- <tc:command action="#{clientConfigController.submit}"/>
- </f:facet>
- <tc:selectItems value="#{clientConfigController.themeItems}"/>
- </tc:selectOneRadio>
- </tc:link>
- </f:facet>
+ <tc:section label="Commands">
+ <p>Press the 'Send'-Button to add your message to the chat.</p>
+ <pre><code class="language-markup"><tc:in value="\#{groupController.newMessage}">
+ ...
+ <f:facet name="after">
+ <tc:command label="Send" action="\#{groupController.sendChat}">
+ <f:ajax execute="inewmessage" render="tachatlog"/>
+ </tc:command>
+ </f:facet>
+</tc:in></code></pre>
+ <tc:textarea id="tachatlog" label="Chat" labelLayout="top" rows="5" value="#{groupController.chatlog}"/>
+ <tc:in id="inewmessage" value="#{groupController.newMessage}">
+ <f:facet name="before">User Two</f:facet>
<f:facet name="after">
- <tc:link omit="true">
- <tc:selectOneRadio value="#{clientConfigController.theme}">
- <f:facet name="change">
- <tc:command action="#{clientConfigController.submit}"/>
- </f:facet>
- <tc:selectItems value="#{clientConfigController.themeItems}"/>
- </tc:selectOneRadio>
- </tc:link>
+ <tc:command label="Send" action="#{groupController.sendChat}">
+ <f:ajax execute="inewmessage" render="tachatlog"/>
+ </tc:command>
</f:facet>
</tc:in>
-
</tc:section>
+ <tc:section label="Dropdown Menu">
+ <p>The following two examples show an input field with a dropdown element in front of.
+ Pressing the "SendTo"-Button will display a selectable list.
+ This list is different in the examples.
+ Notice that the <code>omit</code> attribute is set for <code class="language-markup"><tc:link/></code>.</p>
+
+ <tc:section label="Commands">
+ <pre><code class="language-markup"><tc:in placeholder="type a message">
+ <f:facet name="before">
+ <tc:link id="lsendtoc" label="\#{groupController.sendTo}" omit="true">
+ <tc:command label="SendTo: Peter" actionListener="\#{groupController.sendToListener}">
+ <f:ajax render="lsendtoc"/>
+ </tc:command>
+ ...
+ </tc:link>
+ </f:facet>
+</tc:in></code></pre>
+ <tc:in id="isendtoc" placeholder="type a message">
+ <f:facet name="before">
+ <tc:link id="lsendtoc" label="#{groupController.sendTo}" omit="true">
+ <tc:command label="SendTo: Peter" actionListener="#{groupController.sendToListener}">
+ <f:ajax render="lsendtoc"/>
+ </tc:command>
+ <tc:command label="SendTo: Bob" actionListener="#{groupController.sendToListener}">
+ <f:ajax render="lsendtoc"/>
+ </tc:command>
+ <tc:command label="SendTo: All" actionListener="#{groupController.sendToListener}">
+ <f:ajax render="lsendtoc"/>
+ </tc:command>
+ </tc:link>
+ </f:facet>
+ </tc:in>
+ </tc:section>
+
+ <tc:section label="Radio Buttons">
+ <pre><code class="language-markup"><tc:in placeholder="type a message">
+ <f:facet name="before">
+ <tc:link id="lsendtorb" label="#{groupController.sendTo}" omit="true">
+ <tc:selectOneRadio value="#{groupController.sendTo}">
+ <tc:selectItem itemValue="SendTo: Peter"/>
+ ...
+ <f:ajax render="lsendtorb"/>
+ </tc:selectOneRadio>
+ </tc:link>
+ </f:facet>
+</tc:in></code></pre>
+ <tc:in id="isendtorb" placeholder="type a message">
+ <f:facet name="before">
+ <tc:link id="lsendtorb" label="#{groupController.sendTo}" omit="true">
+ <tc:selectOneRadio value="#{groupController.sendTo}">
+ <tc:selectItem itemValue="SendTo: Peter"/>
+ <tc:selectItem itemValue="SendTo: Bob"/>
+ <tc:selectItem itemValue="SendTo: All"/>
+ <f:ajax render="lsendtorb"/>
+ </tc:selectOneRadio>
+ </tc:link>
+ </f:facet>
+ </tc:in>
+ </tc:section>
+ </tc:section>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button+link/button+link.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button%2Blink/button%2Blink.xhtml?rev=1746435&r1=1746434&r2=1746435&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button+link/button+link.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button+link/button+link.xhtml Wed Jun 1 11:23:27 2016
@@ -21,14 +21,16 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="#{overviewBundle.button_link} <tc:link> <tc:button>"/>
- <p>The classic link can be set with the <code class="language-markup"><tc:link/></code> tag.
- You can also set a link by <code class="language-markup"><tc:button/></code>.</p>
+ <p>A classic link can be set with the <code class="language-markup"><tc:link/></code> tag.
+ You can also set a link by <code class="language-markup"><tc:button/></code>.
+ The behavior of a link and a button is the same, it differs in the appearance.</p>
<p>Tag Library Documentation:
<tc:link label="<tc:link/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/link.html"/>
|
<tc:link label="<tc:button/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/button.html"/></p>
<tc:section label="Basics">
+ <p>The next two sections show how a link and a button is set.</p>
<tc:section label="<tc:link>">
<pre><code class="language-markup"><tc:link label="apache.org" link="https://www.apache.org/"/></code></pre>
<tc:link id="l1" label="apache.org" link="https://www.apache.org/"/>
@@ -41,7 +43,6 @@
|
<tc:link id="l5" label="Link with an image" image="image/feather-leaf.png" link="https://www.apache.org/"/>
</tc:section>
-
<tc:section label="<tc:button>">
<pre><code class="language-markup"><tc:button label="apache.org" link="https://www.apache.org/"/></code></pre>
<tc:button id="b1" label="apache.org" link="https://www.apache.org/"/>
@@ -52,6 +53,52 @@
</tc:section>
</tc:section>
+ <tc:section label="Dropdown">
+ <p>Links and buttons can also be dropdown elements.
+ You can just put a link tag in another link or button tag
+ and set the <code>omit</code> attribute for the parent.</p>
+
+ <tc:section label="Dropdown Link">
+ <pre><code class="language-markup"><tc:link label="MusicPlayer" omit="true">
+ <tc:link image="fa-play-circle" label="Play"/>
+ ...
+</tc:link></code></pre>
+ <tc:link label="MusicPlayer" omit="true">
+ <tc:link image="fa-play-circle" label="Play"/>
+ <tc:link image="fa-pause-circle" label="Pause"/>
+ <tc:link image="fa-stop-circle" label="Stop"/>
+ </tc:link>
+ </tc:section>
+
+ <tc:section label="Dropdown Button">
+ <pre><code class="language-markup"><tc:button label="MusicPlayer" omit="true">
+ <tc:link image="fa-play-circle" label="Play"/>
+ ...
+</tc:button></code></pre>
+ <tc:button label="MusicPlayer" omit="true">
+ <tc:link image="fa-play-circle" label="Play"/>
+ <tc:link image="fa-pause-circle" label="Pause"/>
+ <tc:link image="fa-stop-circle" label="Stop"/>
+ </tc:button>
+ </tc:section>
+
+ <tc:section label="Dropdown with Radio Buttons">
+ <pre><code class="language-markup"><tc:button label="Options" omit="true">
+ <tc:selectOneRadio>
+ <tc:selectItem itemValue="Option 1"/>
+ ...
+ </tc:selectOneRadio>
+</tc:button></code></pre>
+ <tc:button label="Options" omit="true">
+ <tc:selectOneRadio>
+ <tc:selectItem itemValue="Option 1"/>
+ <tc:selectItem itemValue="Option 2"/>
+ <tc:selectItem itemValue="Option 3"/>
+ </tc:selectOneRadio>
+ </tc:button>
+ </tc:section>
+ </tc:section>
+
<tc:section label="Localization">
<p>When configured, a link leads to a localized resource. Languages can be configured in the faces-config.xml.</p>
<pre><code class="language-markup"><application>
@@ -90,9 +137,10 @@
For example a new window/tab or a specific iframe (<code class="language-markup"><tc:object/></code>).</p>
<tc:section label="New Window">
<pre><code
- class="language-markup"><tc:link label="open link in new window"
+ class="language-markup"><tc:link label="open https://www.apache.org/ in new window"
link="https://www.apache.org/" target="_blank"/></code></pre>
- <p><tc:link label="open link in new window" link="https://www.apache.org/" target="_blank"/></p>
+ <p><tc:link label="open https://www.apache.org/ in new window" link="https://www.apache.org/" target="_blank"/>
+ </p>
</tc:section>
<tc:section label="IFrame">
<p>The iframe is set with <code class="language-markup"><tc:object name="objectframe" .../></code>
Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.xhtml?rev=1746435&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.xhtml Wed Jun 1 11:23:27 2016
@@ -0,0 +1,81 @@
+<?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.buttons} <tc:buttons>"/>
+ <p>Buttons can be grouped with the <code class="language-markup"><tc:buttons/></code> tag.
+ Just add some <code class="language-markup"><tc:button/></code> tags.</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:buttons/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/buttons.html"/>
+ |
+ <tc:link label="<tc:button/>" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/button.html"/></p>
+
+ <tc:section label="Basics">
+ <p>A simple example with three buttons.</p>
+ <pre><code class="language-markup"><tc:buttons>
+ <tc:button label="Left"/>
+ <tc:button label="Center"/>
+ <tc:button label="Right"/>
+</tc:buttons></code></pre>
+ <tc:buttons>
+ <tc:button label="Left"/>
+ <tc:button label="Center"/>
+ <tc:button label="Right"/>
+ </tc:buttons>
+ </tc:section>
+
+ <tc:section label="Default Button">
+ <p>It is also possible to set a default button.</p>
+ <pre><code class="language-markup"><tc:buttons>
+ <tc:button label="Left" defaultCommand="true"/>
+ <tc:button label="Center"/>
+ <tc:button label="Default"/>
+</tc:buttons></code></pre>
+ <tc:buttons>
+ <tc:button label="Left" defaultCommand="true"/>
+ <tc:button label="Center"/>
+ <tc:button label="Default"/>
+ </tc:buttons>
+ </tc:section>
+
+ <tc:section label="Dropdown Button">
+ <p>A dropdown button can also be placed in a <code class="language-markup"><tc:buttons/></code> tag.</p>
+ <pre><code class="language-markup"><tc:buttons>
+ <tc:button label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ ...
+ </tc:button>
+ <tc:button label="Center"/>
+ <tc:button label="Right"/>
+</tc:buttons></code></pre>
+ <tc:buttons>
+ <tc:button label="Dropdown" omit="true">
+ <tc:link label="Action 1"/>
+ <tc:link label="Action 2"/>
+ <tc:link label="Action 3"/>
+ </tc:button>
+ <tc:button label="Center"/>
+ <tc:button label="Right"/>
+ </tc:buttons>
+ </tc:section>
+</ui:composition>
Added: 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=1746435&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml Wed Jun 1 11:23:27 2016
@@ -0,0 +1,143 @@
+<?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: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">
+
+ <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:toolBar>
+ </f:facet>
+
+ <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:toolBar>
+
+ <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>
+</ui:composition>
Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/deprecated.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/deprecated.xhtml?rev=1746435&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/deprecated.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/deprecated.xhtml Wed Jun 1 11:23:27 2016
@@ -0,0 +1,30 @@
+<?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: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.deprecated}"/>
+
+ TODO
+
+
+</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=1746435&r1=1746434&r2=1746435&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 Wed Jun 1 11:23:27 2016
@@ -43,6 +43,7 @@
<entry key="suggest">Suggest</entry>
<entry key="textarea">Text Area</entry>
<entry key="date">Date</entry>
+ <entry key="group">Input Group</entry>
<entry key="output">Output Fields</entry>
<entry key="out">Output</entry>
<entry key="label">Label</entry>
@@ -58,9 +59,9 @@
<entry key="selectManyCheckbox">Checkbox Group</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 & Button</entry>
- <entry key="toolBar">Toolbar</entry>
+ <entry key="default_command">Default Command</entry>
+ <entry key="buttons">Button Group</entry>
<entry key="menu">Menubar</entry>
<entry key="container">Container</entry>
<entry key="box">Content Box</entry>
@@ -68,6 +69,7 @@
<entry key="separator">Separator</entry>
<entry key="section">Section</entry>
<entry key="header_footer">Header / Footer</entry>
+ <entry key="bar">Bar</entry>
<entry key="popup">Popup Dialog</entry>
<entry key="tab">Tab Group</entry>
<entry key="tab_client">Client sided</entry>
@@ -120,6 +122,9 @@
<entry key="dataAttribute">Data Attributes</entry>
<entry key="roles">Roles</entry>
+ <!-- navigate : deprecated -->
+ <entry key="deprecated">Deprecated</entry>
+ <entry key="toolBar">Toolbar</entry>
<entry key="validation-severity">Severity</entry>
<entry key="browser">Browser</entry>