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:49 UTC
[shiro-site] 01/02: archive.ftl / news.html fixes
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)??>