You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2023/06/30 07:22:20 UTC

[myfaces-tobago] branch main updated: fix(demo): small corrections

This is an automated email from the ASF dual-hosted git repository.

bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/main by this push:
     new de0c1fe358 fix(demo): small corrections
     new e7c72c5ae5 Merge pull request #4153 from bohmber/fixes-demo
de0c1fe358 is described below

commit de0c1fe358709614530842b468937a5ad0c08a29
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Thu Jun 29 15:07:32 2023 +0200

    fix(demo): small corrections
---
 .../src/main/webapp/content/020-output/Output.xhtml                   | 4 ++--
 .../src/main/webapp/content/280-security/Security.xhtml               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
index fc9eb68d6a..358723e7fb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
@@ -42,8 +42,8 @@
   </tc:section>
 
   <tc:section label="Image">
-    <demo-highlight language="markup">&lt;tc:image value="image/tobago_head.png"/></demo-highlight>
-    <tc:image value="/image/tobago_head.png"/>
+    <demo-highlight language="markup">&lt;tc:image value="\#{request.contextPath}/image/tobago_head.png"/></demo-highlight>
+    <tc:image value="#{request.contextPath}/image/tobago_head.png"/>
   </tc:section>
 
   <tc:section label="Progress">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml
index f88b84a7ba..307ee500c6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml
@@ -36,7 +36,7 @@
     <li>Checking annotated method calls for <tc:link label="Roles"
                  outcome="/content/280-security/20-roles/Roles.xhtml"/>.</li>
     <li>Setting HTTP headers <code>X-Frame-Options</code> and <code>X-Content-Type-Options</code></li>
-    <li>Using session secrects to avoid
+    <li>Using session secrets to avoid
       <tc:link label="Cross-Site Request Forgery (CSRF)"
     link="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)" image="bi-box-arrow-up-right" />.
     This is configurable in the <code>tobago-config.xml</code></li>