You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2021/04/14 08:18:06 UTC

[myfaces-tobago] branch master updated: fix(demo): Tag Library Documentation urls

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

hnoeth 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 bb9bd84  fix(demo): Tag Library Documentation urls
bb9bd84 is described below

commit bb9bd84db7f76ab2694be03c6e28c71eb4e8b06b
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Apr 14 09:59:24 2021 +0200

    fix(demo): Tag Library Documentation urls
    
    Some xhtmls contain the old apiController.base reference.
    This is now replaced.
    
    Issue: TOBAGO-2070
---
 .../content/20-component/010-input/80-stars/5_Star_Rating.xhtml      | 2 +-
 .../main/webapp/content/20-component/020-output/25-badge/Badge.xhtml | 2 +-
 .../20-component/030-select/20-selectOneChoice/Dropdown.xhtml        | 5 ++---
 .../main/webapp/content/20-component/050-container/60-bar/Bar.xhtml  | 2 +-
 .../src/main/webapp/content/20-component/060-popup/Popup.xhtml       | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml
index b3ca870..30e7bc1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml
@@ -25,7 +25,7 @@
 
   <p>Use <code class="language-markup">&lt;tc:stars/></code> to create a five star rating.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
-           link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/stars.html"/>
+           link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/stars.html"/>
 
   <tc:section label="Basics">
     <tc:style marginTop="3rem"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
index d4a9f29..194d430 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
@@ -31,7 +31,7 @@
              link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/badge.html"/>
     |
     <tc:link label="&lt;tc:button/>" image="#{request.contextPath}/image/feather-leaf.png"
-             link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/button.html"/></p>
+             link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/button.html"/></p>
 
   <tc:section label="Basics">
     <p>A simple badge rendered with <code class="language-markup">&lt;tc:badge value="Simple Badge"/></code>.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
index eebffa3..909105a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
@@ -33,11 +33,10 @@
              link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/selectOneChoice.html"/>
     |
     <tc:link label="&lt;tc:selectItem/>" image="#{request.contextPath}/image/feather-leaf.png"
-             link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/selectItem.html"/>
+             link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/selectItem.html"/>
     |
     <tc:link label="&lt;tc:selectItems/>" image="#{request.contextPath}/image/feather-leaf.png"
-             link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/selectItems.html"/></p>
-
+             link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/selectItems.html"/></p>
   <tc:section label="Basics">
     <p>Dropdown box with hardcoded items. The second item is disabled.
       To disable an item, use the <code>itemDisable</code> attribute.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
index 52b5cbd..01a2567 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
@@ -29,7 +29,7 @@
   <p>Additionally the facet <code class="language-markup">&lt;f:facet name="brand"/></code> can be added.
     It shows the 'brand', a logo, text or both on the left site of the bar.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
-           link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/bar.html"/>
+           link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/bar.html"/>
 
   <tc:section label="Example">
     <p>This example show a dark bar with a 'brand' facet, a menu and right side content inside an 'after' facet.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
index d301f96..104e5be 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
@@ -30,10 +30,10 @@
              outcome="/content/30-concept/53-collapsible/Collapsible.xhtml"/> concept.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:popup/>" image="#{request.contextPath}/image/feather-leaf.png"
-             link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/popup.html"/>
+             link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/popup.html"/>
     |
     <tc:link label="&lt;tc:operation/>" image="#{request.contextPath}/image/feather-leaf.png"
-             link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/operation.html"/></p>
+             link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/operation.html"/></p>
 
   <tc:section label="Client Side Popup">
     <tc:form id="form2">