From e1be3169c20af6beb36308ccd9dbb276c52032c8 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 21 Mar 2019 16:29:12 +0800
Subject: [PATCH] Refactor anatole theme

---
 .../templates/themes/anatole/archives.ftl      |  4 ++--
 .../templates/themes/anatole/category.ftl      | 12 ++++++------
 .../templates/themes/anatole/gallery.ftl       |  8 ++++----
 .../templates/themes/anatole/index.ftl         | 10 +++++-----
 .../templates/themes/anatole/links.ftl         |  8 ++++----
 .../themes/anatole/module/page-top.ftl         |  4 ++--
 .../themes/anatole/module/post_entry.ftl       | 10 +++++-----
 .../templates/themes/anatole/page.ftl          | 12 ++++++------
 .../templates/themes/anatole/post.ftl          | 18 +++++++++---------
 .../resources/templates/themes/anatole/tag.ftl | 10 +++++-----
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/main/resources/templates/themes/anatole/archives.ftl b/src/main/resources/templates/themes/anatole/archives.ftl
index 6fdcabeeb..67a8e5130 100644
--- a/src/main/resources/templates/themes/anatole/archives.ftl
+++ b/src/main/resources/templates/themes/anatole/archives.ftl
@@ -11,10 +11,10 @@
                         <#list archivesLess as archive>
                             <div class="listing-title">${archive.year}</div>
                             <ul class="listing">
-                                <#list archive.posts?sort_by("postDate")?reverse as post>
+                                <#list archive.posts?sort_by("createTime")?reverse as post>
                                     <div class="listing-item">
                                         <div class="listing-post">
-                                            <a href="${options.blog_url!}/archives/${post.postUrl!}" title="${post.postTitle!}">${post.postTitle!}</a>
+                                            <a href="${options.blog_url!}/archives/${post.url!}" title="${post.title!}">${post.title!}</a>
                                             <div class="post-time">
                                                 <span class="date">${post.postDate?string("yyyy-MM-dd")}</span>
                                             </div>
diff --git a/src/main/resources/templates/themes/anatole/category.ftl b/src/main/resources/templates/themes/anatole/category.ftl
index eb2fd0cfe..17f31dbf1 100644
--- a/src/main/resources/templates/themes/anatole/category.ftl
+++ b/src/main/resources/templates/themes/anatole/category.ftl
@@ -1,28 +1,28 @@
 <#include "module/macro.ftl">
-<@head title="分类：${category.cateName} · ${options.blog_title!'Anatole'}" keywords="${options.seo_keywords!'Anatole'}" description="${options.seo_desc!'Anatole'}"></@head>
+<@head title="分类：${category.name} · ${options.blog_title!'Halo'}" keywords="${options.seo_keywords!'Halo'}" description="${options.seo_desc!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
     <#include "module/page-top.ftl">
     <div class="autopagerize_page_element">
         <div class="content">
             <#include "module/post_entry.ftl">
-            <#if posts.totalPages gt 1>
+            <#if posts.pages gt 1>
                 <div class="pagination">
                     <ul class="clearfix">
                         <#if posts.hasPrevious()>
-                            <#if posts.number == 1>
+                            <#if posts.page == 1>
                                 <li class="pre pagbuttons">
-                                    <a class="btn" role="navigation" href="${options.blog_url!}/categories/${category.cateUrl!}">上一页</a>
+                                    <a class="btn" role="navigation" href="${options.blog_url!}/categories/${category.slugName!}">上一页</a>
                                 </li>
                             <#else >
                                 <li class="pre pagbuttons">
-                                    <a class="btn" role="navigation" href="${options.blog_url!}/categories/${category.cateUrl!}/page/${posts.number}">上一页</a>
+                                    <a class="btn" role="navigation" href="${options.blog_url!}/categories/${category.slugName!}/page/${posts.page}">上一页</a>
                                 </li>
                             </#if>
                         </#if>
                         <#if posts.hasNext()>
                             <li class="next pagbuttons">
-                                <a class="btn" role="navigation" href="${options.blog_url!}/categories/${category.cateUrl!}/page/${posts.number+2}">下一页</a>
+                                <a class="btn" role="navigation" href="${options.blog_url!}/categories/${category.slugName!}/page/${posts.page+2}">下一页</a>
                             </li>
                         </#if>
                     </ul>
diff --git a/src/main/resources/templates/themes/anatole/gallery.ftl b/src/main/resources/templates/themes/anatole/gallery.ftl
index 45070195e..ad10d50e7 100644
--- a/src/main/resources/templates/themes/anatole/gallery.ftl
+++ b/src/main/resources/templates/themes/anatole/gallery.ftl
@@ -12,7 +12,7 @@
 <div id="main">
     <header id="header">
         <h1>图库</h1>
-        <p>${user.userDesc!}</p>
+        <p>${user.description!}</p>
         <ul class="icons">
             <!--
             <li><a href="#" class="icon fa-twitter"><span class="label">Twitter</span></a></li>
@@ -26,9 +26,9 @@
         <#if galleries?size gt 0>
         <#list galleries as gallery>
             <article>
-                <a class="thumbnail" href="${gallery.galleryUrl}" data-position="left center"><img src="${gallery.galleryThumbnailUrl}" alt="${gallery.galleryDesc}" /></a>
-                <h2>${gallery.galleryName}</h2>
-                <p>${gallery.galleryDate!}</p>
+                <a class="thumbnail" href="${gallery.url}" data-position="left center"><img src="${gallery.thumbnail}" alt="${gallery.description}" /></a>
+                <h2>${gallery.name}</h2>
+                <p>${gallery.takeTime!}</p>
             </article>
         </#list>
         </#if>
diff --git a/src/main/resources/templates/themes/anatole/index.ftl b/src/main/resources/templates/themes/anatole/index.ftl
index bfd07d348..2f49ffc14 100644
--- a/src/main/resources/templates/themes/anatole/index.ftl
+++ b/src/main/resources/templates/themes/anatole/index.ftl
@@ -1,28 +1,28 @@
 <#include "module/macro.ftl">
-<@head title="${options.blog_title!'Anatole'}" keywords="${options.seo_keywords!'Anatole'}" description="${options.seo_desc!'Anatole'}"></@head>
+<@head title="${options.blog_title!'Halo'}" keywords="${options.seo_keywords!'Halo'}" description="${options.seo_desc!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
     <#include "module/page-top.ftl">
     <div class="autopagerize_page_element">
         <div class="content">
             <#include "module/post_entry.ftl">
-            <#if posts.totalPages gt 1>
+            <#if posts.pages gt 1>
                 <div class="pagination">
                     <ul class="clearfix">
                         <#if posts.hasPrevious()>
-                            <#if posts.number == 1>
+                            <#if posts.page == 1>
                                 <li class="pre pagbuttons">
                                     <a class="btn" role="navigation" href="${options.blog_url!}/">上一页</a>
                                 </li>
                             <#else >
                                 <li class="pre pagbuttons">
-                                    <a class="btn" role="navigation" href="${options.blog_url!}/page/${posts.number}">上一页</a>
+                                    <a class="btn" role="navigation" href="${options.blog_url!}/page/${posts.page}">上一页</a>
                                 </li>
                             </#if>
                         </#if>
                         <#if posts.hasNext()>
                         <li class="next pagbuttons">
-                            <a class="btn" role="navigation" href="${options.blog_url!}/page/${posts.number+2}">下一页</a>
+                            <a class="btn" role="navigation" href="${options.blog_url!}/page/${posts.page+2}">下一页</a>
                         </li>
                         </#if>
                     </ul>
diff --git a/src/main/resources/templates/themes/anatole/links.ftl b/src/main/resources/templates/themes/anatole/links.ftl
index 055ac294c..a5e5ee3f8 100644
--- a/src/main/resources/templates/themes/anatole/links.ftl
+++ b/src/main/resources/templates/themes/anatole/links.ftl
@@ -1,5 +1,5 @@
 <#include "module/macro.ftl">
-<@head title="友情链接 · ${options.blog_title!'Anatole'}" keywords="${options.seo_keywords!'Anatole'}" description="${options.seo_desc!'Anatole'}"></@head>
+<@head title="友情链接 · ${options.blog_title!'Halo'}" keywords="${options.seo_keywords!'Halo'}" description="${options.seo_desc!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
     <#include "module/page-top.ftl">
@@ -15,9 +15,9 @@
                             <#if links?? && links?size gt 0>
                                 <#list links as link>
                                 <p>
-                                    <a href="${link.linkUrl}" target="_blank" rel="external">${link.linkName}</a>
-                                    <#if link.linkDesc!=''>
-                                         – ${link.linkDesc}
+                                    <a href="${link.url}" target="_blank" rel="external">${link.name}</a>
+                                    <#if link.description!=''>
+                                         – ${link.description}
                                     </#if>
                                 </p>
                                 </#list>
diff --git a/src/main/resources/templates/themes/anatole/module/page-top.ftl b/src/main/resources/templates/themes/anatole/module/page-top.ftl
index 54abceeb9..85b5a240c 100644
--- a/src/main/resources/templates/themes/anatole/module/page-top.ftl
+++ b/src/main/resources/templates/themes/anatole/module/page-top.ftl
@@ -1,9 +1,9 @@
 <div class="page-top animated fadeInDown">
     <div class="nav">
         <@commonTag method="menus">
-            <#list menus?sort_by('menuSort') as menu>
+            <#list menus?sort_by('sort') as menu>
                 <li>
-                    <a href="${menu.menuUrl}" target="${menu.menuTarget!}">${menu.menuName} </a>
+                    <a href="${menu.url}" target="${menu.target!}">${menu.name} </a>
                 </li>
             </#list>
         </@commonTag>
diff --git a/src/main/resources/templates/themes/anatole/module/post_entry.ftl b/src/main/resources/templates/themes/anatole/module/post_entry.ftl
index bf72bbed1..1b3015ad7 100644
--- a/src/main/resources/templates/themes/anatole/module/post_entry.ftl
+++ b/src/main/resources/templates/themes/anatole/module/post_entry.ftl
@@ -2,12 +2,12 @@
     <div class="post animated fadeInDown">
         <div class="post-title">
             <h3>
-                <a href="${options.blog_url!}/archives/${post.postUrl}">${post.postTitle}</a>
+                <a href="${options.blog_url!}/archives/${post.url}">${post.title}</a>
             </h3>
         </div>
         <div class="post-content">
             <div class="p_part">
-                <p>${post.postSummary!}...</p>
+                <p>${post.summary!}...</p>
             </div>
             <div class="p_part">
                 <p></p>
@@ -17,13 +17,13 @@
             <div class="meta">
                 <div class="info">
                     <i class="fa fa-sun-o"></i>
-                    <span class="date">${post.postDate?string("yyyy-MM-dd")}</span>
+                    <span class="date">${post.createTime?string("yyyy-MM-dd")}</span>
                     <i class="fa fa-comment-o"></i>
-                    <a href="${options.blog_url!}/archives/${post.postUrl}#comment_widget">Comments</a>
+                    <a href="${options.blog_url!}/archives/${post.url}#comment_widget">Comments</a>
                     <#if post.tags?size gt 0>
                         <i class="fa fa-tag"></i>
                         <#list post.tags as tag>
-                            <a href="${options.blog_url!}/tags/${tag.tagUrl}" class="tag">&nbsp;${tag.tagName}</a>
+                            <a href="${options.blog_url!}/tags/${tag.url}" class="tag">&nbsp;${tag.name}</a>
                         </#list>
                     </#if>
                 </div>
diff --git a/src/main/resources/templates/themes/anatole/page.ftl b/src/main/resources/templates/themes/anatole/page.ftl
index 9fa6acffa..2ad51beaa 100644
--- a/src/main/resources/templates/themes/anatole/page.ftl
+++ b/src/main/resources/templates/themes/anatole/page.ftl
@@ -1,5 +1,5 @@
 <#include "module/macro.ftl">
-<@head title="${post.postTitle!} · ${options.blog_title!'Anatole'}" keywords="${post.postTitle!},${options.seo_keywords!'Anatole'}" description="${post.postSummary!}"></@head>
+<@head title="${post.title!} · ${options.blog_title!'Halo'}" keywords="${post.title!},${options.seo_keywords!'Halo'}" description="${post.summary!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
     <link href="/anatole/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" />
@@ -40,19 +40,19 @@
                 <div class="post animated fadeInDown">
                     <div class="post-title">
                         <h3>
-                            <a>${post.postTitle}</a>
+                            <a>${post.title!}</a>
                         </h3>
                     </div>
                     <div class="post-content">
-                        ${post.postContent!}
+                        ${post.formatContent!}
                     </div>
                     <div class="post-footer">
                         <div class="meta">
                             <div class="info">
                                 <i class="fa fa-sun-o"></i>
-                                <span class="date">${post.postDate?string("yyyy-MM-dd")}</span>
+                                <span class="date">${post.createTime?string("yyyy-MM-dd")}</span>
                                 <i class="fa fa-comment-o"></i>
-                                <a href="${options.blog_url!}/archives/${post.postUrl}#comment_widget">Comments</a>
+                                <a href="${options.blog_url!}/archives/${post.url!}#comment_widget">Comments</a>
                             </div>
                         </div>
                     </div>
@@ -67,7 +67,7 @@
                            class="fa fa-weibo"></a>
                     </div>
                     <div class="twitter">
-                        <a href="http://twitter.com/home?status=${options.blog_url}/archives/${post.postUrl} ,${options.blog_title!},${post.postTitle},;"
+                        <a href="http://twitter.com/home?status=${options.blog_url!}/archives/${post.url!} ,${options.blog_title!},${post.title!},;"
                            class="fa fa-twitter"></a>
                     </div>
                 </div>
diff --git a/src/main/resources/templates/themes/anatole/post.ftl b/src/main/resources/templates/themes/anatole/post.ftl
index 9e822c416..51ebcc2cd 100644
--- a/src/main/resources/templates/themes/anatole/post.ftl
+++ b/src/main/resources/templates/themes/anatole/post.ftl
@@ -1,5 +1,5 @@
 <#include "module/macro.ftl">
-<@head title="${post.postTitle!} · ${options.blog_title!'Anatole'}" keywords="${post.postTitle!},${options.seo_keywords!'Anatole'},${tagWords!}" description="${post.postSummary!}"></@head>
+<@head title="${post.title!} · ${options.blog_title!'Halo'}" keywords="${post.title!},${options.seo_keywords!'Halo'},${tagWords!}" description="${post.summary!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
     <link href="/anatole/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" />
@@ -40,23 +40,23 @@
                 <div class="post animated fadeInDown">
                     <div class="post-title">
                         <h3>
-                            <a>${post.postTitle}</a>
+                            <a>${post.title}</a>
                         </h3>
                     </div>
                     <div class="post-content">
-                        ${post.postContent!}
+                        ${post.formatContent!}
                     </div>
                     <div class="post-footer">
                         <div class="meta">
                             <div class="info">
                                 <i class="fa fa-sun-o"></i>
-                                <span class="date">${post.postDate?string("yyyy-MM-dd")}</span>
+                                <span class="date">${post.createTime?string("yyyy-MM-dd")}</span>
                                 <i class="fa fa-comment-o"></i>
-                                <a href="${options.blog_url!}/archives/${post.postUrl}#comment_widget">Comments</a>
+                                <a href="${options.blog_url!}/archives/${post.url}#comment_widget">Comments</a>
                                 <#if post.tags?size gt 0>
                                     <i class="fa fa-tag"></i>
                                     <#list post.tags as tag>
-                                        <a href="${options.blog_url!}/tags/${tag.tagUrl}" class="tag">&nbsp;${tag.tagName}</a>
+                                        <a href="${options.blog_url!}/tags/${tag.slugName}" class="tag">&nbsp;${tag.name}</a>
                                     </#list>
                                 </#if>
                             </div>
@@ -73,7 +73,7 @@
                            class="fa fa-weibo"></a>
                     </div>
                     <div class="twitter">
-                        <a href="http://twitter.com/home?status=${options.blog_url}/archives/${post.postUrl} ,${options.blog_title!},${post.postTitle},;"
+                        <a href="http://twitter.com/home?status=${options.blog_url}/archives/${post.url} ,${options.blog_title!},${post.title},;"
                            class="fa fa-twitter"></a>
                     </div>
                 </div>
@@ -81,12 +81,12 @@
                     <ul class="clearfix">
                         <#if nextPost??>
                         <li class="pre pagbuttons">
-                            <a class="btn" role="navigation" href="${options.blog_url!}/archives/${nextPost.postUrl}" title="${nextPost.postTitle}">上一篇</a>
+                            <a class="btn" role="navigation" href="${options.blog_url!}/archives/${nextPost.url}" title="${nextPost.title}">上一篇</a>
                         </li>
                         </#if>
                         <#if prePost??>
                         <li class="next pagbuttons">
-                            <a class="btn" role="navigation" href="${options.blog_url!}/archives/${prePost.postUrl}" title="${prePost.postTitle}">下一篇</a>
+                            <a class="btn" role="navigation" href="${options.blog_url!}/archives/${prePost.url}" title="${prePost.title}">下一篇</a>
                         </li>
                         </#if>
                     </ul>
diff --git a/src/main/resources/templates/themes/anatole/tag.ftl b/src/main/resources/templates/themes/anatole/tag.ftl
index 4a0d1214b..35daa2cd8 100644
--- a/src/main/resources/templates/themes/anatole/tag.ftl
+++ b/src/main/resources/templates/themes/anatole/tag.ftl
@@ -1,28 +1,28 @@
 <#include "module/macro.ftl">
-<@head title="标签：${tag.tagName} · ${options.blog_title!'Anatole'}" keywords="${options.seo_keywords!'Anatole'}" description="${options.seo_desc!'Anatole'}"></@head>
+<@head title="标签：${tag.name} · ${options.blog_title!'Halo'}" keywords="${options.seo_keywords!'Halo'}" description="${options.seo_desc!'Halo'}"></@head>
 <#include "module/sidebar.ftl">
 <div class="main">
     <#include "module/page-top.ftl">
     <div class="autopagerize_page_element">
         <div class="content">
             <#include "module/post_entry.ftl">
-            <#if posts.totalPages gt 1>
+            <#if posts.pages gt 1>
                 <div class="pagination">
                     <ul class="clearfix">
                         <#if posts.hasPrevious()>
                             <#if posts.number == 1>
                                 <li class="pre pagbuttons">
-                                    <a class="btn" role="navigation" href="${options.blog_url!}/tags/${tag.tagUrl}">上一页</a>
+                                    <a class="btn" role="navigation" href="${options.blog_url!}/tags/${tag.slugName}">上一页</a>
                                 </li>
                             <#else >
                                 <li class="pre pagbuttons">
-                                    <a class="btn" role="navigation" href="${options.blog_url!}/tags/${tag.tagUrl}/page/${posts.number}">上一页</a>
+                                    <a class="btn" role="navigation" href="${options.blog_url!}/tags/${tag.slugName}/page/${posts.page}">上一页</a>
                                 </li>
                             </#if>
                         </#if>
                         <#if posts.hasNext()>
                         <li class="next pagbuttons">
-                            <a class="btn" role="navigation" href="${options.blog_url!}/tags/${tag.tagUrl}/page/${posts.number+2}">下一页</a>
+                            <a class="btn" role="navigation" href="${options.blog_url!}/tags/${tag.slugName}/page/${posts.page+2}">下一页</a>
                         </li>
                         </#if>
                     </ul>