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/14 23:18:10 UTC
svn commit: r1735000 - 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/
webapp/content/20-component/010-input/10-in/ webapp/content/20-compon...
Author: lofwyr
Date: Mon Mar 14 22:18:10 2016
New Revision: 1735000
URL: http://svn.apache.org/viewvc?rev=1735000&view=rev
Log:
TOBAGO-1544: Revise Demo Application for Tobago 3.0
[developed by hnoeth]
Modified:
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/Progress.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/20-suggest/suggest.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/020-output/output.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/050-container/10-box/box.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.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/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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Date;
@SessionScoped
@@ -40,12 +38,7 @@ public class DateController implements S
private Date onchange;
public DateController() {
- try {
- once = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS").parse("1980-03-07 21:05:09 012");
- } catch (ParseException e) {
- LOG.error("should not happen. ", e
- );
- }
+ 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/Progress.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/Progress.java?rev=1735000&r1=1734999&r2=1735000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Progress.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Progress.java Mon Mar 14 22:18:10 2016
@@ -29,7 +29,7 @@ import java.io.Serializable;
@Named
public class Progress implements Serializable {
- private DefaultBoundedRangeModel progress = new DefaultBoundedRangeModel(0, 0, 0, 100);
+ private DefaultBoundedRangeModel progress = new DefaultBoundedRangeModel(10, 0, 0, 100);
private boolean update;
public boolean isUpdate() {
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -19,12 +19,11 @@
<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"
- xmlns:tx="http://myfaces.apache.org/tobago/extension">
-
- <ui:param name="title" value="<tc:in>"/>
-
- TODO
-
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{overviewBundle.in}"/>
+ <tc:in id="i1" label="Input" value="Some Text"/>
+ <tc:in id="i2" label="Read Only" readonly="true" value="Some Text"/>
+ <tc:in id="i3" label="Disabled" disabled="true" value="Some Text"/>
+ <tc:in id="i4" value="Input without a label"/>
+ <tc:in id="i5" label="Input (focus)" focus="true" value="Some Text"/>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.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/20-suggest/suggest.xhtml?rev=1735000&r1=1734999&r2=1735000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.xhtml Mon Mar 14 22:18:10 2016
@@ -22,7 +22,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:param name="title" value="<tc:suggest>"/>
+ <ui:param name="title" value="<tc:suggest>"/>
TODO
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -19,11 +19,15 @@
<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="<tc:textarea>"/>
-
- TODO
-
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{overviewBundle.textarea}"/>
+ <tc:textarea id="t1" label="Text Area"
+ value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
+ <tc:textarea id="t2" label="Read Only" readonly="true"
+ value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
+ <tc:textarea id="t3" label="Disabled" disabled="true"
+ value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
+ <tc:textarea id="t4"
+ value="Text Area without a label, Text Area without a label, Text Area without a label, Text Area without a label, Text Area without a label, Text Area without a label, Text Area without a label, Text Area without a label, Text Area without a label, ..."/>
+ <tc:textarea id="t5" label="Text Area (focus)" focus="true" value="Some Text"/>
</ui:composition>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -21,114 +21,71 @@
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="Time Specific Controls"/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="400px;*"
- rows="auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;250px;*"/>
- </f:facet>
-
- <tc:in label="Date as Text" value="#{dateController.once}">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- </tc:in>
- <tc:panel/>
-
- <tc:date label="Date" value="#{dateController.once}">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date value="#{dateController.once}">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- </tc:date>
- <tc:panel/>
-
-<!--
- <tc:date label="Date/Time" value="#{dateController.once}">
- <f:convertDateTime pattern="dd.MM.yyyy HH:mm"/>
- </tc:date>
- <tc:panel/>
--->
-
-<!--
- <tc:date label="Date (focus)" focus="true">
--->
- <tc:date label="Date (focus)">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Short style" value="#{dateController.once}">
- <f:convertDateTime dateStyle="short" type="both" timeStyle="short"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Medium Style" value="#{dateController.once}">
- <f:convertDateTime dateStyle="medium" type="both" timeStyle="medium"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Long Style" value="#{dateController.once}">
- <f:convertDateTime dateStyle="long" type="both" timeStyle="long"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Full Style" value="#{dateController.once}">
- <f:convertDateTime dateStyle="full" type="both" timeStyle="full"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Month" value="#{dateController.once}">
- <f:convertDateTime pattern="MM/yyyy"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Year" value="#{dateController.once}">
- <f:convertDateTime pattern="yyyy"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Time" value="#{dateController.once}">
- <f:convertDateTime type="time" pattern="HH:mm"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Time (Seconds)" value="#{dateController.once}">
- <f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Time" value="#{dateController.once}" readonly="true">
- <f:convertDateTime type="time" pattern="HH:mm"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Time (Seconds)" value="#{dateController.once}" readonly="true">
- <f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Time" value="#{dateController.once}" disabled="true">
- <f:convertDateTime type="time" pattern="HH:mm"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="Time (Seconds)" value="#{dateController.once}" disabled="true">
- <f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:date>
- <tc:panel/>
-
- <tc:date label="on change" value="#{dateController.onchange}">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- <f:ajax render="o"/>
- </tc:date>
- <tc:panel/>
-
- <tc:out id="o" value="#{dateController.onchange}" label="on server"/>
-
- <tc:calendar/>
- <tc:panel/>
-
- </tc:panel>
+ <ui:param name="title" value="#{overviewBundle.date}"/>
+ <tc:tabGroup id="tabGroup1">
+ <tc:tab label="Basics">
+ <tc:date id="d1" label="Date" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:date>
+ <tc:date id="d2" label="Read Only" readonly="true" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:date>
+ <tc:date id="d3" label="Disabled" disabled="true" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:date>
+ <tc:date id="d4" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:date>
+ <tc:date id="d5" label="Date (focus)" focus="true">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:date>
+ </tc:tab>
+ <tc:tab label="Outputfields">
+ <tc:out id="o1" value="The date can also be displayed in other components."/>
+ <tc:in id="i1" label="Date in Textfield" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:in>
+ <tc:textarea id="t1" label="Date in Text Area" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:textarea>
+ <tc:out id="o2" label="Date in Output" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:out>
+ <tc:label id="l1" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tc:label>
+ </tc:tab>
+ <tc:tab label="Pattern">
+ <tc:date label="Month" value="#{dateController.once}">
+ <f:convertDateTime pattern="MM/yyyy" type="date"/>
+ </tc:date>
+ <tc:date label="Time" value="#{dateController.once}">
+ <f:convertDateTime pattern="HH:mm" type="time"/>
+ </tc:date>
+ <tc:date label="Time (Seconds)" value="#{dateController.once}">
+ <f:convertDateTime pattern="HH:mm:ss" type="time"/>
+ </tc:date>
+ </tc:tab>
+ <tc:tab label="Styles">
+ <tc:date id="dateshortstyle" label="Short style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="short" timeStyle="short" type="both"/>
+ </tc:date>
+ <tc:date id="datemediumstyle" label="Medium Style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="medium" timeStyle="medium" type="both"/>
+ </tc:date>
+ <tc:date id="datelongstyle" label="Long Style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="long" timeStyle="long" type="both"/>
+ </tc:date>
+ <tc:date id="datefullstyle" label="Full Style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="full" timeStyle="full" type="both"/>
+ </tc:date>
+ </tc:tab>
+ <tc:tab label="Ajax">
+ <tc:date label="On Change" value="#{dateController.onchange}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ <f:ajax render="o"/>
+ </tc:date>
+ <tc:out id="o" value="#{dateController.onchange}" label="On Server"/>
+ </tc:tab>
+ </tc:tabGroup>
</ui:composition>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -20,9 +20,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="TODO"/>
-
-TODO
-
+ <ui:param name="title" value="#{overviewBundle.out}"/>
+ <tc:out id="o1" label="Output" value="Some Text"/>
+ <tc:out id="o2" label="Read Only" readonly="true" value="Some Text"/>
+ <tc:out id="o3" label="Disabled" disabled="true" value="Some Text"/>
+ <tc:out id="o4" value="Output without a label"/>
</ui:composition>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -20,9 +20,7 @@
<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.label}"/>
+ <tc:label id="l1" value="Some Text"/>
+ <tc:label id="l2" disabled="true" value="Some diabled text."/>
</ui:composition>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -21,8 +21,9 @@
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.image}"/>
+ <tc:image value="image/tobago_head.png"/>
+ <tc:image value="image/tobago_head.png">
+ <tc:style width="75px" height="42px"/>
+ </tc:image>
</ui:composition>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -21,34 +21,33 @@
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="Object - Show external content inside of an application"/>
+ <ui:param name="title" value="#{overviewBundle.object}"/>
+ <tc:script file="content/20-component/020-output/60-object/object.js"/>
+ <tc:out id="o1" value="External objects can be included, when CSP is activated. You may add a frame-src policy to the 'tobago-config.xml'."/>
+
+
+ <tc:object id="tobagomap" src="https://www.google.com/maps/@11.249123,-60.687103,31489m/data=!3m1!1e3?hl=de"/>
+
+ <tc:object src="http://www.apache.org/"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="35px;auto;*"/>
+ </f:facet>
+
+ <tc:out id="o11" value="External objects can be included, when CSP is activated. You may add a frame-src policy to the 'tobago-config.xml'."/>
+
+ <tc:toolBar iconSize="off">
+ <tc:toolBarCommand label="Show Tobago" omit="true">
+ <tc:dataAttribute name="maps-position" value="11.249123,-60.687103"/>
+ <tc:dataAttribute name="maps-zoom" value="12"/>
+ <tc:dataAttribute name="maps-target" value="page:map"/>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Show World" omit="true">
+ <tc:dataAttribute name="maps-target" value="page:map"/>
+ </tc:toolBarCommand>
+ </tc:toolBar>
+ <tc:object id="map"/>
- <tc:script file="content/30-object/object.js"/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="35px;auto;*"/>
- </f:facet>
-
- <tc:out value="External objects can be included. When CSP is activated, you may add a frame-src policy to the tobago-config.xml"/>
-
- <tc:toolBar iconSize="off" >
- <tc:toolBarCommand label="Show Tobago" omit="true">
- <tc:dataAttribute name="maps-position" value="11.249123,-60.687103"/>
- <tc:dataAttribute name="maps-zoom" value="12"/>
- <tc:dataAttribute name="maps-target" value="page:map"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Show Plane" omit="true">
- <tc:dataAttribute name="maps-position" value="50.053839,8.624933"/>
- <tc:dataAttribute name="maps-zoom" value="17"/>
- <tc:dataAttribute name="maps-target" value="page:map"/>
- </tc:toolBarCommand>
- <tc:toolBarCommand label="Show World" omit="true">
- <tc:dataAttribute name="maps-target" value="page:map"/>
- </tc:toolBarCommand>
- </tc:toolBar>
-
- <tc:object id="map"/>
-
- </tc:panel>
+ </tc:panel>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.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/output.xhtml?rev=1735000&r1=1734999&r2=1735000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.xhtml Mon Mar 14 22:18:10 2016
@@ -21,7 +21,7 @@
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <ui:param name="title" value="Output Controls"/>
+ <ui:param name="title" value="#{overviewBundle.output}"/>
<tc:label value="_Single Label"/>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -22,38 +22,33 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
- <ui:param name="title" value="Select Boolean Checkbox: <tc:selectBoleanCheckbox>"/>
-
- <tc:section label="Simple Usage">
-
- <tc:selectBooleanCheckbox value="#{selectBoolean.a}" label="A" id="a"/>
- <tc:selectBooleanCheckbox value="#{selectBoolean.b}" label="B" id="b"/>
- <tc:selectBooleanCheckbox value="#{selectBoolean.c}" label="C" id="c"/>
-
- <tc:flowLayout>
- <tc:style textAlign="right"/>
- <tc:button label="Submit" defaultCommand="true" action="#{selectBoolean.submit}"/>
- </tc:flowLayout>
-
- </tc:section>
-
- <tc:section label="AJAX" id="ajax">
-
- <tc:selectBooleanCheckbox value="#{selectBoolean.d}" label="D" id="d">
- <f:ajax render="ajax :page:messages" listener="#{selectBoolean.action}"/>
- </tc:selectBooleanCheckbox>
- <tc:out label="Value is" value="#{selectBoolean.d}"/>
-
- <tc:selectBooleanCheckbox value="#{selectBoolean.e}" label="E" id="e">
- <f:ajax render="ajax"/>
- </tc:selectBooleanCheckbox>
- <tc:out label="Value is" value="#{selectBoolean.e}"/>
-
- <tc:selectBooleanCheckbox value="#{selectBoolean.f}" label="F" id="f">
- <f:ajax render="ajax"/>
- </tc:selectBooleanCheckbox>
- <tc:out label="Value is" value="#{selectBoolean.f}"/>
-
- </tc:section>
-
+ <ui:param name="title" value="#{overviewBundle.selectBooleanCheckbox}"/>
+ <tc:tabGroup id="tabGroup1">
+ <tc:tab label="Basics">
+ <tc:selectBooleanCheckbox value="#{selectBoolean.a}" label="A" id="a"/>
+ <tc:selectBooleanCheckbox value="#{selectBoolean.b}" label="B" id="b"/>
+ <tc:selectBooleanCheckbox value="#{selectBoolean.c}" label="C" id="c"/>
+
+ <tc:flowLayout>
+ <tc:style textAlign="right"/>
+ <tc:button label="Submit" defaultCommand="true" action="#{selectBoolean.submit}"/>
+ </tc:flowLayout>
+ </tc:tab>
+ <tc:tab label="Ajax">
+ <tc:selectBooleanCheckbox value="#{selectBoolean.d}" label="D" id="d">
+ <f:ajax render="ajax :page:messages" listener="#{selectBoolean.action}"/>
+ </tc:selectBooleanCheckbox>
+ <tc:out label="Value is" value="#{selectBoolean.d}"/>
+
+ <tc:selectBooleanCheckbox value="#{selectBoolean.e}" label="E" id="e">
+ <f:ajax render="ajax"/>
+ </tc:selectBooleanCheckbox>
+ <tc:out label="Value is" value="#{selectBoolean.e}"/>
+
+ <tc:selectBooleanCheckbox value="#{selectBoolean.f}" label="F" id="f">
+ <f:ajax render="ajax"/>
+ </tc:selectBooleanCheckbox>
+ <tc:out label="Value is" value="#{selectBoolean.f}"/>
+ </tc:tab>
+ </tc:tabGroup>
</ui:composition>
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -31,7 +31,7 @@
</tc:segmentLayout>
<tc:segmentLayout medium="12">
- <tc:box label="Box with toolbar">
+ <tc:box label="Box with toolbar" >
<f:facet name="toolBar">
<tc:toolBar>
<tc:toolBarCommand id="button1" label="Button 1"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.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/component.xhtml?rev=1735000&r1=1734999&r2=1735000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml Mon Mar 14 22:18:10 2016
@@ -21,7 +21,7 @@
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <ui:param name="title" value="TODO"/>
+ <ui:param name="title" value="#{overviewBundle.component}"/>
TODO
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=1735000&r1=1734999&r2=1735000&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 Mon Mar 14 22:18:10 2016
@@ -36,6 +36,21 @@
<!-- navigate -->
<entry key="overview">Overview</entry>
<entry key="intro">Intro</entry>
+ <entry key="component">Components</entry>
+ <entry key="input">Input Fields</entry>
+ <entry key="in">Input</entry>
+ <entry key="textarea">Text Area</entry>
+ <entry key="date">Date</entry>
+ <entry key="output">Output Fields</entry>
+ <entry key="out">Output</entry>
+ <entry key="Label">Label</entry>
+ <entry key="image">Image</entry>
+ <entry key="progress">Progress Bar</entry>
+ <entry key="object">External Object (iframe)</entry>
+ <entry key="select">Select</entry>
+ <entry key="selectBooleanCheckbox">Boolean Checkbox</entry>
+
+
<entry key="basic">Basic Controls</entry>
<entry key="sheet">Sheet Control</entry>
<entry key="tree">Tree Control</entry>
@@ -63,7 +78,6 @@
<entry key="reference_intro">Ref. (under constr.)</entry>
<entry key="reference_command">Command</entry>
<entry key="reference_container">Container</entry>
- <entry key="reference_input">Input</entry>
<entry key="reference_inputSuggest">Input suggest</entry>
<entry key="reference_menu">Menu</entry>
<entry key="reference_output">Output</entry>