模板重构, 归档样式更新, 增加category支持, release 0.4.1

README.md

@@ -16,7 +16,13 @@ Material Design 风格的Hexo主题，基于 Hexo 3.0+ 制作。预览 [我的
 
 ## 使用
 
-[Document](https://github.com/yscoder/hexo-theme-indigo/wiki)
+[文档|Document](https://github.com/yscoder/hexo-theme-indigo/wiki)
+
+## 更新日志
+
+升级前请仔细查看更改内容，如非必要可不升级。
+
+[Log](https://github.com/yscoder/hexo-theme-indigo/wiki/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97)
 
 
 ## 截图
@@ -31,6 +37,13 @@ Material Design 风格的Hexo主题，基于 Hexo 3.0+ 制作。预览 [我的
 
 ### Phone
 
-![indigo-phone-1](https://github.com/yscoder/hexo-theme-indigo/raw/master/screenshots/hexo-theme-phone-1.png)
-![indigo-phone-2](https://github.com/yscoder/hexo-theme-indigo/raw/master/screenshots/hexo-theme-phone-2.png)
+![indigo-phone](https://github.com/yscoder/hexo-theme-indigo/raw/master/screenshots/hexo-theme-phone.png)
+
+### Search
+
+![indigo-search](https://github.com/yscoder/hexo-theme-indigo/raw/master/screenshots/hexo-theme-search.png)
+
+### Archive
+
+![indigo-archive](https://github.com/yscoder/hexo-theme-indigo/raw/master/screenshots/hexo-theme-archive.png)
 

layout/_partial/archive.ejs

@@ -1,48 +1,11 @@
-<% if (pagination == 2){ %>
-  <ul class="post-list">
-  <% page.posts.each(function(post){ %>
-    <li class="post-list-item"><%- partial('article', {post: post, index: true}) %></li>
-  <% }) %>
-  </ul>
-  <% if (page.total > 1){ %>
-    <nav id="page-nav">
-      <div class="inner">
-        <%- paginator({
-          prev_text: '上一页',
-          next_text: '下一页'
-        }) %>
-      </div>
-    </nav>
-  <% } %>
-<% } else { %>
-  <% var last; %>
-  <% page.posts.each(function(post, i){ %>
-    <% var year = post.date.year(); %>
-    <% if (last != year){ %>
-      <% if (last != null){ %>
-        </div></section>
-      <% } %>
-      <% last = year; %>
-      <section class="archives-wrap flex-row">
-        <div class="archive-year-wrap">
-          <a href="<%- url_for('archives/' + year) %>" class="archive-year waves-effect waves-circle waves-light"><%= year %></a>
-        </div>
-        <div class="archives flex-col">
-    <% } %>
-    <%- partial('archive-post', {post: post, even: i % 2 == 0}) %>
-  <% }) %>
-  <% if (page.posts.length){ %>
-      </div>
-    </section>
-  <% } %>
-  <% if (page.total > 1){ %>
-    <nav id="page-nav">
-      <div class="inner">
-        <%- paginator({
-          prev_text: '上一页',
-          next_text: '下一页'
-        }) %>
-      </div>
-    </nav>
-  <% } %>
-<% } %>
+<article class="archive-article">
+  <div class="archive-article-date">
+    <%- partial('post/date', { post: post, date_format: 'MMM D'}) %>
+  </div>
+  <div class="archive-article-inner">
+    <%- partial('post/title', {
+      hasLink: true
+    }) %>
+    <%- partial('post/tag') %>
+  </div>
+</article>

layout/_partial/article.ejs

@@ -1,9 +1,7 @@
-<% if(post.type == 'tags') { %>
-  <%- partial('post/tags') %>
-<% } else { %>
-  <article id="<%= post.layout %>-<%= post.slug %>" class="article article-type-<%= post.layout %>" itemprop="blogPost">
+<article id="<%= post.layout %>-<%= post.slug %>" 
+  class="article article-type-<%= post.layout %>" itemprop="blogPost">
     <% if(index) { %>
-      <%- partial('post/title') %>
+      <%- partial('post/title', { hasLink: true }) %>
       <div class="post-meat flex-row">
         <div class="flex-col"><%- partial('post/tag') %></div>
         <%- partial('post/date', {date_format: config.date_format}) %>
@@ -19,51 +17,9 @@
         <a href="<%- url_for(post.path) %>" class="post-more waves-effect waves-button waves-light">MORE</a>
       </div>
     <% } else { %>
-      <div class="post-meat flex-row">
-        <div class="flex-col"><%- partial('post/tag') %></div>
-      </div>
-      <div class="post-body">
-
-        <aside class="post-widget" id="post-widget">
-
-          <% if(theme.share){ %>
-          <%- partial('post/share', {
-                className: 'post-share'
-            }) %>
-          <% } %>
-
-          <% if(theme.toc){ %>
-          <nav class="post-toc-wrap" id="post-toc">
-            <%- toc(post.content, {
-                class: 'post-toc',
-                list_number: theme.toc.list_number
-                }) %>
-          </nav>
-          <% } %>
-        </aside>
-
-        <div class="post-main">
-
-            <div class="post-content" id="post-content" itemprop="postContent">
-            <%- post.content %>
-            <blockquote>
-              <p>
-                本文地址：
-                <a href="<%- page.permalink%>" target="_blank" rel="external"><%- page.permalink %></a>
-              </p>
-              <footer><cite><a href="<%- config.url %>">@<%- config.title %></a></cite></footer>
-            </blockquote>
-            </div>
-            <%- partial('post/nav') %>
-
-            <%- partial('post/comment') %>
-
-        </div>
-
-      </div>
+      
+        <%- partial('post') %>
 
     <% } %>
 
-  </article>
-
-<% } %>
+</article>

layout/_partial/header.ejs

@@ -25,6 +25,12 @@
 <header class="content-header">
   <div class="container">
     <h1 class="author"><%=page.title || config.title %></h1>
-    <h5 class="subtitle"><%=(page.date && !page.noDate ? date(page.date, config.date_format) : config.subtitle) %></h5>
+    <h5 class="subtitle">
+        <% if(page.date && !page.noDate){ %>  
+            <%- partial('post/head-meta') %> 
+        <% } else { %> 
+        <%=config.subtitle %>
+        <% }%>
+    </h5>
   </div>
 </header>

layout/_partial/index-item.ejs

@@ -0,0 +1,17 @@
+<article id="<%= post.layout %>-<%= post.slug %>" 
+  class="article article-type-<%= post.layout %>" itemprop="blogPost">
+     <%- partial('post/title', { hasLink: true }) %>
+    <div class="post-meta">
+        <%- partial('post/date', {date_format: config.date_format}) %>
+        <%- partial('post/category') %> 
+    </div>
+
+    <div class="post-content" id="post-content" itemprop="postContent" >
+    <% if (post.excerpt){ %>
+        <%- post.excerpt %>
+    <% } else { %>
+        <%- post.content %>
+    <% } %>
+    </div>
+    <%- partial('post/tag') %>
+</article>

layout/_partial/post.ejs

@@ -0,0 +1,42 @@
+<article id="<%= post.layout %>-<%= post.slug %>" 
+  class="article article-type-<%= post.layout %>" itemprop="blogPost">
+    <div class="post-meat flex-row">
+        <%- partial('post/tag') %>
+    </div>
+    <div class="post-body">
+        <aside class="post-widget" id="post-widget">
+
+            <% if(theme.share){ %>
+            <%- partial('post/share', {
+                className: 'post-share'
+            }) %>
+            <% } %>
+
+            <% if(theme.toc){ %>
+            <nav class="post-toc-wrap" id="post-toc">
+            <%- toc(post.content, {
+                class: 'post-toc',
+                list_number: theme.toc.list_number
+                }) %>
+            </nav>
+            <% } %>
+        </aside>
+
+        <div class="post-main">
+
+            <div class="post-content" id="post-content" itemprop="postContent">
+            <%- post.content %>
+            <blockquote>
+                <p>
+                本文地址：
+                <a href="<%- page.permalink%>" target="_blank" rel="external"><%- page.permalink %></a>
+                </p>
+                <footer><cite><a href="<%- config.url %>">@<%- config.title %></a></cite></footer>
+            </blockquote>
+            </div>
+            <%- partial('post/nav') %>
+
+            <%- partial('post/comment') %>
+        </div>
+    </div>
+</article>

layout/_partial/post/category.ejs

@@ -1,10 +1,8 @@
 <% if (post.categories && post.categories.length){ %>
-	<div class="article-category tagcloud">
 	<%- list_categories(post.categories, {
 	  show_count: false,
 	  class: 'article-category',
-	  style: 'none',
-	  separator: ''
+		style: 'list'
 	}) %>
-	</div>
 <% } %>
+

layout/_partial/post/comment.ejs

@@ -1,12 +1,12 @@
-<% if (!index && theme.duoshuo && post.comments){ %>
+<% if (theme.duoshuo && post.comments){ %>
 <%- partial('duoshuo', {
     key: post.slug,
     title: post.title,
     url: url
   }) %>
 <% } %>
 
-<% if (!index && post.comments && config.disqus_shortname){ %>
+<% if (post.comments && config.disqus_shortname){ %>
 <section id="comments">
   <div id="disqus_thread"></div>
     <script type="text/javascript">

layout/_partial/post/date.ejs

@@ -1,3 +1,3 @@
-<time datetime="<%= date_xml(post.date) %>" itemprop="datePublished" class="post-tiem">
-  <%= date(post.date, date_format) %>
-</time>
+<time datetime="<%= date_xml(post.date) %>" itemprop="datePublished" class="post-time">
+  <%= post.date.format(date_format) %>
+</time>

layout/_partial/post/head-meta.ejs

@@ -0,0 +1,11 @@
+<time datetime="<%= date_xml(page.date) %>" itemprop="datePublished" class="page-time">
+  <%= page.date.format(config.date_format) %>
+</time>
+
+<% if (page.categories && page.categories.length){ %>
+	<%- list_categories(page.categories, {
+	  show_count: false,
+	  class: 'article-category',
+		style: 'list'
+	}) %>
+<% } %>

layout/_partial/post/title.ejs

@@ -7,7 +7,7 @@
     <a class="post-title-link" href="<%- url_for(post.link) %>" target="_blank" itemprop="url"><%- post.title %></a>
   </h3>
 <% } else if (post.title){ %>
-  <% if (index){ %>
+  <% if (hasLink){ %>
     <h3 class="post-title" itemprop="name">
       <a class="post-title-link" href="<%- url_for(post.path) %>"><%= post.title %></a>
     </h3>

layout/archive.ejs

@@ -1 +1,37 @@
-<%- partial('_partial/archive', {pagination: config.archive, index: true}) %>
+<%
+    var posts = [];
+    page.posts.each(function(post){
+        posts.push(post);
+    });
+    var sortPosts = _.orderBy(posts, ['date'], ['desc']);
+%>
+
+<% 
+  var y = 0, m = 0;
+  sortPosts.forEach(function(post, i){  
+      var dt = post.date;
+      var ny = post.date.year();
+      var nm = post.date.month();
+
+      if(ny !== y || nm !== m) { 
+
+          y = ny;
+          m = nm;
+%>
+        <h3 class="archive-separator"><%=dt.format('MMMM, YYYY')%></h3>
+
+<%    } %>
+
+     <%- partial('_partial/archive', {post: post}) %>  
+<%})%>
+
+<% if (page.total > 1){ %>
+<nav id="page-nav">
+    <div class="inner">
+    <%- paginator({
+        prev_text: '上一页',
+        next_text: '下一页'
+    }) %>
+    </div>
+</nav>
+<% } %>

layout/category.ejs

@@ -1 +1 @@
-<%- partial('_partial/archive', {pagination: config.archive, index: true}) %>
+<%- partial('archive', {pagination: config.archive}) %>

layout/index.ejs

@@ -1 +1,20 @@
-<%- partial('_partial/archive', {pagination: 2, index: true}) %>
+<ul class="post-list">
+  <% page.posts.each(function(post){ %>
+    <li class="post-list-item">
+        <%- partial('_partial/index-item', {
+            post: post, 
+            index: true
+        }) %>
+    </li>
+  <% }) %>
+</ul>
+<% if (page.total > 1){ %>
+<nav id="page-nav">
+    <div class="inner">
+    <%- paginator({
+        prev_text: '上一页',
+        next_text: '下一页'
+    }) %>
+    </div>
+</nav>
+<% } %>

layout/page.ejs

@@ -1 +1 @@
-<%- partial('_partial/article', {post: page, index: false}) %>
+<%- partial('_partial/post', {post: page }) %>

layout/post.ejs

@@ -1 +1 @@
-<%- partial('_partial/article', {post: page, index: false}) %>
+<%- partial('_partial/post', {post: page }) %>

layout/tag.ejs

@@ -1 +1 @@
-<%- partial('_partial/archive', {pagination: config.archive, index: true}) %>
+<%- partial('archive', {pagination: config.archive}) %>

package.json

@@ -1,5 +1,5 @@
 {
     "name": "hexo-theme-material-indigo",
-    "version": "0.3.1",
+    "version": "0.4.1",
     "private": true
 }