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/23 19:03:20 UTC
svn commit: r1736363 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/
tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/
tobago-...
Author: lofwyr
Date: Wed Mar 23 18:03:19 2016
New Revision: 1736363
URL: http://svn.apache.org/viewvc?rev=1736363&view=rev
Log:
TOBAGO-1544: Revise Demo Application for Tobago 3.0
[developed with hnoeth]
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test-2.sass
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test.scss
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
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/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/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/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/tobago-resource/html/standard/standard/property/overview.properties.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.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/NavigationNode.java?rev=1736363&r1=1736362&r2=1736363&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java Wed Mar 23 18:03:19 2016
@@ -50,7 +50,8 @@ public class NavigationNode extends Defa
branch = matcher.group(1);
name = matcher.group(2);
final String extension = matcher.group(3);
- final String t = ResourceManagerUtils.getProperty(FacesContext.getCurrentInstance(), "overview", name);
+ final String key = name.replaceAll("\\+|\\-", "_");
+ final String t = ResourceManagerUtils.getProperty(FacesContext.getCurrentInstance(), "overview", key);
title = t != null ? t : name;
}
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -21,8 +21,7 @@
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>"/>
- <p>The <code class="language-markup"><tc:out></code> display an outputtext combined with a label.</p>
- <p>TODO: attribute-link</p>
+ <p>The <code class="language-markup"><tc:out/></code> display an outputtext combined with a label.</p>
<tc:link label="Tag Library Documentation" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/out.html"/>
<tc:section label="Basics">
<p>To put a label in front of a outputtext, use the <code>label</code> attribute.</p>
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 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="#{overviewBundle.label} <tc:label>"/>
- <p>With <code class="language-markup"><tc:label></code>, a single label can be created.
+ <p>With <code class="language-markup"><tc:label/></code>, a single label can be created.
Some components already have a <code>label</code> attribute to combine it with a label,
which should be used in general.</p>
<tc:link label="Tag Library Documentation" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/label.html"/>
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -24,7 +24,7 @@
<ui:param name="title" value="#{overviewBundle.object} <tc:object>"/>
<tc:script file="content/20-component/020-output/60-object/object.js"/>
- <p>The <code><tc:object></code> tag create an iframe.
+ <p>The <code class="language-markup"><tc:object/></code> tag create an iframe.
External objects can be included, when Content Security Policy is activated.
You may add a frame-src policy to the 'tobago-config.xml'.</p>
<tc:link label="Tag Library Documentation" image="image/feather-leaf.png" link="#{overviewBundle.tagDocUrl}/object.html"/>
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -23,7 +23,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<ui:param name="title" value="#{overviewBundle.selectBooleanCheckbox} <tc:selectBooleanCheckbox>"/>
- <p>The tag <tc:selectBooleanCheckbox/> generate a classic boolean checkbox.</p>
+ <p>The tag <code class="language-markup"><tc:selectBooleanCheckbox/></code> generate a classic boolean
+ checkbox.</p>
<tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
link="#{overviewBundle.tagDocUrl}/selectBooleanCheckbox.html"/>
<tc:section label="Basics">
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -83,9 +83,9 @@
via <code>selectedLabel</code>. The label for the whole component is set on top by
<code>labelLayout="top"</code>.</p>
<p>In this example, the entries are added by
- <code class="language-markup"><tc:selectItems ... var="planet" itemLabel="\#{planet.name}" itemValue="\#{planet.id}"/></code>.
+ <code class="language-markup"><tc:selectItems ... var="planet" itemLabel="\#{planet.name}" itemValue="\#{planet}"/></code>.
The name of a variable is defined by<code>var</code>. In this case, the <code>itemLabel</code> get the name of
- the planet, while the <code>itemValue</code> is the id.</p>
+ the planet, while the <code>itemValue</code> is object itself.</p>
<pre><code class="language-markup"><tc:selectManyShuttle label="Planets" ...>
<tc:selectItems value="\#{selectManyShuttleController.planets}" .../>
</tc:selectManyShuttle></code></pre>
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -21,7 +21,7 @@
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.default_command}"/>
+ <ui:param name="title" value="#{overviewBundle.default_command} <tc:button>"/>
<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>
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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -21,25 +21,37 @@
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="Container"/>
+ <ui:param name="title" value="#{overviewBundle.box} <tc:box>"/>
+ <p>A content box is created with <code class="language-markup"><tc:box/></code>.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/box.html"/>
+ <tc:section label="Basics">
+ <p>The title of the box is set by the <code>label</code> attribute.</p>
+ <pre><code class="language-markup"><tc:box label="Box">Content</tc:box></code></pre>
+ <tc:box id="b1" label="Box">Content</tc:box>
+ <tc:box>Contentbox without a title.</tc:box>
+ </tc:section>
- <tc:segmentLayout medium="6;6">
- <tc:box label="Box (height=200px)">
- <tc:style height="200px"/>
- </tc:box>
- <tc:box label="Box (no height set)"/>
- </tc:segmentLayout>
+ <tc:section label="Collapse/Expand">
+ <p>A contentbox can be collapsed via <code>collapsed</code> attribute.</p>
+ <pre><code class="language-markup"><tc:box label="Collapsed" collapsed="true">Content</tc:box></code></pre>
+ <tc:segmentLayout medium="6;6">
+ <tc:box label="Collapsed" collapsed="true">Content</tc:box>
+ <tc:box label="Expanded" collapsed="false">Content</tc:box>
+ </tc:segmentLayout>
+ </tc:section>
- <tc:segmentLayout medium="12">
- <tc:box label="Box with toolbar" >
+ <tc:section label="Toolbar">
+ <p>It's possible to add a toobar to the header of a contentbox. For that, the contentbox must contain the tag
+ <code class="language-markup"><f:facet name="toolBar"></code>. The facet contain the
+ <code class="language-markup"><tc:toolBar></code> tag.</p>
+ <tc:box>
<f:facet name="toolBar">
<tc:toolBar>
- <tc:toolBarCommand id="button1" label="Button 1"/>
- <tc:toolBarCommand id="button2" label="Button 2"/>
+ <tc:toolBarCommand label="Toolbar Entry"/>
</tc:toolBar>
</f:facet>
-
Content
</tc:box>
- </tc:segmentLayout>
+ </tc:section>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/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=1736363&r1=1736362&r2=1736363&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 Wed Mar 23 18:03:19 2016
@@ -21,43 +21,20 @@
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="Separator"/>
+ <ui:param name="title" value="#{overviewBundle.separator} <tc:separator>"/>
+ <p>A separator can be added with <code class="language-markup"><tc:separator/></code></p>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1*;1*" rows="auto;*"/>
- </f:facet>
+ <tc:section label="Separator with label">
+ <pre><code class="language-markup"><tc:separator label="Separator with label"/></code></pre>
+ <tc:in id="i1" label="Text 1"/>
+ <tc:separator label="Separator with label"/>
+ <tc:in id="i2" label="Text 2"/>
+ </tc:section>
- <tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
- <tc:separator>
- <f:facet name="label">
- <tc:label value="Separator with Label"/>
- </f:facet>
- </tc:separator>
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;auto;2*"/>
- </f:facet>
- <tc:textarea/>
- <tc:separator/>
- <tc:textarea/>
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="2*;auto;*"/>
- </f:facet>
- <tc:textarea/>
- <tc:separator>
- <f:facet name="label">
- <tc:label value="Separator with Label"/>
- </f:facet>
- </tc:separator>
- <tc:textarea/>
- </tc:panel>
-
- </tc:panel>
+ <tc:section label="Separator without label">
+ <pre><code class="language-markup"><tc:separator/></code></pre>
+ <tc:in id="i3" label="Text 1"/>
+ <tc:separator/>
+ <tc:in id="i4" label="Text 2"/>
+ </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=1736363&r1=1736362&r2=1736363&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Wed Mar 23 18:03:19 2016
@@ -58,6 +58,13 @@
<entry key="selectManyShuttle">Shuttle List</entry>
<entry key="default_command">Default Command</entry>
<entry key="button_link">Link</entry>
+ <entry key="toolBar">Toolbar</entry>
+ <entry key="menu">Menubar</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="sheet">Sheet Control</entry>
@@ -65,7 +72,6 @@
<entry key="tree-editor">Editor</entry>
<entry key="tree-command-types">Command Types</entry>
<entry key="tab">Tab Control</entry>
- <entry key="toolBar">Toolbar</entry>
<entry key="validation">Validation</entry>
<entry key="validation-severity">Severity</entry>
<entry key="form">Forms</entry>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml?rev=1736363&r1=1736362&r2=1736363&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml Wed Mar 23 18:03:19 2016
@@ -121,6 +121,11 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>nl.geodienstencentrum.maven</groupId>
+ <artifactId>sass-maven-plugin</artifactId>
+ <version>2.14</version>
+ </plugin>
</plugins>
</build>
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test-2.sass
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test-2.sass?rev=1736363&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test-2.sass (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test-2.sass Wed Mar 23 18:03:19 2016
@@ -0,0 +1,13 @@
+div
+ ul
+ margin: 0
+ padding: 0
+ list-style: none
+
+ li
+ display: inline-block
+
+ a
+ display: block
+ padding: 6px 12px
+ text-decoration: none
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test.scss?rev=1736363&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test.scss (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/sass/tobago-test.scss Wed Mar 23 18:03:19 2016
@@ -0,0 +1,15 @@
+nav {
+ ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+ li { display: inline-block; }
+
+ a {
+ display: block;
+ padding: 6px 12px;
+ text-decoration: none;
+}
+}