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 2020/12/03 17:00:06 UTC
[myfaces-tobago] branch master updated: 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
The following commit(s) were added to refs/heads/master by this push:
new 8074f2c Demo
8074f2c is described below
commit 8074f2c6e4df6923a4da94971c3b699de7fe166b
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Dec 3 17:35:13 2020 +0100
Demo
---
.../content/30-concept/12-browser/Browser.xhtml | 19 ++++++++++++-------
.../90-non-faces-request/Non_Faces_Request.xhtml | 10 +++++-----
.../30-concept/90-non-faces-request/x-fish-pond.xhtml | 2 +-
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
index 4e86959..4ca10b1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
@@ -23,20 +23,25 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="Browser"/>
- Tobago is completely browser independent.
- Support of the different browsers takes place in the JSF renderkit.
-
- Tobago supports all common browsers like
+ <p>
+ Tobago is completely browser independent.
+ Support of the different browsers takes place in the JSF renderkit.
+ </p>
+ <p>
+ Tobago supports all common browsers like
+ </p>
<ul>
<li><tc:image value="fa-chrome"/> Google Chrome,</li>
<li><tc:image value="fa-firefox"/> Firefox,</li>
- <li><tc:image value="fa-internet-explorer"/> Internet Explorer,</li>
<li><tc:image value="fa-edge"/> Edge,</li>
<li><tc:image value="fa-safari"/> Safari,</li>
<li><tc:image value="fa-opera"/> Opera or</li>
<li> any other browser, if they are standard conform to current specifications.</li>
</ul>
- More information of the support of different version you may find in the
- <tc:link label="Project Website" link="http://myfaces.apache.org/tobago/compatibility.html"/> of Tobago.
+ <p>
+ More information of the support of different version you may find in the
+ <tc:link label="Compatiblity" link="#{request.contextPath}/content/10-intro/60-compatibility/Compatibility.xhtml"/>
+ of Tobago.
+ </p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
index b6a7d2d..266cec2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
@@ -32,11 +32,11 @@
<p>
Use these links from external applications:<br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=0</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=1</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=2</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=3</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=4</a><br/>
</p>
</tc:panel>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
index 035bd10..2fbb622 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
@@ -39,7 +39,7 @@
<f:ajax render="pond :page:header:headerInfo" execute="pond"/>
</tc:button>
<tc:button label="back to start"
- action="/content/30-concept/90-non-faces-request/non-faces-request.xhtml?faces-redirect=true"/>
+ action="/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml?faces-redirect=true"/>
</tc:buttons>
</tc:panel>