diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs index c72a5fd..dfddfa9 100644 --- a/layout/_partial/article.ejs +++ b/layout/_partial/article.ejs @@ -1,88 +1,56 @@ -
- -
- <% if (post.link || post.title){ %> -
- <%- partial('post/title', {class_name: 'article-title'}) %> -
+
+
+ <% + var title = ''; + if (page.category) title = page.category; + if (page.tag) title = "#" + " " + page.tag; + if (page.archive) { + if (page.year) title = page.year + (page.month ? '/' + page.month : ''); + else title = __('archive_a'); + } + %> + <% if (pagination !== 2){ %> +

<%- title %>

<% } %> - - <% if (index || is_post()) { %> - - <% } %> - - <% if (theme.toc && is_post()){ %> - <%- partial('post/tocbot') %> - <% } %> - - <% if (theme.excerpt_all&&index){ %> - <% }else{ %> -
- <%- partial('post/justifiedGallery') %> - <%- partial('post/gallery') %> - <% if (post.excerpt && index){ %> - <%- post.excerpt %> - <% if (theme.excerpt_link){ %> - <%= theme.excerpt_link %> - <% } %> - <% } else { %> - <%- post.content %> - <% } %> - - <% if ((theme.reward_type === 2 || (theme.reward_type === 1 && post.reward)) && !index && !post.no_reward){ %> -
- <%= __('post.reward') %> -
- <% } %> -
- <% } %> - - - <% if (((theme.copyright_type === 2) || (theme.copyright_type === 1 && post.copyright)) && !index){ %> -
-
    -
  • - - <%= __('post.copyright_title') %>: - <%= __('post.copyright_content') %> -
  • -
-
- <% } %> -
- <% if (!index && theme.share_enable){ %> - <%- partial('post/share') %> - <% } %> - <%- partial('post/tag') %> - -
- + <% if (pagination == 2){ %> + <% page.posts.each(function(post){ %> + <%- partial('article', {post: post, index: true}) %> + <% }) %> +
+ <% } else { %> + <% var last; %> + <% page.posts.each(function(post, i){ %> + <% var year = post.date.year(); %> + <% if (last != year){ %> + <% if (last != null){ %>
- - <% if (!index){ %> - <%- partial('post/nav') %> + + <% } %> + <% last = year; %> +
+ +
+ <% } %> + <%- partial('archive-post', {post: post, even: i % 2 == 0}) %> + <% }) %> + <% if (page.posts.length){ %> +
+
+ <% } %> <% } %> - <% if (theme.valine && theme.valine.enable && !post.no_valine){ %> - <%- partial('post/valine', { - key: post.slug, - title: post.title, - url: config.url+url_for(post.path) - }) %> + <% if (page.total > 1){ %> + <% } %> - - <% if (is_post()) { %> - <%- partial('post/gitalk') %> - <% } %> - - <% if (theme.minivaline && theme.minivaline.enable && !post.no_minivaline) { %> - <%- partial('post/minivaline') %> - <% } %> -
\ No newline at end of file + \ No newline at end of file diff --git a/layout/_partial/post/minivaline.ejs b/layout/_partial/post/minivaline.ejs index 62319e3..316bb05 100644 --- a/layout/_partial/post/minivaline.ejs +++ b/layout/_partial/post/minivaline.ejs @@ -7,9 +7,9 @@ - + -<% } %> \ No newline at end of file +<% } %>