You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/10/22 11:04:22 UTC

[shiro-site] branch jbake updated (afc41cb -> 35825df)

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

bmarwell pushed a change to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git.


    from afc41cb  fix dead links on paging, fix anchor from tutorial.
     new 212926a  fix and enhance author data.
     new 35825df  fix post urls from pagination.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../blog/2020/05/25/feathercast-with-brian-demers.adoc        |  1 +
 jbake/data/authors.yaml                                       | 10 ++++++++++
 jbake/templates/header.ftl                                    | 11 ++++++++++-
 jbake/templates/index.ftl                                     |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

[shiro-site] 02/02: fix post urls from pagination.

Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git

commit 35825df6d26939e1b82a1383e4425d3756013bfc
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 22 13:04:14 2021 +0200

    fix post urls from pagination.
---
 jbake/templates/index.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jbake/templates/index.ftl b/jbake/templates/index.ftl
index 6ff80c4..be4b00b 100644
--- a/jbake/templates/index.ftl
+++ b/jbake/templates/index.ftl
@@ -119,7 +119,7 @@
         <#list posts as post>
         <#if (post.status == "published"  && post?index >= (currentPageNumber-1) * config.index_posts_per_page?eval && post?index < currentPageNumber * config.index_posts_per_page?eval)>
           <div>
-            <a href="${post.uri}"><h4 class="news-title">${post.title}</h4></a>
+            <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>${post.uri}"><h4 class="news-title">${post.title}</h4></a>
             <p><small>by ${(post.author)!"The Apache Shiro Team"} on ${post.date?string("yyyy-MM-dd")}</small></p>
           </div>
         </#if>

[shiro-site] 01/02: fix and enhance author data.

Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git

commit 212926abff66dbe8f1867c008c2be180a9c7bc6a
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 22 13:02:02 2021 +0200

    fix and enhance author data.
---
 .../blog/2020/05/25/feathercast-with-brian-demers.adoc        |  1 +
 jbake/data/authors.yaml                                       | 10 ++++++++++
 jbake/templates/header.ftl                                    | 11 ++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/jbake/content/blog/2020/05/25/feathercast-with-brian-demers.adoc b/jbake/content/blog/2020/05/25/feathercast-with-brian-demers.adoc
index 2062089..229828a 100644
--- a/jbake/content/blog/2020/05/25/feathercast-with-brian-demers.adoc
+++ b/jbake/content/blog/2020/05/25/feathercast-with-brian-demers.adoc
@@ -1,4 +1,5 @@
 = Feathercast with Brian Demers
+:jbake-author: Benjamin Marwell
 :jbake-date: 2020-05-25
 :jbake-type: post
 :jbake-status: published
diff --git a/jbake/data/authors.yaml b/jbake/data/authors.yaml
index 70bb333..581ba0e 100644
--- a/jbake/data/authors.yaml
+++ b/jbake/data/authors.yaml
@@ -1,13 +1,23 @@
 authors:
 
   Benjamin Marwell:
+    first_name: Benjamin
+    last_name: Marwell
     twitter: "@bmarwell"
+    facebook: "https://www.facebook.com/bmarwell"
 
   Brian Demers:
+    first_name: Brian
+    last_name: Demers
     twitter: "@briandemers"
 
   François Papon:
+    first_name: François
+    last_name: Papon
     twitter: "@fpapon2"
 
   Les Hazlewood:
+    first_name: Les
+    last_name: Hazlewood
     twitter: "@lhazlewood"
+    facebook: "https://www.facebook.com/les.hazlewood"
diff --git a/jbake/templates/header.ftl b/jbake/templates/header.ftl
index a015258..133a3cb 100644
--- a/jbake/templates/header.ftl
+++ b/jbake/templates/header.ftl
@@ -62,12 +62,21 @@
           <#if (authors[content.author?trim].twitter)??>
     <meta name="twitter:creator" content="${authors[content.author].twitter}" />
           </#if>
+          <#if (authors[content.author?trim].facebook)??>
+    <meta property="article:author" content="${authors[content.author].facebook}" />
+          </#if>
+          <#if (authors[content.author?trim].first_name)??>
+    <meta property="profile:first_name" content="${authors[content.author].first_name}" />
+          </#if>
+          <#if (authors[content.author?trim].last_name)??>
+    <meta property="profile:last_name" content="${authors[content.author].last_name}" />
+          </#if>
         </#if>
       <#-- fall through -->
       <#case "page">
     <meta property="og:type" content="article"/>
     <#if (content.twittercard!"")?trim == "large">
-      <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:card" content="summary_large_image" />
     <#else>
       <meta name="twitter:card" content="summary" />
     </#if>