From 8cc787a71818316e34d2d8859ea6d368ec5e42b3 Mon Sep 17 00:00:00 2001 From: Van Date: Sat, 1 Sep 2018 23:51:36 +0800 Subject: [PATCH] :lips: list --- nijigen/archive-articles.ftl | 60 ++++---- nijigen/archives.ftl | 81 ++++++----- nijigen/article-list.ftl | 13 +- nijigen/article.ftl | 265 +++++++++++++++++----------------- nijigen/category-articles.ftl | 50 ++++--- nijigen/common-comment.ftl | 6 +- nijigen/css/base.css | 30 +++- nijigen/css/base.scss | 40 ++++- nijigen/dynamic.ftl | 102 ++++++------- nijigen/js/common.js | 261 +++++++++++++++++++-------------- nijigen/side.ftl | 12 +- nijigen/skin.properties | 5 +- 12 files changed, 523 insertions(+), 402 deletions(-) diff --git a/nijigen/archive-articles.ftl b/nijigen/archive-articles.ftl index c48b2e1..d7c5c73 100644 --- a/nijigen/archive-articles.ftl +++ b/nijigen/archive-articles.ftl @@ -20,34 +20,38 @@ <#include "macro-head.ftl"> - - <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> - - - - - - <#include "header.ftl"> -
-
-
-
-

- -   - <#if "en" == localeString?substring(0, 2)> - ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} - <#else> - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} - - - ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel} -

-
- <#include "article-list.ftl"> -
- <#include "side.ftl"> + +<@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> + + + + + +<#include "header.ftl"> +
+
+
+
+ + ${blogTitle} +   >   + + ${archiveLabel} +   >   + <#if "en" == localeString?substring(0, 2)> + ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} + <#else> + ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} + + - ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel}
- <#include "footer.ftl"> - + <#include "article-list.ftl"> +
+ <#include "side.ftl"> +
+<#include "footer.ftl"> + diff --git a/nijigen/archives.ftl b/nijigen/archives.ftl index 24b18d7..baa3515 100644 --- a/nijigen/archives.ftl +++ b/nijigen/archives.ftl @@ -20,42 +20,51 @@ <#include "macro-head.ftl"> - - <@head title="${blogTitle}"> - - - - - - <#include "header.ftl"> -
-
-
- -

-  ${statistic.statisticPublishedBlogArticleCount} ${articleLabel}

- - <#if 0 != archiveDates?size> - - -
- <#include "side.ftl"> + +<@head title="${blogTitle}"> + + + + + +<#include "header.ftl"> +
+
+
+
+ + ${blogTitle} +   >   + + ${statistic.statisticPublishedBlogArticleCount} ${archiveLabel}${articleLabel}
- <#include "footer.ftl"> - +
+
+ <#if 0 != archiveDates?size> + + +
+
+
+ <#include "side.ftl"> +
+<#include "footer.ftl"> + diff --git a/nijigen/article-list.ftl b/nijigen/article-list.ftl index f162666..d0668dd 100644 --- a/nijigen/article-list.ftl +++ b/nijigen/article-list.ftl @@ -19,7 +19,7 @@ -->
<#list articles as article> -
+