From c2be4020054f9333f85d6b5ee5d7feb233eb82e6 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 19 Dec 2018 20:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9F=90=E7=AF=87=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E4=B8=8D=E6=98=BE=E7=A4=BAreadmore=E9=98=85=E8=AF=BB?=
 =?UTF-8?q?=E5=85=A8=E6=96=87=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/_partial/article.ejs | 32 +++++++++++++++++---------------
 layout/_partial/post.ejs    |  2 +-
 layout/links.ejs            | 31 +++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100755 layout/links.ejs

diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index 1416c8e..8e0201f 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -14,6 +14,7 @@
         <% } else if (post.date) { %>
             <h1 class="title"><%= date(post.date, config.date_format) %></h1>
         <% } %>
+
         <time class="time">
             <i class="fas fa-calendar-alt fa-fw" aria-hidden="true"></i>
             <%= date(post.date, config.date_format) %>
@@ -39,21 +40,22 @@
         <div class="article-entry" itemprop="articleBody">
             <%- post.content %>
         </div>
-
-        <section class='meta' id="footer-meta">
-            <time class="time" itemprop="dateUpdated" datetime="<%- moment(post.updated).format() %>" content="<%- date(post.updated, config.date_format) %>">
-                <i class="fas fa-pen fa-fw" aria-hidden="true"></i>&nbsp;本文最后更新于：<%- date(post.updated, config.date_format) %>
-            </time>
-            <% if (post.tags && post.tags.length && post.tags.each) { %>
-                <%
-                var items = [];
-                post.tags.each(function(item){
-                    items.push('<div class="tags"><a class="tag" href="'+url_for(item.path)+'"><i class="fas fa-hashtag fa-fw" aria-hidden="true"></i>&nbsp;' + item.name + '</a></div>');
-                });
-                %>
-                <%- items.join(' ') %>
-            <% } %>
-        </section>
+        <% if(post.layout == 'post'){ %>
+          <section class='meta' id="footer-meta">
+              <time class="time" itemprop="dateUpdated" datetime="<%- moment(post.updated).format() %>" content="<%- date(post.updated, config.date_format) %>">
+                  <i class="fas fa-pen fa-fw" aria-hidden="true"></i>&nbsp;本文最后更新于：<%- date(post.updated, config.date_format) %>
+              </time>
+              <% if (post.tags && post.tags.length && post.tags.each) { %>
+                  <%
+                  var items = [];
+                  post.tags.each(function(item){
+                      items.push('<div class="tags"><a class="tag" href="'+url_for(item.path)+'"><i class="fas fa-hashtag fa-fw" aria-hidden="true"></i>&nbsp;' + item.name + '</a></div>');
+                  });
+                  %>
+                  <%- items.join(' ') %>
+              <% } %>
+          </section>
+        <% } %>
 
         <% if(post.prev || post.next){ %>
             <div class="prev-next">
diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index 95f36f0..44cafcb 100755
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -25,7 +25,7 @@
 
     <section class="article typo">
         <%- post.excerpt || post.description || post.content %>
-        <% if (post.excerpt || post.description) { %>
+        <% if (post.readmore != false && (post.excerpt || post.description)) { %>
             <div class="readmore">
                 <a href="<%- url_for(post.path) %>" class="flat-box">
                     <i class="fas fa-book-open fa-fw" aria-hidden="true"></i>
diff --git a/layout/links.ejs b/layout/links.ejs
new file mode 100755
index 0000000..b09fd8c
--- /dev/null
+++ b/layout/links.ejs
@@ -0,0 +1,31 @@
+<% if (page.links){ %>
+  <% (page.links||[]).forEach(function(group){ %>
+    <% if(group.items) { %>
+      <section class='m_widgets' id='mywidgset'>
+        <% if(group.type) { %>
+          <% if (group.icon) { %>
+            <i class="<%= group.icon %> fa-fw" aria-hidden="true"></i><h2 class='header'><%= group.type %></h2>
+          <%} else {%>
+            <h2 class='header'><%= group.type %></h2>
+          <%} %>
+        <%} %>
+        <% (group.items||[]).forEach(function(item){ %>
+          <div class='friend-wrapper'>
+            <div class='friend-left'>
+              <img class='avatar' src='<%= url_for(item.avatar ? item.avatar : "https://img.vim-cn.com/a4/87a96e2e01b1180bba1e76e190df5220378c1a.png") %>'/>
+            </div>
+            <div class='friend-right'>
+              <h3><%= item.name %></h3>
+              <p><%= item.desc %></p>
+              <div class='friend-tags-wrapper'>
+              <% (item.tags||[]).forEach(function(tag){ %>
+                <a class="tags"><%= tag %></a>
+              <% }) %>
+            </div>
+          </div>
+        <% }) %>
+      </section>
+    <%} %>
+  <% }) %>
+<% } %>
+<%- partial('_partial/article', {post: page, index: false}) %>