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/09/19 20:08:48 UTC
[shiro-site] branch jbake updated (3cd20e3 -> 7e32153)
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 3cd20e3 convert authentication-features.md
new a4a65d8 archive.ftl / news.html fixes
new 7e32153 Add Buildr dependency layout
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:
jbake/templates/archive.ftl | 48 ++++++++++++++++-----------------
jbake/templates/download.ftl | 2 --
jbake/templates/macros/dependencies.ftl | 24 ++++++++++++++++-
3 files changed, 46 insertions(+), 28 deletions(-)
[shiro-site] 01/02: archive.ftl / news.html fixes
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 a4a65d84f0d7f0d5004f85548783b2813a92c85c
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sun Sep 19 22:07:16 2021 +0200
archive.ftl / news.html fixes
- spaces instead of tabs, but keep default archive template.
- dont show menu twice for archive and download pages.
---
jbake/templates/archive.ftl | 48 +++++++++++++++++++++-----------------------
jbake/templates/download.ftl | 2 --
2 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/jbake/templates/archive.ftl b/jbake/templates/archive.ftl
index c8bc9ee..af6317e 100644
--- a/jbake/templates/archive.ftl
+++ b/jbake/templates/archive.ftl
@@ -1,27 +1,25 @@
<#include "header.ftl">
- <#include "menu.ftl">
-
- <div class="page-header">
- <h1>Blog Archive</h1>
- </div>
-
- <!--<ul>-->
- <#list published_posts as post>
- <#if (last_month)??>
- <#if post.date?string("MMMM yyyy") != last_month>
- </ul>
- <h4>${post.date?string("MMMM yyyy")}</h4>
- <ul>
- </#if>
- <#else>
- <h4>${post.date?string("MMMM yyyy")}</h4>
- <ul>
- </#if>
-
- <li>${post.date?string("dd")} - <a href="${content.rootpath}${post.uri}">${post.title}</a></li>
- <#assign last_month = post.date?string("MMMM yyyy")>
- </#list>
- </ul>
-
-<#include "footer.ftl">
\ No newline at end of file
+<div class="page-header">
+ <h1>Blog Archive</h1>
+</div>
+
+<!--<ul>-->
+<#list published_posts as post>
+ <#if (last_month)??>
+ <#if post.date?string("MMMM yyyy") != last_month>
+ </ul>
+ <h4>${post.date?string("MMMM yyyy")}</h4>
+ <ul>
+ </#if>
+ <#else>
+ <h4>${post.date?string("MMMM yyyy")}</h4>
+ <ul>
+ </#if>
+
+ <li>${post.date?string("dd")} - <a href="${content.rootpath}${post.uri}">${post.title}</a></li>
+ <#assign last_month = post.date?string("MMMM yyyy")>
+</#list>
+ </ul>
+
+<#include "footer.ftl">
diff --git a/jbake/templates/download.ftl b/jbake/templates/download.ftl
index fe612c3..a274a94 100644
--- a/jbake/templates/download.ftl
+++ b/jbake/templates/download.ftl
@@ -1,7 +1,5 @@
<#include "header.ftl">
-<#include "menu.ftl">
-
<#import "macros/artifacttable.ftl" as artifacttable>
<#if (content.title)??>
[shiro-site] 02/02: Add Buildr dependency layout
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 7e32153d304a08b10fa983611c655393e1ae5100
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sun Sep 19 22:10:00 2021 +0200
Add Buildr dependency layout
---
jbake/templates/macros/dependencies.ftl | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/jbake/templates/macros/dependencies.ftl b/jbake/templates/macros/dependencies.ftl
index 27b1408..3333f7a 100644
--- a/jbake/templates/macros/dependencies.ftl
+++ b/jbake/templates/macros/dependencies.ftl
@@ -65,6 +65,19 @@
aria-selected="false"
>Leiningen</button>
</li>
+ <#-- Buildr -->
+ <li class="nav-item" role="presentation">
+ <button
+ class="nav-link"
+ id="buildr-${anchorId}-tab"
+ data-bs-toggle="tab"
+ data-bs-target="#buildr-${anchorId}"
+ type="button"
+ role="tab"
+ aria-controls="buildr-${anchorId}"
+ aria-selected="false"
+ >Buildr</button>
+ </li>
</ul>
<#-- tab contents -->
@@ -93,7 +106,6 @@
</#list></code></pre>
</div>
<#-- sbt -->
-
<div
class="tab-pane fade"
id="sbt-${anchorId}"
@@ -123,5 +135,15 @@
<pre><code class='clojure language-clojure'><#list deps as dep>[${dep.g}/${dep.a} "${dep.v}"]
</#list></code></pre>
</div>
+ <#-- Buildr -->
+ <div
+ class="tab-pane fade"
+ id="buildr-${anchorId}"
+ role="tabpanel"
+ aria-labelledby="buildr-${anchorId}-tab"
+ >
+ <pre><code class='groovy language-groovy'><#list deps as dep>'${dep.g}:${dep.a}:${(dep.type)!"jar"}:${dep.v}'
+</#list></code></pre>
+ </div>
</div>
</#macro>