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/03/25 08:17:07 UTC
svn commit: r1736535 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main:
java/org/apache/myfaces/tobago/example/demo/
webapp/content/20-component/010-input/10-in/
webapp/content/20-component/010-input/30-textarea/ we...
Author: lofwyr
Date: Fri Mar 25 07:17:06 2016
New Revision: 1736535
URL: http://svn.apache.org/viewvc?rev=1736535&view=rev
Log:
TOBAGO-1544: Revise Demo Application for Tobago 3.0
[developed with hnoeth]
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBoolean.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/textarea.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/out.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/label.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/image.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-default/default-command.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-button+link/button+link.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/separator.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java Fri Mar 25 07:17:06 2016
@@ -22,17 +22,15 @@ package org.apache.myfaces.tobago.exampl
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
@Named
public class ButtonLinkController implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(Command.class);
public String linkToComponentsRoot() {
LOG.info("link to components root");
- return "/content/20-component/components.xhtml";
+ return "/content/20-component/component.xhtml";
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java Fri Mar 25 07:17:06 2016
@@ -22,12 +22,12 @@ package org.apache.myfaces.tobago.exampl
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
import java.util.Date;
-@SessionScoped
+@RequestScoped
@Named
public class DateController implements Serializable {
@@ -38,7 +38,7 @@ public class DateController implements S
private Date onchange;
public DateController() {
- once = new Date();
+ once = new Date();
}
public Date getOnce() {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java Fri Mar 25 07:17:06 2016
@@ -19,14 +19,19 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.faces.event.ActionEvent;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
+@RequestScoped
@Named
public class DefaultCommandController implements Serializable {
+
private String value1;
+ private String value2;
+ private String value3;
+ private String lastActiveButtonId;
public String getValue1() {
return value1;
@@ -35,4 +40,28 @@ public class DefaultCommandController im
public void setValue1(String value1) {
this.value1 = value1;
}
+
+ public String getValue2() {
+ return value2;
+ }
+
+ public void setValue2(String value2) {
+ this.value2 = value2;
+ }
+
+ public String getValue3() {
+ return value3;
+ }
+
+ public void setValue3(String value3) {
+ this.value3 = value3;
+ }
+
+ public void click(final ActionEvent actionEvent) {
+ lastActiveButtonId = actionEvent.getComponent().getId();
+ }
+
+ public String getLastActiveButtonId() {
+ return lastActiveButtonId;
+ }
}
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java?rev=1736535&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java Fri Mar 25 07:17:06 2016
@@ -0,0 +1,40 @@
+/*
+ * 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 javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+
+@SessionScoped
+@Named
+public class PopupController implements Serializable {
+
+ private String text;
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java Fri Mar 25 07:17:06 2016
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
+@RequestScoped
@Named
public class SelectBooleanCheckboxController implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java Fri Mar 25 07:17:06 2016
@@ -19,13 +19,13 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-@SessionScoped
+@RequestScoped
@Named
public class SelectManyCheckboxController implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java Fri Mar 25 07:17:06 2016
@@ -21,13 +21,13 @@ package org.apache.myfaces.tobago.exampl
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-@SessionScoped
+@RequestScoped
@Named
public class SelectManyListboxController implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java Fri Mar 25 07:17:06 2016
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
+@RequestScoped
@Named
public class SelectOneChoiceController extends PlanetExample implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java Fri Mar 25 07:17:06 2016
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.exampl
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
+@RequestScoped
@Named
public class SelectOneListboxController implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java Fri Mar 25 07:17:06 2016
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
+@RequestScoped
@Named
public class SelectOneRadioController extends PlanetExample implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java Fri Mar 25 07:17:06 2016
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
-@SessionScoped
+@RequestScoped
@Named
public class TextareaController implements Serializable {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.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/010-input/10-in/in.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/textarea.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/010-input/30-textarea/textarea.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/textarea.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/textarea.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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.textarea} <tc:textarea>"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.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/010-input/40-date/date.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/out.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/020-output/10-out/out.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/out.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/out.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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.out} <tc:out>"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/label.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/020-output/20-label/label.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/label.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/label.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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.label} <tc:label>"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/image.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/020-output/40-image/image.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/image.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/image.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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.image} <tc:image>"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.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/020-output/60-object/object.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml Fri Mar 25 07:17:06 2016
@@ -18,9 +18,9 @@
-->
<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.object} <tc:object>"/>
<tc:script file="content/20-component/020-output/60-object/object.js"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.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/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.xhtml Fri Mar 25 07:17:06 2016
@@ -18,10 +18,10 @@
-->
<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:h="http://java.sun.com/jsf/html">
+ xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="#{overviewBundle.selectBooleanCheckbox} <tc:selectBooleanCheckbox>"/>
<p>The tag <code class="language-markup"><tc:selectBooleanCheckbox/></code> generate a classic boolean
checkbox.</p>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.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/030-select/20-selectOneChoice/selectOneChoice.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.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/030-select/30-selectOneRadio/selectOneRadio.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.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/030-select/40-selectOneListbox/selectOneListbox.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.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/030-select/50-selectManyCheckbox/selectManyCheckbox.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/selectManyListbox.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/030-select/60-selectManyListbox/selectManyListbox.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.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/030-select/70-selectManyShuttle/selectManyShuttle.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-default/default-command.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/040-command/00-default/default-command.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-default/default-command.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-default/default-command.xhtml Fri Mar 25 07:17:06 2016
@@ -18,73 +18,61 @@
-->
<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.default_command} <tc:button>"/>
+ <p>A normal button, created with <code class="language-markup"><tc:button/></code>, must be actively pressed,
+ to run the action. A default-button can be activated, even if not selected.
+ For example, the cursor is in an inputfield and the enter key is pressed.</p>
<p>A button can be made to a default button with the <code>defaultCommand</code> attribute.
- If true, the comment is executed - for example if the user presses the enter key inside a related input field.
- The default button is highlighted by another color.</p>
- <tc:link label="Generated Documentation" link="https://myfaces.apache.org/tobago/doc/2.0.9/tld/tc/button.html"/>
-
- <tc:section label="Basics">
- <p>After writing some text into the textfield, the user can press 'ENTER' to run the command.</p>
- <tc:in id="i1" label="Textfield" placeholder="add some text..." value="#{defaultCommandController.value1}"/>
- <tc:out id="o1" label="Value in textfield" value="#{defaultCommandController.value1}"/>
- <tc:button label="Submit" defaultCommand="true"/>
+ The default button is highlighted by another color.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/button.html"/>
+
+ <tc:section label="Last Active Button ID">
+ <p>To make the examples more clear, the ID of the last active button is displayed in the
+ following outputfield.</p>
+ <tc:out id="o1" label="Id" value="#{defaultCommandController.lastActiveButtonId}"/>
</tc:section>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="60px;3*;3*;*" />
- </f:facet>
-
- <tc:in label="Last button clicked" readonly="true" value="#{overviewController.lastAction}"/>
-
- <tc:form id="form-1">
- <tc:panel id="panel-1">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;*"/>
- </f:facet>
-
- <tc:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}"/>
-
- <tc:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
-
- <tc:date />
-
- <tc:selectOneChoice>
- <tc:selectItem itemLabel="A" itemValue="A"/>
- <tc:selectItem itemLabel="B" itemValue="B"/>
- <tc:selectItem itemLabel="C" itemValue="C"/>
- <tc:selectItem itemLabel="D" itemValue="D"/>
- </tc:selectOneChoice>
-
- <tc:button id="default-1" defaultCommand="true" label="default" actionListener="#{overviewController.click}"/>
-
- <tc:button id="any-1" label="any" actionListener="#{overviewController.click}"/>
-
- </tc:panel>
+ <tc:section label="Basics">
+ <p>After writing some text into the textfield, the user can press 'ENTER' to activate the submit-button.</p>
+ <tc:form>
+ <tc:in id="i1" label="Textfield" placeholder="add some text..." value="#{defaultCommandController.value1}"/>
+ <tc:out id="o2" label="Value Textfield" value="#{defaultCommandController.value1}"/>
+ <tc:button id="submit1" label="Submit 1" defaultCommand="true"
+ actionListener="#{defaultCommandController.click}"/>
</tc:form>
- <tc:form id="form-2">
- <tc:panel id="panel-2">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;*"/>
- </f:facet>
-
- <tc:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue1}"/>
-
- <tc:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
-
- <tc:button id="default-2" defaultCommand="true" label="default" actionListener="#{overviewController.click}"/>
-
- <tc:button id="any-2" label="any" actionListener="#{overviewController.click}"/>
-
- </tc:panel>
+ </tc:section>
+ <tc:section label="Multiple Default Buttons">
+ <p>The related default-button is searched in the current <code class="language-markup"><tc:form/></code>.
+ If there no default-button could found, the search is continued in the parent form and so on.
+ If no default-button found on this way, the button is search outside of a form.</p>
+ <p>In this example, the 'Submit A'-button is in a form together with a intputfield and outputfield.
+ The 'Submit B'-button is outside a form.</p>
+ <p>Now, if the cursor is in 'Textfield A' and the enter key is pressed, the 'Submit A'-button is activated.
+ Therefor only the 'Textfield A'-value will be submitted.</p>
+ <p>If the cursor is in 'Textfield B' and the enter key is pressed, the 'Submit B'-button is activated.
+ This will submit the 'Textfield A'-value as well as the 'Textfield B'-value.</p>
+ <tc:form>
+ <tc:box>
+ <tc:form>
+ <tc:in id="i2" label="Textfield A" placeholder="add some text..." value="#{defaultCommandController.value2}"/>
+ <tc:out id="o3" label="Value Textfield A" value="#{defaultCommandController.value2}"/>
+ <tc:button id="submitA" label="Submit A" defaultCommand="true"
+ actionListener="#{defaultCommandController.click}"/>
+ </tc:form>
+ </tc:box>
+ <tc:box>
+ <tc:form>
+ <tc:in id="i3" label="Textfield B" placeholder="add some text..." value="#{defaultCommandController.value3}"/>
+ <tc:out id="o4" label="Value Textfield B" value="#{defaultCommandController.value3}"/>
+ </tc:form>
+ </tc:box>
+ <tc:button id="submitB" label="Submit B" defaultCommand="true"
+ actionListener="#{defaultCommandController.click}"/>
</tc:form>
-
- <tc:button id="default-3" defaultCommand="true" label="master" actionListener="#{overviewController.click}"/>
-
- </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/040-command/10-button+link/button+link.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/040-command/10-button%2Blink/button%2Blink.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-button+link/button+link.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-button+link/button+link.xhtml Fri Mar 25 07:17:06 2016
@@ -16,6 +16,7 @@
-->
<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">
@@ -35,7 +36,7 @@
|
<tc:link id="l2" label="Disabled" disabled="true" link="https://www.apache.org/"/>
|
- <tc:link id="l3" label="Resource" resource="content/20-component/component.xhtml"/>
+ <tc:link id="l3" label="Resource" resource="faces/content/20-component/component.xhtml"/>
|
<tc:link id="l4" label="Action" action="#{buttonLinkController.linkToComponentsRoot}"/>
|
@@ -46,7 +47,7 @@
<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/"/>
<tc:button id="b2" label="Disabled" disabled="true" link="https://www.apache.org/"/>
- <tc:button id="b3" label="Resource" resource="content/20-component/component.xhtml"/>
+ <tc:button id="b3" label="Resource" resource="faces/content/20-component/component.xhtml"/>
<tc:button id="b4" label="Action" action="#{buttonLinkController.linkToComponentsRoot}"/>
<tc:button id="b5" image="image/feather-leaf.png" link="https://www.apache.org/"/>
</tc:section>
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml Fri Mar 25 07:17:06 2016
@@ -18,6 +18,7 @@
-->
<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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/separator.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/30-separator/separator.xhtml?rev=1736535&r1=1736534&r2=1736535&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/separator.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/separator.xhtml Fri Mar 25 07:17:06 2016
@@ -18,9 +18,9 @@
-->
<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.separator} <tc:separator>"/>
<p>A separator can be added with <code class="language-markup"><tc:separator/></code></p>
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=1736535&r1=1736534&r2=1736535&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 Fri Mar 25 07:17:06 2016
@@ -18,95 +18,65 @@
-->
<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="Popups"/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;*"/>
- </f:facet>
- <f:facet name="menuBar">
- <tc:menuBar>
- <tc:menu label="Menu">
- <tc:menuCommand label="Open Popup">
- <tc:popupReference for=":page:popup"/>
- </tc:menuCommand>
- </tc:menu>
- </tc:menuBar>
- </f:facet>
-
- <tc:panel>
- <tc:label value="Full Reload"/>
-
- <tc:button label="Open">
+ <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>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/popup.html"/>
+ <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="modal_popup">
- <tc:segmentLayout large="12">
-
- <tc:box label="Modal text input" id="modal_box">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;*;auto" columns="auto"/>
- </f:facet>
- <f:facet name="menuBar">
- <tc:menuBar>
- <tc:menu label="Menu">
- <tc:menuCommand label="Say okay" omit="true">
- <tc:dataAttribute name="alert-text" value="Okay!"/>
- </tc:menuCommand>
- </tc:menu>
- </tc:menuBar>
- </f:facet>
-
- <tc:selectOneChoice label="Select some">
- <f:selectItem itemLabel="A" itemValue="a"/>
- <f:selectItem itemLabel="B" itemValue="b"/>
- </tc:selectOneChoice>
- <tc:selectBooleanCheckbox value="#{reference.bool}" label="Check" />
- <tc:in label="In" value="#{reference.text}" required="true"/>
- <tc:date label="Date">
- <f:convertDateTime pattern="dd/MM/yyyy"/>
- </tc:date>
- <tc:image value="image/feather-leaf.png" width="16px" height="16px"/>
- <tc:panel/>
- <tc:flowLayout>
- <tc:style textAlign="right"/>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- <tc:button label="Redisplay" renderedPartially="modal_box"/>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- </tc:flowLayout>
-
- </tc:box>
- </tc:segmentLayout>
+ <tc:popup id="popup1">
+ <p>This is a popup dialog.</p>
</tc:popup>
</f:facet>
</tc:button>
-
- </tc:panel>
-
- <tc:panel>
- <tc:label value="Partial Reload"/>
-
- <tc:button label="Open" renderedPartially="modal_popup">
- <tc:popupReference for="modal_popup"/>
- </tc:button>
-
- </tc:panel>
-
- <tc:in readonly="true" label="The Boolean" value="#{reference.bool}"/>
-
- <tc:in readonly="true" label="The Text" value="#{reference.text}"/>
-
- <tc:in required="true" label="Required"/>
-
- <tc:selectOneChoice label="Select"/>
-
- <tc:panel/>
-
- </tc:panel>
+ </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="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>
+ </tc:box>
+ </tc:popup>
+ <tc:button id="b2" label="Open Popup 2">
+ <tc:popupReference for="popup2"/>
+ </tc:button>
+ <tc:out id="o2" label="Text from Popup" value="#{popupController.text}"/>
+ </tc:section>
</ui:composition>
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=1736535&r1=1736534&r2=1736535&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 Fri Mar 25 07:17:06 2016
@@ -60,18 +60,22 @@
<entry key="button_link">Link</entry>
<entry key="toolBar">Toolbar</entry>
<entry key="menu">Menubar</entry>
+ <entry key="container">Container</entry>
<entry key="box">Content Box</entry>
<entry key="separator">Separator</entry>
<entry key="section">Section</entry>
<entry key="header_footer">Header / Footer</entry>
- <entry key="popup">Popup</entry>
+ <entry key="popup">Popup Dialog</entry>
+ <entry key="tab">Tab Control</entry>
+ <entry key="tab_client">Client sided</entry>
+ <entry key="tab_ajax">Ajax</entry>
+ <entry key="tab_server">Server sided</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="tab">Tab Control</entry>
<entry key="validation">Validation</entry>
<entry key="validation-severity">Severity</entry>
<entry key="form">Forms</entry>