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 2019/01/02 09:53:41 UTC
[myfaces-tobago] 04/04: demo/doc for 4.4
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-4.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 9fb2236e279b2c827f10cf7710c5d3772cd67596
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Jan 2 10:50:44 2019 +0100
demo/doc for 4.4
---
.../apache/myfaces/tobago/example/demo/Demo.xml | 3 +-
.../30-whats-new/66-new-in-4-4/new-in-4-4.xhtml | 45 ++++++++++++++++++++++
.../content/10-intro/30-whats-new/whats-new.xhtml | 4 ++
.../src/main/webapp/content/10-intro/intro.xhtml | 15 +++++---
4 files changed, 60 insertions(+), 7 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 ee998c2..d85de7d 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
@@ -37,9 +37,10 @@
<entry key="menu_accessAllPages">Access all pages</entry>
<!-- navigate -->
- <entry key="intro">Intro</entry>
+ <entry key="intro">Introduction</entry>
<entry key="getting_started">Getting started</entry>
<entry key="whats_new">What's new?</entry>
+ <entry key="new_in_4_4">Tobago 4.4</entry>
<entry key="new_in_4_3">Tobago 4.3</entry>
<entry key="new_in_4_2">Tobago 4.2</entry>
<entry key="new_in_4_1">Tobago 4.1</entry>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/new-in-4-4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/new-in-4-4.xhtml
new file mode 100644
index 0000000..741f0aa
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/new-in-4-4.xhtml
@@ -0,0 +1,45 @@
+<?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"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{demoBundle.new_in_4_4}"/>
+
+ <tc:section label="Overview">
+ <p>
+ In January 2019, Tobago 4.4 was released with some bugfixes and new features.
+ </p>
+ </tc:section>
+
+ <tc:section label="New Features and Enhancements">
+
+ <ul>
+ <li>TODO</li>
+ <li>...</li>
+ <li>Bugfixes</li>
+ </ul>
+
+ The full list is available in
+ <tc:link label="Jira" image="fa-external-link" link="#{apiController.getJiraUrl('4.4.0')}"/>.
+
+ </tc:section>
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml
index 3e3b42e..72c9690 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml
@@ -28,6 +28,10 @@
</p>
<ul>
<li>
+ <tc:link label="#{demoBundle.new_in_4_4}"
+ outcome="/content/10-intro/30-whats-new/66-new-in-4-4/new-in-4-4.xhtml"/>
+ </li>
+ <li>
<tc:link label="#{demoBundle.new_in_4_3}"
outcome="/content/10-intro/30-whats-new/67-new-in-4-3/new-in-4-3.xhtml"/>
</li>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
index 908bdee..73dee2b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
@@ -22,11 +22,13 @@
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="#{demoBundle.intro}"/>
- <p>This is the demo of Tobago.
- It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
- <p>If you want to migrate from an older version, you'll find further information in the
- <tc:link label="migration guide" outcome="/content/10-intro/50-migration/migration.xhtml"/>.</p>
- <p>If you want to start this demo on you local machine, have a look at the section 'Local Demo'.</p>
+ <tc:section label="Welcome to Tobago #{info.version}!">
+ <p>This is the demo of Tobago.
+ It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
+ <p>If you want to migrate from an older version, you'll find further information in the
+ <tc:link label="migration guide" outcome="/content/10-intro/50-migration/migration.xhtml"/>.</p>
+ <p>If you want to start this demo on you local machine, have a look at the section 'Local Demo'.</p>
+ </tc:section>
<tc:section label="Description">
<p>Tobago is a user interface framework for developing web applications.
The technical basis of the framework is JavaServer Faces. The main core represents a theme oriented
@@ -46,7 +48,8 @@
and a flex layout which replace the old grid layout from Tobago 2.</p>
</tc:section>
<tc:section label="Versioning">
- <p>The Tobago project is using <tc:link label="semantic versioning" link="https://semver.org/"/> since past 2016.</p>
+ <p>The Tobago project is using <tc:link label="semantic versioning" link="https://semver.org/"/> since past 2016.
+ </p>
<p>This will lead into more growing minor version number compared to the past.</p>
</tc:section>
</tc:section>