Refactor anatole theme

pull/137/head
ruibaby 2019-03-21 16:29:12 +08:00
parent 3ffecd84e4
commit e1be3169c2
10 changed files with 48 additions and 48 deletions

View File

@ -11,10 +11,10 @@
<#list archivesLess as archive> <#list archivesLess as archive>
<div class="listing-title">${archive.year}</div> <div class="listing-title">${archive.year}</div>
<ul class="listing"> <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-item">
<div class="listing-post"> <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"> <div class="post-time">
<span class="date">${post.postDate?string("yyyy-MM-dd")}</span> <span class="date">${post.postDate?string("yyyy-MM-dd")}</span>
</div> </div>

View File

@ -1,28 +1,28 @@
<#include "module/macro.ftl"> <#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"> <#include "module/sidebar.ftl">
<div class="main"> <div class="main">
<#include "module/page-top.ftl"> <#include "module/page-top.ftl">
<div class="autopagerize_page_element"> <div class="autopagerize_page_element">
<div class="content"> <div class="content">
<#include "module/post_entry.ftl"> <#include "module/post_entry.ftl">
<#if posts.totalPages gt 1> <#if posts.pages gt 1>
<div class="pagination"> <div class="pagination">
<ul class="clearfix"> <ul class="clearfix">
<#if posts.hasPrevious()> <#if posts.hasPrevious()>
<#if posts.number == 1> <#if posts.page == 1>
<li class="pre pagbuttons"> <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> </li>
<#else > <#else >
<li class="pre pagbuttons"> <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> </li>
</#if> </#if>
</#if> </#if>
<#if posts.hasNext()> <#if posts.hasNext()>
<li class="next pagbuttons"> <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> </li>
</#if> </#if>
</ul> </ul>

View File

@ -12,7 +12,7 @@
<div id="main"> <div id="main">
<header id="header"> <header id="header">
<h1>图库</h1> <h1>图库</h1>
<p>${user.userDesc!}</p> <p>${user.description!}</p>
<ul class="icons"> <ul class="icons">
<!-- <!--
<li><a href="#" class="icon fa-twitter"><span class="label">Twitter</span></a></li> <li><a href="#" class="icon fa-twitter"><span class="label">Twitter</span></a></li>
@ -26,9 +26,9 @@
<#if galleries?size gt 0> <#if galleries?size gt 0>
<#list galleries as gallery> <#list galleries as gallery>
<article> <article>
<a class="thumbnail" href="${gallery.galleryUrl}" data-position="left center"><img src="${gallery.galleryThumbnailUrl}" alt="${gallery.galleryDesc}" /></a> <a class="thumbnail" href="${gallery.url}" data-position="left center"><img src="${gallery.thumbnail}" alt="${gallery.description}" /></a>
<h2>${gallery.galleryName}</h2> <h2>${gallery.name}</h2>
<p>${gallery.galleryDate!}</p> <p>${gallery.takeTime!}</p>
</article> </article>
</#list> </#list>
</#if> </#if>

View File

@ -1,28 +1,28 @@
<#include "module/macro.ftl"> <#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"> <#include "module/sidebar.ftl">
<div class="main"> <div class="main">
<#include "module/page-top.ftl"> <#include "module/page-top.ftl">
<div class="autopagerize_page_element"> <div class="autopagerize_page_element">
<div class="content"> <div class="content">
<#include "module/post_entry.ftl"> <#include "module/post_entry.ftl">
<#if posts.totalPages gt 1> <#if posts.pages gt 1>
<div class="pagination"> <div class="pagination">
<ul class="clearfix"> <ul class="clearfix">
<#if posts.hasPrevious()> <#if posts.hasPrevious()>
<#if posts.number == 1> <#if posts.page == 1>
<li class="pre pagbuttons"> <li class="pre pagbuttons">
<a class="btn" role="navigation" href="${options.blog_url!}/">上一页</a> <a class="btn" role="navigation" href="${options.blog_url!}/">上一页</a>
</li> </li>
<#else > <#else >
<li class="pre pagbuttons"> <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> </li>
</#if> </#if>
</#if> </#if>
<#if posts.hasNext()> <#if posts.hasNext()>
<li class="next pagbuttons"> <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> </li>
</#if> </#if>
</ul> </ul>

View File

@ -1,5 +1,5 @@
<#include "module/macro.ftl"> <#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"> <#include "module/sidebar.ftl">
<div class="main"> <div class="main">
<#include "module/page-top.ftl"> <#include "module/page-top.ftl">
@ -15,9 +15,9 @@
<#if links?? && links?size gt 0> <#if links?? && links?size gt 0>
<#list links as link> <#list links as link>
<p> <p>
<a href="${link.linkUrl}" target="_blank" rel="external">${link.linkName}</a> <a href="${link.url}" target="_blank" rel="external">${link.name}</a>
<#if link.linkDesc!=''> <#if link.description!=''>
${link.linkDesc} ${link.description}
</#if> </#if>
</p> </p>
</#list> </#list>

View File

@ -1,9 +1,9 @@
<div class="page-top animated fadeInDown"> <div class="page-top animated fadeInDown">
<div class="nav"> <div class="nav">
<@commonTag method="menus"> <@commonTag method="menus">
<#list menus?sort_by('menuSort') as menu> <#list menus?sort_by('sort') as menu>
<li> <li>
<a href="${menu.menuUrl}" target="${menu.menuTarget!}">${menu.menuName} </a> <a href="${menu.url}" target="${menu.target!}">${menu.name} </a>
</li> </li>
</#list> </#list>
</@commonTag> </@commonTag>

View File

@ -2,12 +2,12 @@
<div class="post animated fadeInDown"> <div class="post animated fadeInDown">
<div class="post-title"> <div class="post-title">
<h3> <h3>
<a href="${options.blog_url!}/archives/${post.postUrl}">${post.postTitle}</a> <a href="${options.blog_url!}/archives/${post.url}">${post.title}</a>
</h3> </h3>
</div> </div>
<div class="post-content"> <div class="post-content">
<div class="p_part"> <div class="p_part">
<p>${post.postSummary!}...</p> <p>${post.summary!}...</p>
</div> </div>
<div class="p_part"> <div class="p_part">
<p></p> <p></p>
@ -17,13 +17,13 @@
<div class="meta"> <div class="meta">
<div class="info"> <div class="info">
<i class="fa fa-sun-o"></i> <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> <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> <#if post.tags?size gt 0>
<i class="fa fa-tag"></i> <i class="fa fa-tag"></i>
<#list post.tags as tag> <#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> </#list>
</#if> </#if>
</div> </div>

View File

@ -1,5 +1,5 @@
<#include "module/macro.ftl"> <#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"> <#include "module/sidebar.ftl">
<div class="main"> <div class="main">
<link href="/anatole/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" /> <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 animated fadeInDown">
<div class="post-title"> <div class="post-title">
<h3> <h3>
<a>${post.postTitle}</a> <a>${post.title!}</a>
</h3> </h3>
</div> </div>
<div class="post-content"> <div class="post-content">
${post.postContent!} ${post.formatContent!}
</div> </div>
<div class="post-footer"> <div class="post-footer">
<div class="meta"> <div class="meta">
<div class="info"> <div class="info">
<i class="fa fa-sun-o"></i> <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> <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> </div>
</div> </div>
@ -67,7 +67,7 @@
class="fa fa-weibo"></a> class="fa fa-weibo"></a>
</div> </div>
<div class="twitter"> <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> class="fa fa-twitter"></a>
</div> </div>
</div> </div>

View File

@ -1,5 +1,5 @@
<#include "module/macro.ftl"> <#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"> <#include "module/sidebar.ftl">
<div class="main"> <div class="main">
<link href="/anatole/source/plugins/prism/prism.css" type="text/css" rel="stylesheet" /> <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 animated fadeInDown">
<div class="post-title"> <div class="post-title">
<h3> <h3>
<a>${post.postTitle}</a> <a>${post.title}</a>
</h3> </h3>
</div> </div>
<div class="post-content"> <div class="post-content">
${post.postContent!} ${post.formatContent!}
</div> </div>
<div class="post-footer"> <div class="post-footer">
<div class="meta"> <div class="meta">
<div class="info"> <div class="info">
<i class="fa fa-sun-o"></i> <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> <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> <#if post.tags?size gt 0>
<i class="fa fa-tag"></i> <i class="fa fa-tag"></i>
<#list post.tags as tag> <#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> </#list>
</#if> </#if>
</div> </div>
@ -73,7 +73,7 @@
class="fa fa-weibo"></a> class="fa fa-weibo"></a>
</div> </div>
<div class="twitter"> <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> class="fa fa-twitter"></a>
</div> </div>
</div> </div>
@ -81,12 +81,12 @@
<ul class="clearfix"> <ul class="clearfix">
<#if nextPost??> <#if nextPost??>
<li class="pre pagbuttons"> <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> </li>
</#if> </#if>
<#if prePost??> <#if prePost??>
<li class="next pagbuttons"> <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> </li>
</#if> </#if>
</ul> </ul>

View File

@ -1,28 +1,28 @@
<#include "module/macro.ftl"> <#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"> <#include "module/sidebar.ftl">
<div class="main"> <div class="main">
<#include "module/page-top.ftl"> <#include "module/page-top.ftl">
<div class="autopagerize_page_element"> <div class="autopagerize_page_element">
<div class="content"> <div class="content">
<#include "module/post_entry.ftl"> <#include "module/post_entry.ftl">
<#if posts.totalPages gt 1> <#if posts.pages gt 1>
<div class="pagination"> <div class="pagination">
<ul class="clearfix"> <ul class="clearfix">
<#if posts.hasPrevious()> <#if posts.hasPrevious()>
<#if posts.number == 1> <#if posts.number == 1>
<li class="pre pagbuttons"> <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> </li>
<#else > <#else >
<li class="pre pagbuttons"> <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> </li>
</#if> </#if>
</#if> </#if>
<#if posts.hasNext()> <#if posts.hasNext()>
<li class="next pagbuttons"> <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> </li>
</#if> </#if>
</ul> </ul>