diff --git a/article-list.ftl b/article-list.ftl index 8cef313..aa731cf 100644 --- a/article-list.ftl +++ b/article-list.ftl @@ -56,16 +56,16 @@ href="/category/${article.categoryURI}">${article.articleCategory} -

${article.articleTitle!}

-
- <#if article.articleAbstractText!?length gt 40> - ${article.articleAbstractText!?substring(0, 40)} ......<#else> +
+ <#if article.articleAbstractText!?length gt 48> + ${article.articleAbstractText!?substring(0, 48)} <#else> ${article.articleAbstractText!}
阅读更多 + class="button is-size-7 is-light">阅读更多
@@ -76,7 +76,7 @@
- ${article.articleTitle!} @@ -107,11 +107,11 @@ href="${article.articlePermalink}">${article.articleTitle!} -
+
<#if article.articleAbstractText!?length gt 128> - ${article.articleAbstractText!?substring(0, 128)} ......<#else> + ${article.articleAbstractText!?substring(0, 110)} <#else> ${article.articleAbstractText!} - <#-- ${article.articleAbstractText!?substring(0, 128)} ...... --> + <#-- ${article.articleAbstractText!?substring(0, 110)} ...... -->
@@ -166,3 +166,11 @@
+ + diff --git a/article.ftl b/article.ftl index 2ecb7d9..703af68 100644 --- a/article.ftl +++ b/article.ftl @@ -48,7 +48,11 @@ <#-- <#include "style.theme.ftl"> --> @@ -101,8 +105,7 @@ height: 25px !important; } -
+
${article.articleContent}
diff --git a/footer.ftl b/footer.ftl index a43cc89..80cc87f 100644 --- a/footer.ftl +++ b/footer.ftl @@ -17,6 +17,13 @@ along with this program. If not, see . --> + + +