hexo-theme-volantis 4.3.1 → 5.0.0-beta.2

package/layout/_plugins/rightmenu/layout.ejs

@@ -0,0 +1,119 @@
+<% if (theme.rightmenu.enable == true && theme.rightmenu.layout.length > 0) { %>
+  <% let faIcon = theme.rightmenu.faicon %>
+  <% function loadmenu(obj) { %>
+    <li class="menuLoad-Content">
+      <a class='vlts-menu fix-cursor-default' <%= obj.url ? 'href='+ url_for(obj.url)+'' : ''%>
+        <% if (obj.rel) { %>
+          rel="<%- obj.rel %>"
+        <% } %>
+        <% if (obj.target) { %>
+          target="<%- obj.target %>"
+        <% } %>
+        <% if (obj.onclick) { %>
+          onclick="<%- obj.onclick %>"
+        <% } %>
+        <% if (obj.id) { %>
+          id="<%- obj.id %>"
+        <% } else if (obj.url) { %>
+          id="<%= url_for(obj.url).replace(/\/|%|\./g, "")?url_for(obj.url).replace(/\/|%|\./g, ""):"home" %>"
+        <% } %>
+      >
+        <% if (obj.icon) { %><i class='<%= obj.icon %> fa-fw'></i><% } %> <%- obj.name %>
+      </a>
+    </li>
+  <% } %>
+  <div id="rightmenu-wrapper">
+    <ul class="list-v rightmenu" id="rightmenu-content">
+      <li class='navigation menuNavigation-Content'>
+        <a class='nav icon-only fix-cursor-default' onclick='history.back()'><i class='<%= faIcon %> fa-arrow-left fa-fw'></i></a>
+        <a class='nav icon-only fix-cursor-default' onclick='history.forward()'><i class='<%= faIcon %> fa-arrow-right fa-fw'></i></a>
+        <a class='nav icon-only fix-cursor-default' onclick='window.location.reload()'><i class='<%= faIcon %> fa-redo fa-fw'></i></a>
+        <a class='nav icon-only fix-cursor-default' href='/'><i class='<%= faIcon %> fa-home fa-fw'></i></a>
+      </li>
+      <li class='option menuOption-Content'>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='copyText'>
+          <% let copy_text = __('rightmenu.copy_text') %>
+          <i class='<%= faIcon %> fa-copy fa-fw'></i> <%- trim(copy_text) %>
+        </span>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='copyPaste'>
+          <% let copy_paste = __('rightmenu.copy_paste') %>
+          <i class='<%= faIcon %> fa-paste fa-fw mR12'></i> <%- trim(copy_paste) %>
+        </span>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='copySelect'>
+          <% let copy_select = __('rightmenu.copy_select') %>
+          <i class='<%= faIcon %> fa-object-ungroup fa-fw mR12'></i> <%- trim(copy_select) %>
+        </span>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='copyCut'>
+          <% let copy_cut = __('rightmenu.copy_cut') %>
+          <i class='<%= faIcon %> fa-cut fa-fw mR12'></i> <%- trim(copy_cut) %>
+        </span>
+        <% if (theme.search.enable) { %>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='searchWord'>
+          <% let search_word = __('rightmenu.search_word') %>
+          <i class='<%= faIcon %> fa-search fa-fw'></i> <%- trim(search_word) %>
+        </span>
+        <% } %>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='openTab'>
+          <% let open_in_new_tab = __('rightmenu.open_in_new_tab') %>
+          <i class='<%= faIcon %> fa-external-link-square-alt fa-fw mR12'></i> <%- trim(open_in_new_tab) %>
+        </span>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='copySrc'>
+          <% let copy_image_src = __('rightmenu.copy_image_src') %>
+          <i class='<%= faIcon %> fa-image fa-fw mR12'></i> <%- trim(copy_image_src) %>
+        </span>
+        <span class='vlts-menu opt fix-cursor-default menu-Option' data-fn-type='copyImg'>
+          <% let copy_image_file = __('rightmenu.copy_image_file') %>
+          <i class='<%= faIcon %> fa-images fa-fw mR12'></i> <%- trim(copy_image_file) %>
+        </span>
+      </li>
+      <% theme.rightmenu.layout.forEach(function(item){ %>
+        <% if (item == 'hr') { %>
+          <hr class="menuLoad-Content">
+        <% } else if (item == 'darkmode') { %>
+          <li class='option menuOption-Content'>
+            <span class='vlts-menu opt fix-cursor-default toggle-mode-btn' id='menuDarkBtn'>
+              <i class='<%= theme.rightmenu.darkmode.icon %> fa-fw '></i> <%- trim(theme.rightmenu.darkmode.name) %>
+            </span>
+          </li>
+        <% } else if (item == 'print') { %>
+          <li class='option menuOption-Content'>
+            <span class='vlts-menu opt fix-cursor-default' id='printHtml'>
+              <i class='<%= theme.rightmenu.print.icon %> fa-fw '></i> <%- trim(theme.rightmenu.print.name) %>
+            </span>
+          </li>  
+        <% } else if (item == 'reading') { %>
+          <li class='option menuOption-Content'>
+            <span class='vlts-menu opt fix-cursor-default' id='readingModel'>
+              <i class='<%= theme.rightmenu.reading.icon %> fa-fw '></i> <%- trim(theme.rightmenu.reading.name) %>
+            </span>
+          </li>  
+        <% } else if (item == 'music' && theme.plugins.aplayer.enable == true) { %>
+          <div id="menuMusic">
+            <li class='music name menuOption-Content'>
+              <p class='nav music-title fix-cursor-default'></p>
+            </li>
+            <li class='music ctrl'>
+              <a class='nav icon-only backward fix-cursor-default' onclick='RightMenuAplayer.aplayerBackward()'><i class='<%= faIcon %> fa-step-backward fa-fw '></i></a>
+              <a class='nav icon-only toggle fix-cursor-default' onclick='RightMenuAplayer.aplayerToggle()'><i class='<%= faIcon %> fa-play fa-fw '></i></a>
+              <a class='nav icon-only forward fix-cursor-default' onclick='RightMenuAplayer.aplayerForward()'><i class='<%= faIcon %> fa-step-forward fa-fw '></i></a>
+            </li>
+            <li class='music volume'>
+              <div class='nav volume'>
+                <div class="aplayer-volume-bar-wrap">
+                  <div class="aplayer-volume-bar fix-cursor-pointer">
+                    <div class="aplayer-volume"></div>
+                    <i class='left <%= faIcon %> fa-volume-off fa-fw'></i>
+                    <i class='right <%= faIcon %> fa-volume-up fa-fw'></i>
+                  </div>
+                </div>
+              </div>
+            </li>
+          </div>
+        <% } else if (item in theme.rightmenu) { %>
+          <% loadmenu(theme.rightmenu[item]) %>
+        <% } %>
+      <% }) %>
+    </ul>
+  </div>
+  <script>volantis.js('<%- theme.cdn.map.js.rightMenu %>')</script>
+<% } %>

package/layout/_plugins/scrollreveal/script.ejs

@@ -0,0 +1,25 @@
+<script type="text/javascript">
+  function pjax_scrollrebeal() {
+    ScrollReveal().reveal("#l_main .reveal", {
+      distance: "<%- theme.plugins.scrollreveal.distance %>",
+      duration: "<%- theme.plugins.scrollreveal.duration %>",
+      interval: "<%- theme.plugins.scrollreveal.interval %>",
+      scale: "<%- theme.plugins.scrollreveal.scale %>",
+      easing: "ease-out",
+    });
+  }
+  function init_scrollrebeal() {
+    if (typeof ScrollReveal == "undefined") {
+      volantis.requestAnimationFrame(init_scrollrebeal);
+    } else {
+      pjax_scrollrebeal();
+    }
+  }
+  volantis.js("<%- theme.plugins.scrollreveal.js %>");
+  document.addEventListener("DOMContentLoaded", init_scrollrebeal);
+  volantis.pjax.push(
+    pjax_scrollrebeal,
+    "pjax_scrollrebeal",
+    (setRequestAnimationFrame = false)
+  );
+</script>

package/layout/_plugins/search/script.ejs

@@ -0,0 +1,39 @@
+<script>
+  const SearchServiceDataPathRoot = ("<%- config.root %>" || "/").endsWith("/")
+    ? "<%- config.root %>" || "/"
+    : "<%- config.root %>/" || "/";
+  const SearchServiceDataPath = SearchServiceDataPathRoot + "content.json";
+
+  function loadSearchScript() {
+    // see: layout/_partial/scripts/_ctrl/cdnCtrl.ejs
+    return volantis.js("<%- theme.cdn.map.js.search %>");
+  }
+
+  function loadSearchService() {
+    loadSearchScript();
+    document.querySelectorAll(".input.u-search-input").forEach((e) => {
+      e.removeEventListener("focus", loadSearchService, false);
+    });
+  }
+
+  // 打开并搜索 字符串 s
+  function OpenSearch(s) {
+    loadSearchScript().then(() => {
+      SearchService.setQueryText(s);
+      SearchService.search();
+    });
+  }
+
+  // 访问含有 ?s=xxx  的链接时打开搜索 // 与搜索引擎 structured data 相关: /scripts/helpers/structured-data/lib/config.js
+  if (window.location.search && /^\?s=/g.test(window.location.search)) {
+    let queryText = decodeURI(window.location.search)
+      .replace(/\ /g, "-")
+      .replace(/^\?s=/g, "");
+    OpenSearch(queryText);
+  }
+
+  // 搜索输入框获取焦点时加载搜索
+  document.querySelectorAll(".input.u-search-input").forEach((e) => {
+    e.addEventListener("focus", loadSearchService, false);
+  });
+</script>

package/layout/_plugins/swiper/script.ejs

@@ -0,0 +1,37 @@
+<script>
+  function load_swiper() {
+    if (!document.querySelectorAll(".swiper-container")[0]) return;
+    volantis.css("<%- theme.plugins.swiper.css %>");
+    volantis.js("<%- theme.plugins.swiper.js %>").then(() => {
+      pjax_swiper();
+    });
+  }
+
+  load_swiper();
+
+  function pjax_swiper() {
+    volantis.swiper = new Swiper('.swiper-container', {
+      slidesPerView: 'auto',
+      spaceBetween: 8,
+      centeredSlides: true,
+      loop: true,
+      pagination: {
+        el: '.swiper-pagination',
+        clickable: true,
+      },
+      navigation: {
+        nextEl: '.swiper-button-next',
+        prevEl: '.swiper-button-prev',
+      },
+    });
+  }
+
+  volantis.pjax.push(() => {
+    if (!document.querySelectorAll(".swiper-container")[0]) return;
+    if (typeof volantis.swiper === "undefined") {
+      load_swiper();
+    } else {
+      pjax_swiper();
+    }
+  });
+</script>

package/layout/_pre.ejs

@@ -1,4 +1,4 @@
-<%
+<%_
 if (page.cover == undefined && theme.cover) {
   if (is_home() && page.prev == 0) {
     page.cover = theme.cover.display.home;
@@ -42,4 +42,4 @@ if (config.theme_config && config.theme_config.style) {
   }
 }
 
-%>
+_%>

package/layout/_widget/_pre.ejs

@@ -18,4 +18,9 @@ if (where == 'sidebar') {
   page.widget_style += theme.custom_css.body.effect.join(' ');
 }
 page.widget_platform = pf.join(' ');
+if (item.pjaxReload || item.pjaxReload===undefined){
+  page.widget_pjax = "pjax"
+}else{
+  page.widget_pjax = ""
+}
 %>

package/layout/_widget/blogger.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <div class='content'>
     <% if (item.avatar) { %>
       <% if (item.url) { %>

package/layout/_widget/category.ejs

@@ -1,13 +1,13 @@
 <% if (site.categories.length){ %>
   <%- partial('_pre') %>
-  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <ul class="entry navigation">
         <% site.categories.sort('path').each(function(category){ %>
           <li><a class="flat-box<%= category.parent ? ' child' : ''%>"
             title="<%- url_for(category.path) %>" href="<%- url_for(category.path) %>"
-            id="<%= url_for(category.path).replace(/\/|%|\./g, "")?url_for(category.path).replace(/\/|%|\./g, ""):"home" %>"
+            active-action="action-<%= url_for(category.path).replace(/\/|%|\./g, "")?url_for(category.path).replace(/\/|%|\./g, ""):"home" %>"
             ><div class='name'><%- category.name %></div><div class='badge'>(<%- category.posts.length %>)</div></a></li>
         <% }) %>
       </ul>

package/layout/_widget/copyright.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <div class='content'>
     <% if (item.blockquote == true) { %>
       <blockquote>

package/layout/_widget/grid.ejs

@@ -1,17 +1,17 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <div class="grid navigation<%- item.fixed ? ' fixed' : '' %>">
       <% (item.rows||[]).forEach(function(row){ %>
-        <a class="flat-box" title="<%- url_for(row.url) %>" href="<%- url_for(row.url) %>"
+        <a class="flat-box" href="<%- url_for(row.url) %>"
           <% if (row.rel) { %>
             rel="<%- row.rel %>"
           <% } %>
           <% if (row.target) { %>
             target="<%- row.target %>"
           <% } %>
-          id="<%= url_for(row.url).replace(/\/|%|\./g, "")?url_for(row.url).replace(/\/|%|\./g, ""):"home" %>">
+          active-action="action-<%= url_for(row.url).replace(/\/|%|\./g, "")?url_for(row.url).replace(/\/|%|\./g, ""):"home" %>">
           <% if (row.img) { %>
             <img src="<%- row.img %>">
           <% } else if(row.avatar) { %>

package/layout/_widget/lastupdate.ejs

@@ -0,0 +1,27 @@
+<% 
+function genList() { 
+  let content = ''; 
+  site.posts.filter(p => { 
+    return p.title && p.title.length > 0; 
+  }).sort("updated", -1).limit(5).each(item => { 
+    content += `<li><a class="widget-last" href="${url_for(item.link || item.path)}">`; 
+    content += '<div class="item">'; 
+    content += `<time>${date(item.updated, config.date_format)}</time>`; 
+    item.categories.limit(1).forEach((cat, i) => { 
+      content += `<span>${cat.name}</span>`; 
+    }); 
+    content += '</div>'; 
+    content += `<span>${item.title}</span>`; 
+    content += '</a></li>'; 
+    content += ''; 
+  }) 
+  return `<ul class="list entry navigation">${content}</ul>`; 
+} 
+%> 
+<%- partial('_pre') %> 
+<section class="widget <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>"> 
+  <%- partial('header', {item: item}) %> 
+  <div class='content'> 
+    <%- genList() %> 
+  </div> 
+</section> 

package/layout/_widget/list.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class == 'list' ? item.class : 'list ' + item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class == 'list' ? item.class : 'list ' + item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <ul class="list entry navigation">
@@ -11,7 +11,7 @@
           <% if (row.target) { %>
             target="<%- row.target %>"
           <% } %>
-          id="<%= url_for(row.url).replace(/\/|%|\./g, "")?url_for(row.url).replace(/\/|%|\./g, ""):"home" %>"
+          active-action="action-<%= url_for(row.url).replace(/\/|%|\./g, "")?url_for(row.url).replace(/\/|%|\./g, ""):"home" %>"
           >
           <div class='name'>
             <% if (row.img) { %>

package/layout/_widget/load.ejs

@@ -4,3 +4,21 @@
     <%- partial(w.class, {item: w, where: where}) %>
   <% } %>
 <% }) %>
+<%
+let widget_pjax_length = 0;
+page.sidebar.forEach(function(e){
+  if (e&&theme.sidebar.widget_library&&theme.sidebar.widget_library[e]) {
+    let widget_pjax_flag = theme.sidebar.widget_library[e].pjaxReload
+    if (widget_pjax_flag || widget_pjax_flag===undefined) {
+      widget_pjax_length ++;
+    }
+  }
+})
+let widget_pjax_place_length = Object.keys(theme.sidebar.widget_library).length - widget_pjax_length
+%>
+<!-- 没有 pjax 占位会报错 万恶的 pjax -->
+<% for(let i=0;i<widget_pjax_place_length;i++){ %>
+  <div class="pjax">
+    <!-- pjax占位 -->
+  </div>
+<% } %>

package/layout/_widget/music.ejs

@@ -1,8 +1,9 @@
+<%- partial('_pre') %>
 <% if (theme.plugins.aplayer.enable == true) { %>
-  <section class='widget <%- theme.custom_css.sidebar.effect.join(' ') %> <%- item.class %>'>
+  <section class='widget <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %> <%- item.class %>'>
     <%- partial('header', {item: item}) %>
     <div class='content'>
-      <%- partial('../_third-party/aplayer/layout', {post: null, where: 'widget'}) %>
+      <%- partial('../_plugins/aplayer/layout', {post: null, where: 'widget'}) %>
     </div>
   </section>
 <% } %>

package/layout/_widget/page.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <% site.pages.forEach(function(post){ %>

package/layout/_widget/qrcode.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <%- partial('header', {item: item}) %>
   <div class='content article-entry'>
     <% (item.images||[]).forEach(function(url){ %>

package/layout/_widget/related_posts.ejs

@@ -1,6 +1,6 @@
 <% if(page.layout == 'post' && page.content && page.path != undefined){ %>
   <%- partial('_pre') %>
-  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
     <%- partial('header', {item: item}) %>
     <div class="content">
       <%- popular_posts( { maxCount: item.max_count , ulClass: 'popular-posts' , PPMixingRate: 0.2 } , page ) %>

package/layout/_widget/tagcloud.ejs

@@ -1,6 +1,6 @@
 <% if (site.tags.length){ %>
   <%- partial('_pre') %>
-  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <%- tagcloud(site.tags, {

package/layout/_widget/text.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <% (item.content||[]).forEach(function(row){ %>

package/layout/_widget/toc.ejs

@@ -1,10 +1,14 @@
 <%- partial('_pre') %>
 <% var realcontent = (page.encrypt == true) ? page.origin : page.content; %>
 <% if (realcontent && page.toc != false && toc(realcontent).length > 0) { %>
-  <section class="widget toc-wrapper <%- page.widget_style %> <%- page.widget_platform %>" id="toc-div" <% if (page.encrypt == true) { %>style="display:none" <% } %>>
+  <section class="widget toc-wrapper <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>" id="toc-div" <% if (page.encrypt == true) { %>style="display:none" <% } %>>
     <%- partial('header', {item: item}) %>
     <div class='content'>
         <%- toc(realcontent, {list_number: item.list_number, min_depth: item.min_depth, max_depth: item.max_depth}) %>
     </div>
   </section>
-<% } %>
+<% }else{ %>
+  <div class="<%- page.widget_pjax %>">
+    <!-- pjax占位 -->
+  </div>
+<% } %>

package/layout/_widget/webinfo.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- page.widget_style %> <%- page.widget_platform %>">
+<section class="widget <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <div class="webinfo">
@@ -57,64 +57,8 @@
       <% if (item.type.lastupd.enable) { %>
         <div class="webinfo-item">
           <div><%= item.type.lastupd.text %></div>
-          <% if (item.type.lastupd.friendlyShow) { %>
-            <div id="last-update" style="display: none;"><%= new Date() %></div>
-            <div id="last-update-show"><%- date(Date.now()) %> <%= item.type.lastupd.unit %></div>
-          <% } else { %>
-            <div><%- date(Date.now()) %> <%= item.type.lastupd.unit %></div>
-          <% } %>
+          <div id="last-update-show"><%- date(Date.now()) %> <%= item.type.lastupd.unit %></div> 
         </div>
-        <% if (item.type.lastupd.friendlyShow) { %>
-        <script>
-          function timeago(dateTimeStamp) {
-              var minute = 1000 * 60; //把分，时，天，周，半个月，一个月用毫秒表示
-              var hour = minute * 60;
-              var day = hour * 24;
-              var week = day * 7;
-              var month = day * 30;
-              var now = new Date().getTime(); //获取当前时间毫秒
-              var diffValue = now - dateTimeStamp; //时间差
-              if (diffValue < 0) {
-                  return;
-              }
-              var minC = diffValue / minute; //计算时间差的分，时，天，周，月
-              var hourC = diffValue / hour;
-              var dayC = diffValue / day;
-              var weekC = diffValue / week;
-              var monthC = diffValue / month;
-              if (monthC >= 1 && monthC <= 3) {
-                  result = " " + parseInt(monthC) + " 月前"
-              } else if (weekC >= 1 && weekC <= 3) {
-                  result = " " + parseInt(weekC) + " 周前"
-              } else if (dayC >= 1 && dayC <= 6) {
-                  result = " " + parseInt(dayC) + " 天前"
-              } else if (hourC >= 1 && hourC <= 23) {
-                  result = " " + parseInt(hourC) + " 小时前"
-              } else if (minC >= 1 && minC <= 59) {
-                  result = " " + parseInt(minC) + " 分钟前"
-              } else if (diffValue >= 0 && diffValue <= minute) {
-                  result = "刚刚"
-              } else {
-                  var datetime = new Date();
-                  datetime.setTime(dateTimeStamp);
-                  var Nyear = datetime.getFullYear();
-                  var Nmonth = datetime.getMonth() + 1 < 10 ? "0" + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
-                  var Ndate = datetime.getDate() < 10 ? "0" + datetime.getDate() : datetime.getDate();
-                  var Nhour = datetime.getHours() < 10 ? "0" + datetime.getHours() : datetime.getHours();
-                  var Nminute = datetime.getMinutes() < 10 ? "0" + datetime.getMinutes() : datetime.getMinutes();
-                  var Nsecond = datetime.getSeconds() < 10 ? "0" + datetime.getSeconds() : datetime.getSeconds();
-                  result = Nyear + "-" + Nmonth + "-" + Ndate
-              }
-              return result;
-          }
-          var lastUpDate = document.getElementById('last-update').innerHTML;
-          try {
-            document.getElementById('last-update-show').innerHTML = timeago(new Date(lastUpDate));
-          } catch (error) {
-            document.getElementById('last-update-show').innerHTML = '<%- date(Date.now()) %> <%= item.type.lastupd.unit %>';
-          }
-        </script>
-        <% } %>
       <% } %>
     </div>
   </div>

package/layout/archive.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
 	<% if (page.year || page.month) { %>
 		<%- partial('_partial/archive') %>
 	<% } else { %>
@@ -15,8 +15,8 @@
 						<div class='timenode'>
 								<a class="meta" href="<%= url_for(post.link || post.path) %>">
 									<time><%= date(post.date, 'MM-DD') %></time>
-									<% if(post.title){ %>
-										<%- post.title %>
+									<% if(post.title || post.seo_title){ %>
+										<%- post.title || post.seo_title %>
 									<% } else if (post.date) { %>
 										<%= date(post.date, config.date_format) %>
 									<% } %>

package/layout/category.ejs

@@ -1,8 +1,13 @@
 <%- partial('_pre') %>
-<% page.comments = false; %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<% 
+page.comments = false;
+if (!page.robots) {
+  page.robots = 'noindex,follow';
+}
+%>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <% if (site.posts && site.posts.length > 0) { %>
-    <% if (page.layout == 'category') { %>
+    <% if ((page.layout == 'category')||(page.layout == 'categories') ) { %>
       <div class='post-wrapper'>
         <article id="cat" class="post article white-box reveal <%- theme.custom_css.body.effect.join(' ') %>">
           <h2><%- page.title %></h2>

package/layout/docs.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <%- partial('_partial/article', {post: page, index: false}) %>
 </div>
 <%- partial('_partial/side') %>

package/layout/friends.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <article id="<%= page.layout %>" class="md post article article-entry l_friends white-box reveal <%- theme.custom_css.body.effect.join(' ') %> article-type-<%= page.layout %>" itemscope itemprop="blogPost">
     <%- partial('_partial/meta',{post: page, position: 'top'}) %>
     <%- page.excerpt %>
@@ -13,31 +13,12 @@
           <% if (group.description) { %>
             <%- markdown(group.description) %>
           <%} %>
-          <% if (theme.pages.friends.layout_scheme == 'sites') { %>
-            <div class='site-card-group'>
-              <% (group.items||[]).forEach(function(item){ %>
-                <% if (item.url && item.title) { %>
-                  <a class="site-card" target="_blank" rel="external nofollow noopener noreferrer" href="<%- url_for(item.url || '/') %>">
-                    <div class="img">
-                      <% if (item.screenshot) { %>
-                        <img src="<%- item.screenshot %>"/>
-                      <% } %>
-                    </div>
-                    <div class="info">
-                      <img src="<%- item.avatar || (theme.plugins.lazyload && theme.plugins.lazyload.loadingImg) %>"/>
-                      <span class="title"><%- item.title %></span>
-                      <span class="desc"><%- item.description %></span>
-                    </div>
-                  </a>
-                <% } %>
-              <% }) %>
-            </div>
-          <% } else if (theme.pages.friends.layout_scheme == 'traditional') { %>
+          <% if (theme.pages.friends.layout_scheme == 'traditional') { %>
             <div class='friend-content'>
               <% (group.items||[]).forEach(function(item){ %>
                 <% if (item.url && item.title) { %>
                   <a class='friend-card'
-                    target="_blank" rel="external nofollow noopener noreferrer" href='<%- url_for(item.url || '/') %>'>
+                    target="_blank" rel="external noopener noreferrer" href="<%- url_for(item.url || '/') %>">
                     <div class='friend-left'>
                       <% if (item.avatar) { %>
                         <img class='avatar' src='<%- item.avatar || (theme.plugins.lazyload && theme.plugins.lazyload.loadingImg) %>'/>
@@ -66,7 +47,7 @@
             <div class='simpleuser-group'>
               <% (group.items||[]).forEach(function(item){ %>
                 <% if (item.url && item.title) { %>
-                  <a class="simpleuser" target="_blank" rel="external nofollow noopener noreferrer" href="<%- url_for(item.url || '/') %>">
+                  <a class="simpleuser" target="_blank" rel="external noopener noreferrer" href="<%- url_for(item.url || '/') %>">
                     <img src="<%- item.avatar || (theme.plugins.lazyload && theme.plugins.lazyload.loadingImg) %>"/>
                     <span><%- item.title %></span>
                   </a>
@@ -82,7 +63,7 @@
     <%- partial('_partial/meta',{post: page, position: 'bottom'}) %>
   </article>
 
-  <%- partial('_third-party/comments/index') %>
+  <%- partial('_plugins/comments/index',{post: page}) %>
 
 </div>
 <%- partial('_partial/side') %>

package/layout/index.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
+<div id="l_main" class='<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <%- partial('_partial/archive') %>
 </div>
 <%- partial('_partial/side') %>