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 2017/10/04 07:31:30 UTC
[myfaces-tobago] 02/04: demo
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 37da36a282c3d08ee53f7f795765e2eb537796eb
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Sep 28 16:10:39 2017 +0200
demo
---
.../apache/myfaces/tobago/example/demo/Demo.xml | 13 ++++---
.../10-intro/28-new+in+4+0/new+in+4+0.xhtml | 41 ++++++++++++++++++++++
.../tobago-example-demo/src/main/webapp/menu.xhtml | 11 +++---
3 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml b/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
index 96ff088..cc19c9b 100644
--- a/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
+++ b/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
@@ -30,8 +30,6 @@
<entry key="menu_config">Configuration</entry>
<entry key="menu_themes">Theme</entry>
<entry key="menu_locale">Language</entry>
- <entry key="menu_help">Help</entry>
- <entry key="menu_about">About</entry>
<entry key="menu_test">Test</entry>
<entry key="menu_runTest">Run Test</entry>
<entry key="menu_closeTest">Close Test</entry>
@@ -40,13 +38,14 @@
<!-- navigate -->
<entry key="intro">Intro</entry>
- <entry key="new_in_3_0">New in Tobago 3.0</entry>
- <entry key="new_in_2_0">New in Tobago 2.0</entry>
+ <entry key="new_in_4_0">Tobago 4</entry>
+ <entry key="new_in_3_0">Tobago 3</entry>
+ <entry key="new_in_2_0">Tobago 2</entry>
<entry key="migration">Migration</entry>
<entry key="migration15">to 1.5</entry>
- <entry key="migration20">to 2.0</entry>
- <entry key="migration30">to 3.0</entry>
- <entry key="migration40">to 4.0</entry>
+ <entry key="migration20">to 2</entry>
+ <entry key="migration30">to 3</entry>
+ <entry key="migration40">to 4</entry>
<!-- navigate : components -->
<entry key="component">Components</entry>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml
new file mode 100644
index 0000000..a904523
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+ xmlns="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="#{demoBundle.new_in_4_0}"/>
+ <p>In fall 2017 the release of Tobago 4.0.0 is scheduled.
+ Here is a quick overview over the features and changes made in the last time to release this major revision.</p>
+ <p>Tobago 4.0.0 contains several entries in
+ <tc:link label="Jira"
+ link="https://issues.apache.org/jira/projects/TOBAGO/versions/12338728"/>.</p>
+ <p>Please take also a look at the <tc:link label="Migration from Tobago 3 to 4"
+ outcome="/content/10-intro/50-migration/96-migration/migration40.xhtml"/> guide.</p>
+
+ <tc:section label="Overview and History">
+ <p>TODO</p>
+ </tc:section>
+
+ <tc:section label="New Features and Enhancements">
+ <b>TODO</b>
+ <p>TODO</p>
+ </tc:section>
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
index d9f36b9..d39de73 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
@@ -93,18 +93,19 @@
</tc:link>
</tc:link>
- <tc:link label="#{demoBundle.menu_help}" omit="true">
- <tc:link label="#{demoBundle.menu_about}" omit="true">
+ <tc:link label="Info" omit="true">
+ <tc:link label="About" omit="true">
<tc:dataAttribute name="alert-text"
value="#{demoBundle.pageTitle} - #{info.version} - #{demoBundle.tobago_url}"/>
</tc:link>
<tc:link omit="true" label="Client Info" id="headerInfo">
<tc:operation name="show" for=":::info"/>
</tc:link>
- <tc:link action="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
- <tc:link action="/logging-info.xhtml" immediate="true" label="Logging Info"
+ <tc:link outcome="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
+ <tc:link outcome="/logging-info.xhtml" immediate="true" label="Logging Info"
disabled="#{! info.enabled}"/>
- <tc:link link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
+ <tc:separator/>
+ <tc:link link="http://myfaces.apache.org/tobago" label="Tobago Home"/>
</tc:link>
</tc:links>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.